From f4f236e82e9c7b680d3c583ddac403869e83d52c Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Fri, 6 Mar 2020 15:18:14 +0100
Subject: [PATCH] Added test for libcurl https handling disabled on build
 server.

Linux docker image does not expose port 80
---
 tests/CMakeLists.txt                          |  2 +-
 tests/libslic3r/CMakeLists.txt                |  1 +
 .../test_timeutils.cpp}                       | 23 +++++++++----------
 .../{timeutils => slic3rutils}/CMakeLists.txt |  7 +++---
 tests/slic3rutils/slic3rutils_tests_main.cpp  | 22 ++++++++++++++++++
 5 files changed, 38 insertions(+), 17 deletions(-)
 rename tests/{timeutils/timeutils_tests_main.cpp => libslic3r/test_timeutils.cpp} (89%)
 rename tests/{timeutils => slic3rutils}/CMakeLists.txt (55%)
 create mode 100644 tests/slic3rutils/slic3rutils_tests_main.cpp

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 61fe97277..b91f75be4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,7 +29,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 add_subdirectory(libnest2d)
 add_subdirectory(libslic3r)
-add_subdirectory(timeutils)
+add_subdirectory(slic3rutils)
 add_subdirectory(fff_print)
 add_subdirectory(sla_print)
 add_subdirectory(cpp17 EXCLUDE_FROM_ALL)    # does not have to be built all the time
diff --git a/tests/libslic3r/CMakeLists.txt b/tests/libslic3r/CMakeLists.txt
index d8dac3c10..2353414f9 100644
--- a/tests/libslic3r/CMakeLists.txt
+++ b/tests/libslic3r/CMakeLists.txt
@@ -13,6 +13,7 @@ add_executable(${_TEST_NAME}_tests
 	test_stl.cpp
         test_meshsimplify.cpp
         test_meshboolean.cpp
+        test_timeutils.cpp
 	)
 
 if (TARGET OpenVDB::openvdb)
diff --git a/tests/timeutils/timeutils_tests_main.cpp b/tests/libslic3r/test_timeutils.cpp
similarity index 89%
rename from tests/timeutils/timeutils_tests_main.cpp
rename to tests/libslic3r/test_timeutils.cpp
index 9989f9871..6630d7055 100644
--- a/tests/timeutils/timeutils_tests_main.cpp
+++ b/tests/libslic3r/test_timeutils.cpp
@@ -1,4 +1,4 @@
-#include <catch_main.hpp>
+#include <catch2/catch.hpp>
 
 #include "libslic3r/Time.hpp"
 
@@ -6,45 +6,44 @@
 #include <iomanip>
 #include <locale>
 
-namespace {
+using namespace Slic3r;
 
-void test_time_fmt(Slic3r::Utils::TimeFormat fmt) {
+static void test_time_fmt(Slic3r::Utils::TimeFormat fmt) {
     using namespace Slic3r::Utils;
     time_t t = get_current_time_utc();
-
+    
     std::string tstr = time2str(t, TimeZone::local, fmt);
     time_t parsedtime = str2time(tstr, TimeZone::local, fmt);
     REQUIRE(t == parsedtime);
-
+    
     tstr = time2str(t, TimeZone::utc, fmt);
     parsedtime = str2time(tstr, TimeZone::utc, fmt);
     REQUIRE(t == parsedtime);
-
+    
     parsedtime = str2time("not valid string", TimeZone::local, fmt);
     REQUIRE(parsedtime == time_t(-1));
-
+    
     parsedtime = str2time("not valid string", TimeZone::utc, fmt);
     REQUIRE(parsedtime == time_t(-1));
 }
-}
 
 TEST_CASE("ISO8601Z", "[Timeutils]") {
     test_time_fmt(Slic3r::Utils::TimeFormat::iso8601Z);
-
+    
     std::string mydate = "20190710T085000Z";
     time_t t = Slic3r::Utils::parse_iso_utc_timestamp(mydate);
     std::string date = Slic3r::Utils::iso_utc_timestamp(t);
-
+    
     REQUIRE(date == mydate);
 }
 
 TEST_CASE("Slic3r_UTC_Time_Format", "[Timeutils]") {
     using namespace Slic3r::Utils;
     test_time_fmt(TimeFormat::gcode);
-
+    
     std::string mydate = "2019-07-10 at 08:50:00 UTC";
     time_t t = Slic3r::Utils::str2time(mydate, TimeZone::utc, TimeFormat::gcode);
     std::string date = Slic3r::Utils::utc_timestamp(t);
-
+    
     REQUIRE(date == mydate);
 }
diff --git a/tests/timeutils/CMakeLists.txt b/tests/slic3rutils/CMakeLists.txt
similarity index 55%
rename from tests/timeutils/CMakeLists.txt
rename to tests/slic3rutils/CMakeLists.txt
index 6ece9f4d1..f03d8d69a 100644
--- a/tests/timeutils/CMakeLists.txt
+++ b/tests/slic3rutils/CMakeLists.txt
@@ -1,11 +1,10 @@
 get_filename_component(_TEST_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
 add_executable(${_TEST_NAME}_tests
     ${_TEST_NAME}_tests_main.cpp
-    ${PROJECT_SOURCE_DIR}/src/libslic3r/Time.cpp
-    ${PROJECT_SOURCE_DIR}/src/libslic3r/Time.hpp
     )
-target_link_libraries(${_TEST_NAME}_tests test_common)
+
+target_link_libraries(${_TEST_NAME}_tests test_common libslic3r_gui)
 set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests")
 
 # catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ")
-add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests ${CATCH_EXTRA_ARGS})
+add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests "${CATCH_EXTRA_ARGS} exclude:[NotWorking]")
diff --git a/tests/slic3rutils/slic3rutils_tests_main.cpp b/tests/slic3rutils/slic3rutils_tests_main.cpp
new file mode 100644
index 000000000..b82114976
--- /dev/null
+++ b/tests/slic3rutils/slic3rutils_tests_main.cpp
@@ -0,0 +1,22 @@
+#include <catch_main.hpp>
+
+#include "slic3r/Utils/Http.hpp"
+
+TEST_CASE("Http", "[Http][NotWorking]") {
+    
+    Slic3r::Http g = Slic3r::Http::get("https://github.com/");
+    
+    unsigned status = 0;
+    g.on_error([&status](std::string, std::string, unsigned http_status) {
+        status = http_status;
+    });
+    
+    g.on_complete([&status](std::string /* body */, unsigned http_status){
+        status = http_status;
+    });
+    
+    g.perform_sync();
+    
+    REQUIRE(status == 200);
+}
+