Update Java test.

Author: viferga

source/scripts/java/fibonacci/source/fibonacci.java

@@ -1,7 +1,7 @@
 
 public class Fibonacci
 {
-	public static long fib_impl(int n)
+	public static int fib_impl(int n)
 	{
 		if (n <= 2)
 		{

source/tests/CMakeLists.txt

@@ -112,7 +112,6 @@ add_subdirectory(rb_loader_parser_test)
 add_subdirectory(rb_loader_parser_integration_test)
 #add_subdirectory(rb_rails_integration_test) # TODO
 add_subdirectory(node_loader_test)
-add_subdirectory(java_loader_test)
 add_subdirectory(loader_path_test)
 add_subdirectory(metacall_logs_test)
 add_subdirectory(metacall_load_memory_test)
@@ -193,3 +192,4 @@ add_subdirectory(metacall_llvm_test)
 add_subdirectory(metacall_ruby_test)
 add_subdirectory(metacall_cs_test)
 add_subdirectory(metacall_julia_test)
+add_subdirectory(metacall_java_test)

source/tests/java_loader_test/source/java_loader_test.cpp

@@ -8,7 +8,7 @@ endif()
 #
 
 # Target name
-set(target java-loader-test)
+set(target metacall-java-test)
 message(STATUS "Test ${target}")
 
 #
@@ -32,7 +32,7 @@ set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
 
 set(sources
 	${source_path}/main.cpp
-	${source_path}/java_loader_test.cpp
+	${source_path}/metacall_java_test.cpp
 )
 
 # Group source files
@@ -85,22 +85,7 @@ target_link_libraries(${target}
 
 	GTest
 
-	${META_PROJECT_NAME}::version
-	${META_PROJECT_NAME}::preprocessor
-	${META_PROJECT_NAME}::environment
-	${META_PROJECT_NAME}::format
-	${META_PROJECT_NAME}::threading
-	${META_PROJECT_NAME}::log
-	${META_PROJECT_NAME}::memory
-	${META_PROJECT_NAME}::portability
-	${META_PROJECT_NAME}::adt
-	${META_PROJECT_NAME}::filesystem
-	${META_PROJECT_NAME}::dynlink
-	${META_PROJECT_NAME}::detour
-	${META_PROJECT_NAME}::reflect
-	${META_PROJECT_NAME}::serial
-	${META_PROJECT_NAME}::configuration
-	${META_PROJECT_NAME}::loader
+	${META_PROJECT_NAME}::metacall
 )
 
 #
@@ -135,11 +120,7 @@ target_link_libraries(${target}
 #
 
 add_test(NAME ${target}
-	# WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 	COMMAND $<TARGET_FILE:${target}>
-
-	# TODO: Remove this
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/source/ports/scala_port
 )
 
 #

source/tests/java_loader_test/CMakeLists.txt renamed to source/tests/metacall_java_test/CMakeLists.txt

@@ -0,0 +1,102 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia <[email protected]>
+ *
+ *	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 <gtest/gtest.h>
+
+#include <metacall/metacall.h>
+#include <metacall/metacall_loaders.h>
+#include <metacall/metacall_value.h>
+
+class metacall_java_test : public testing::Test
+{
+public:
+};
+
+TEST_F(metacall_java_test, DefaultConstructor)
+{
+	metacall_print_info();
+
+	ASSERT_EQ((int)0, (int)metacall_initialize());
+
+/* Java */
+#if defined(OPTION_BUILD_LOADERS_JAVA)
+	{
+		const char *java_scripts[] = {
+			"fibonacci.java"
+		};
+
+		const enum metacall_value_id fib_int_ids[] = {
+			METACALL_INT
+		};
+
+		const size_t args_size = sizeof(fib_int_ids) / sizeof(fib_int_ids[0]);
+
+		static const char tag[] = "java";
+
+		ASSERT_EQ((int)0, (int)metacall_load_from_file(tag, java_scripts, sizeof(java_scripts) / sizeof(java_scripts[0]), NULL));
+
+		/* TODO: Uncomment this when calls are implemented */
+		/*
+		void *ret = metacallt_s("fib_impl", fib_int_ids, args_size, 6);
+
+		EXPECT_NE((void *)NULL, (void *)ret);
+
+		EXPECT_EQ((int)metacall_value_to_int(ret), (int)8);
+
+		metacall_value_destroy(ret);
+		*/
+
+		/* TODO: Test load from memory */
+		/*
+		static const char buffer[] =
+			"...\n"
+			"...\n"
+			"...\n";
+
+		EXPECT_EQ((int)0, (int)metacall_load_from_memory(tag, buffer, sizeof(buffer), NULL));
+		*/
+
+		/* TODO: Call to the functions of the load from memory script */
+
+		/* TODO: Test load from package */
+	}
+#endif /* OPTION_BUILD_LOADERS_JAVA */
+
+	/* Print inspect information */
+	{
+		size_t size = 0;
+
+		struct metacall_allocator_std_type std_ctx = { &std::malloc, &std::realloc, &std::free };
+
+		void *allocator = metacall_allocator_create(METACALL_ALLOCATOR_STD, (void *)&std_ctx);
+
+		char *inspect_str = metacall_inspect(&size, allocator);
+
+		EXPECT_NE((char *)NULL, (char *)inspect_str);
+
+		EXPECT_GT((size_t)size, (size_t)0);
+
+		metacall_allocator_free(allocator, inspect_str);
+
+		metacall_allocator_destroy(allocator);
+	}
+
+	EXPECT_EQ((int)0, (int)metacall_destroy());
+}