Improved tests, separate https test from metacall python port test.

viferga · viferga · commit 7c56258d6072 · 2021-01-08T23:15:43.000+01:00
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
@@ -153,6 +153,7 @@ add_subdirectory(metacall_python_pointer_test)
 add_subdirectory(metacall_python_reentrant_test)
 add_subdirectory(metacall_python_varargs_test)
 add_subdirectory(metacall_python_port_test)
+add_subdirectory(metacall_python_port_https_test)
 add_subdirectory(metacall_map_test)
 add_subdirectory(metacall_map_await_test)
 add_subdirectory(metacall_initialize_test)
diff --git a/source/tests/metacall_python_port_https_test/CMakeLists.txt b/source/tests/metacall_python_port_https_test/CMakeLists.txt
@@ -0,0 +1,152 @@
+# Check if loaders are enabled
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_PY OR NOT OPTION_BUILD_PORTS OR NOT OPTION_BUILD_PORTS_PY)
+	return()
+endif()
+
+#
+# Executable name and options
+#
+
+# Target name
+set(target metacall-python-port-https-test)
+message(STATUS "Test ${target}")
+
+#
+# Compiler warnings
+#
+
+include(Warnings)
+
+#
+# Compiler security
+#
+
+include(SecurityFlags)
+
+#
+# Sources
+#
+
+set(include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}")
+set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
+
+set(sources
+	${source_path}/main.cpp
+	${source_path}/metacall_python_port_https_test.cpp
+)
+
+# Group source files
+set(header_group "Header Files (API)")
+set(source_group "Source Files")
+source_group_by_path(${include_path} "\\\\.h$|\\\\.hpp$"
+	${header_group} ${headers})
+source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
+	${source_group} ${sources})
+
+#
+# Create executable
+#
+
+# Build executable
+add_executable(${target}
+	${sources}
+)
+
+# Create namespaced alias
+add_executable(${META_PROJECT_NAME}::${target} ALIAS ${target})
+
+#
+# Project options
+#
+
+set_target_properties(${target}
+	PROPERTIES
+	${DEFAULT_PROJECT_OPTIONS}
+	FOLDER "${IDE_FOLDER}"
+)
+
+#
+# Include directories
+#
+
+target_include_directories(${target}
+	PRIVATE
+	${DEFAULT_INCLUDE_DIRECTORIES}
+	${PROJECT_BINARY_DIR}/source/include
+)
+
+#
+# Libraries
+#
+
+target_link_libraries(${target}
+	PRIVATE
+	${DEFAULT_LIBRARIES}
+
+	GTest
+
+	${META_PROJECT_NAME}::metacall_distributable
+)
+
+#
+# Compile definitions
+#
+
+target_compile_definitions(${target}
+	PRIVATE
+	${DEFAULT_COMPILE_DEFINITIONS}
+
+	# Python Port path
+	METACALL_PYTHON_PORT_PATH="${CMAKE_SOURCE_DIR}/source/ports/py_port"
+)
+
+#
+# Compile options
+#
+
+target_compile_options(${target}
+	PRIVATE
+	${DEFAULT_COMPILE_OPTIONS}
+)
+
+#
+# Linker options
+#
+
+target_link_libraries(${target}
+	PRIVATE
+	${DEFAULT_LINKER_OPTIONS}
+)
+
+#
+# Define test
+#
+
+add_test(NAME ${target}
+	COMMAND $<TARGET_FILE:${target}>
+)
+
+#
+# Define dependencies
+#
+
+add_dependencies(${target}
+	py_loader
+	rb_loader
+	node_loader
+)
+
+#
+# Define test properties
+#
+
+set_property(TEST ${target}
+	PROPERTY LABELS ${target}
+)
+
+include(TestEnvironmentVariables)
+
+test_environment_variables(${target}
+	""
+	${TESTS_ENVIRONMENT_VARIABLES}
+)
diff --git a/source/tests/metacall_python_port_https_test/source/main.cpp b/source/tests/metacall_python_port_https_test/source/main.cpp
@@ -0,0 +1,28 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2020 Vicente Eduardo Ferrer Garcia <vic798@gmail.com>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#include <gmock/gmock.h>
+
+int main(int argc, char * argv[])
+{
+	::testing::InitGoogleMock(&argc, argv);
+
+	return RUN_ALL_TESTS();
+}
diff --git a/source/tests/metacall_python_port_https_test/source/metacall_python_port_https_test.cpp b/source/tests/metacall_python_port_https_test/source/metacall_python_port_https_test.cpp
@@ -0,0 +1,75 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2020 Vicente Eduardo Ferrer Garcia <vic798@gmail.com>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#include <gmock/gmock.h>
+
+#include <metacall/metacall.h>
+#include <metacall/metacall_value.h>
+#include <metacall/metacall_loaders.h>
+
+class metacall_python_port_https_test : public testing::Test
+{
+public:
+};
+
+TEST_F(metacall_python_port_https_test, DefaultConstructor)
+{
+	metacall_print_info();
+
+	ASSERT_EQ((int) 0, (int) metacall_initialize());
+
+	/* Python */
+	#if defined(OPTION_BUILD_LOADERS_PY)
+	{
+		// Test import bug (__metacall_import__() missing 1 required positional argument: 'name')
+		static const char buffer[] =
+			"import sys\n"
+			"sys.path.insert(0, '" METACALL_PYTHON_PORT_PATH "')\n"
+			"import metacall\n"
+			"from http import client\n"
+			"def fetch_http_py(url: str):\n"
+			"	try:\n"
+			"		conn = client.HTTPSConnection(url, 443)\n"
+			"		conn.request('GET', '/')\n"
+			"		response = conn.getresponse()\n"
+			"		data = response.read()\n"
+			"		conn.close()\n"
+			"		return data\n"
+			"	except Exception as e:\n"
+			"		print(e)\n"
+			"		sys.stdout.flush()\n"
+			"		return b'<!doctype invalid>'\n";
+
+		ASSERT_EQ((int) 0, (int) metacall_load_from_memory("py", buffer, sizeof(buffer), NULL));
+
+		void * ret = metacall("fetch_http_py", "www.google.com");
+
+		static const char prefix[] = "<!doctype html>";
+
+		ASSERT_EQ((enum metacall_value_id) METACALL_BUFFER, (enum metacall_value_id) metacall_value_id(ret));
+
+		EXPECT_EQ((int) 0, (int) strncmp((const char *)metacall_value_to_buffer(ret), prefix, sizeof(prefix) - 1));
+
+		metacall_value_destroy(ret);
+	}
+	#endif /* OPTION_BUILD_LOADERS_PY */
+
+	EXPECT_EQ((int) 0, (int) metacall_destroy());
+}
diff --git a/source/tests/metacall_python_port_test/CMakeLists.txt b/source/tests/metacall_python_port_test/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Check if loaders are enabled
-if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_PY OR NOT OPTION_BUILD_LOADERS_RB OR NOT OPTION_BUILD_LOADERS_NODE OR NOT OPTION_BUILD_SCRIPTS OR NOT OPTION_BUILD_SCRIPTS_PY OR NOT OPTION_BUILD_SCRIPTS_RB OR NOT OPTION_BUILD_SCRIPTS_NODE)
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_PY OR NOT OPTION_BUILD_LOADERS_RB OR NOT OPTION_BUILD_LOADERS_NODE OR NOT OPTION_BUILD_PORTS OR NOT OPTION_BUILD_PORTS_PY OR NOT OPTION_BUILD_SCRIPTS OR NOT OPTION_BUILD_SCRIPTS_PY OR NOT OPTION_BUILD_SCRIPTS_RB OR NOT OPTION_BUILD_SCRIPTS_NODE)
 	return()
 endif()
 
