Merge pull request #106 from libriscv/testing

Testing framework

.gitignore

@@ -1,5 +1,6 @@
 build/
 .build/
+.godot/
 .mingw/
 .vscode/
 program/test

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "godot-cpp"]
 	path = godot-cpp
 	url = https://github.com/godotengine/godot-cpp.git
+[submodule "ext/Gut"]
+	path = ext/Gut
+	url = https://github.com/bitwes/Gut.git

program/cpp/api/array.hpp

@@ -64,6 +64,10 @@ inline Variant::Variant(const Array& a) {
 	v.i = a.get_variant_index();
 }
 
+inline Variant::operator Array() const {
+	return as_array();
+}
+
 class ArrayIterator {
 public:
 	ArrayIterator(const Array &array, unsigned idx) : m_array(array), m_idx(idx) {}

program/cpp/api/dictionary.hpp

@@ -49,6 +49,10 @@ inline Variant::Variant(const Dictionary &d) {
 	v.i = d.get_variant_index();
 }
 
+inline Variant::operator Dictionary() const {
+	return as_dictionary();
+}
+
 struct DictAccessor {
 	DictAccessor(const Dictionary &dict, const Variant &key) : m_dict(dict), m_key(key) {}
 

program/cpp/api/string.hpp

@@ -53,10 +53,7 @@ inline Variant::Variant(const String &s) {
 }
 
 inline Variant::operator String() const {
-	if (m_type != STRING) {
-		api_throw("std::bad_cast", "Failed to cast Variant to String", this);
-	}
-	return String::from_variant_index(v.i);
+	return as_string();
 }
 
 inline String Variant::as_string() const {

program/cpp/api/variant.hpp

@@ -158,6 +158,8 @@ struct Variant
 	operator std::string() const; // String for STRING and PACKED_BYTE_ARRAY
 	operator std::u32string() const; // u32string for STRING, STRING_NAME
 	operator String() const;
+	operator Array() const;
+	operator Dictionary() const;
 
 	Object as_object() const;
 	Node as_node() const;

src/sandbox.cpp

@@ -19,6 +19,7 @@ String Sandbox::_to_string() const {
 void Sandbox::_bind_methods() {
 	// Methods.
 	ClassDB::bind_method(D_METHOD("get_functions"), &Sandbox::get_functions);
+	ClassDB::bind_method(D_METHOD("set_program", "program"), &Sandbox::set_program);
 	{
 		MethodInfo mi;
 		mi.arguments.push_back(PropertyInfo(Variant::STRING, "function"));

tests/addons/gut

@@ -0,0 +1 @@
+../../ext/Gut/addons/gut

tests/extensions/bin/libgodot-riscv.linux.debug.x86_64.so

@@ -0,0 +1 @@
+/home/gonzo/github/godot-riscv/.build/libgodot-riscv.so

tests/extensions/bin/libgodot-riscv.linux.release.x86_64.so

@@ -0,0 +1 @@
+/home/gonzo/github/godot-riscv/.build/libgodot-riscv.so

tests/extensions/bin/libgodot_riscv.web.template_debug.wasm32.wasm

@@ -0,0 +1 @@
+/home/gonzo/github/godot-riscv/bin/addons/godot_sandbox/bin/libgodot_riscv.web.template_debug.wasm32.wasm

tests/extensions/bin/libgodot_riscv.web.template_release.wasm32.wasm

@@ -0,0 +1 @@
+/home/gonzo/github/godot-riscv/bin/addons/godot_sandbox/bin/libgodot_riscv.web.template_release.wasm32.wasm

tests/extensions/libgodot-riscv.gdextension

@@ -0,0 +1,18 @@
+[configuration]
+
+entry_symbol = "riscv_library_init"
+compatibility_minimum = "4.1"
+
+[icons]
+
+
+[libraries]
+
+macos.debug = "bin/libgodot-riscv.macos.debug.framework"
+macos.release = "bin/libgodot-riscv.macos.release.framework"
+windows.debug.x86_64 = "bin/libgodot-riscv.windows.debug.x86_64.dll"
+windows.release.x86_64 = "bin/libgodot-riscv.windows.release.x86_64.dll"
+linux.debug.x86_64 = "bin/libgodot-riscv.linux.debug.x86_64.so"
+linux.release.x86_64 = "bin/libgodot-riscv.linux.release.x86_64.so"
+web.debug.wasm32 = "bin/libgodot_riscv.web.template_debug.wasm32.wasm"
+web.release.wasm32 = "bin/libgodot_riscv.web.template_release.wasm32.wasm"

tests/icon.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://6xqmeymr5t3"
+path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://icon.svg"
+dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

tests/project.godot

@@ -0,0 +1,19 @@
+; Engine configuration file.
+; It's best edited using the editor UI and not directly,
+; since the parameters that go here are not all obvious.
+;
+; Format:
+;   [section] ; section goes between []
+;   param=value ; assign values to parameters
+
+config_version=5
+
+[application]
+
+config/name="tests"
+config/features=PackedStringArray("4.3", "Forward Plus")
+config/icon="res://icon.svg"
+
+[editor_plugins]
+
+enabled=PackedStringArray("res://addons/gut/plugin.cfg")

tests/tests/test_basic.cpp

@@ -0,0 +1,9 @@
+#include "api.hpp"
+
+extern "C" Variant public_function() {
+	return "Hello from the other side";
+}
+
+extern "C" Variant test_dictionary(Variant dict) {
+	return Dictionary(dict)["1"];
+}

tests/tests/test_basic.gd

@@ -0,0 +1,17 @@
+extends GutTest
+
+func test_instantiation():
+	# Create a new sandbox
+	var s = Sandbox.new()
+	# Set the test program
+	s.set_program(Sandbox_TestsTests)
+
+	# Verify that a basic function that returns a String works
+	assert_eq(s.vmcall("public_function"), "Hello from the other side")
+
+	# Verify that the sandbox can receive a Dictionary and return an element
+	var d : Dictionary
+	d["1"] = Dictionary()
+	d["1"]["2"] = "3"
+
+	assert_eq(s.vmcall("test_dictionary", d), d["1"])