@@ -96,10 +96,7 @@ target_compile_definitions(${target}
 	PRIVATE
 	${DEFAULT_COMPILE_DEFINITIONS}
 
-	# NodeJS Port path
-	METACALL_PYTHON_PORT_PATH="${CMAKE_SOURCE_DIR}/source/ports/py_port"
-
-	# NodeJS Port Test path
+	# Python Port Test path
 	METACALL_PYTHON_PORT_TEST_PATH="${CMAKE_SOURCE_DIR}/source/ports/py_port/run_tests.py"
 )
 
diff --git a/source/tests/metacall_python_port_test/source/metacall_python_port_test.cpp b/source/tests/metacall_python_port_test/source/metacall_python_port_test.cpp
@@ -40,7 +40,6 @@ TEST_F(metacall_python_port_test, DefaultConstructor)
 	/* Python */
 	#if defined(OPTION_BUILD_LOADERS_PY)
 	{
-		// Run port test
 		static const char * py_scripts[] =
 		{
 			METACALL_PYTHON_PORT_TEST_PATH
@@ -53,35 +52,6 @@ TEST_F(metacall_python_port_test, DefaultConstructor)
 		EXPECT_EQ((int) 0, (int) strcmp(metacall_value_to_string(ret), "Tests passed without errors"));
 
 		metacall_value_destroy(ret);
-
-		// Test import bug (__metacall_import__() missing 1 required positional argument: 'name')
-		static const char buffer[] =
-			"import sys\n"
-			"from http import client\n"
-			"def fetch_http_py(url: str):\n"
-			"	try:\n"
-			"		conn = client.HTTPSConnection(url, 443)\n"
-			"		conn.request('GET', '/')\n"
-			"		response = conn.getresponse()\n"
-			"		data = response.read()\n"
-			"		conn.close()\n"
-			"		return data\n"
-			"	except Exception as e:\n"
-			"		print(e)\n"
-			"		sys.stdout.flush()\n"
-			"		return b'<!doctype invalid>'\n";
-
-		ASSERT_EQ((int) 0, (int) metacall_load_from_memory("py", buffer, sizeof(buffer), NULL));
-
-		ret = metacall("fetch_http_py", "www.google.com");
-
-		static const char prefix[] = "<!doctype html>";
-
-		ASSERT_EQ((enum metacall_value_id) METACALL_BUFFER, (enum metacall_value_id) metacall_value_id(ret));
-
-		EXPECT_EQ((int) 0, (int) strncmp((const char *)metacall_value_to_buffer(ret), prefix, sizeof(prefix) - 1));
-
-		metacall_value_destroy(ret);
 	}
 	#endif /* OPTION_BUILD_LOADERS_PY */
 
