Merge pull request #8 from Preagonal/updates2

Minor improvements

Author: xx-shitai-xx

GS2Engine.UnitTests/StackEntryExtensionsTests.cs

@@ -1,5 +1,6 @@
 using GS2Engine.Enums;
 using GS2Engine.Extensions;
+using GS2Engine.GS2.Script;
 using GS2Engine.Models;
 
 namespace GS2Engine.UnitTests
@@ -81,6 +82,21 @@ public void When_input_is_string_Then_return_StackEntry_with_type_string_and_val
 			Assert.Equal(val, test.GetValue()?.ToString());
 		}
 
+		[Fact]
+		public void When_input_is_TString_Then_return_StackEntry_with_type_string_and_value_type_TString()
+		{
+			//Arrange
+			TString val = "test";
+			
+			//Act
+			IStackEntry test = val.ToStackEntry();
+			
+			//Assert
+			Assert.Equal(StackEntryType.String, test.Type);
+			Assert.Equal(typeof(TString), test.GetValue()?.GetType());
+			Assert.Equal(val, test.GetValue()?.ToString());
+		}
+
 		[Fact]
 		public void When_input_is_string_array_Then_return_StackEntry_with_type_array_and_value_type_List_string()
 		{
@@ -96,6 +112,93 @@ public void When_input_is_string_array_Then_return_StackEntry_with_type_array_an
 			Assert.Equal(val, test.GetValue());
 		}
 
+		[Fact]
+		public void When_input_is_int_array_Then_return_StackEntry_with_type_array_and_value_type_List_int()
+		{
+			//Arrange
+			int[] val = {1,2};
+			
+			//Act
+			IStackEntry test = val.ToStackEntry();
+			
+			//Assert
+			Assert.Equal(StackEntryType.Array, test.Type);
+			Assert.Equal(typeof(List<int>), test.GetValue()?.GetType());
+			Assert.Equal(val, test.GetValue());
+		}
+
+		[Fact]
+		public void When_input_is_command_Then_return_StackEntry_with_type_array_and_value_type_List_string()
+		{
+			//Arrange
+			Script.Command val = (_, _) => 0.ToStackEntry();
+			
+			//Act
+			IStackEntry test = val.ToStackEntry();
+			
+			//Assert
+			Assert.Equal(StackEntryType.Function, test.Type);
+			Assert.Equal(typeof(Script.Command), test.GetValue()?.GetType());
+			Assert.Equal(val, test.GetValue());
+		}
+
+		[Fact]
+		public void When_input_is_guicontrol_Then_return_StackEntry_with_type_array_and_value_type_List_string()
+		{
+			//Arrange
+			IGuiControl val = new GuiControl("", null);
+			
+			//Act
+			IStackEntry test = val.ToStackEntry();
+			
+			//Assert
+			Assert.Equal(StackEntryType.Array, test.Type);
+			Assert.Equal(typeof(GuiControl), test.GetValue()?.GetType());
+			Assert.Equal(val, test.GetValue());
+		}
+		
+		[Fact]
+		public void When_input_is_variablecollection_Then_return_StackEntry_with_type_array_and_value_type_List_string()
+		{
+			//Arrange
+			VariableCollection val = new();
+			
+			//Act
+			IStackEntry test = val.ToStackEntry();
+			
+			//Assert
+			Assert.Equal(StackEntryType.Array, test.Type);
+			Assert.Equal(typeof(VariableCollection), test.GetValue()?.GetType());
+			Assert.Equal(val, test.GetValue());
+		}
+
+		[Fact]
+		public void When_input_is_typeof_list_Then_return_StackEntry_with_type_array_and_value_type_List_string()
+		{
+			//Arrange
+			List<object> val = new();
+			
+			//Act
+			IStackEntry test = val.ToStackEntry();
+			
+			//Assert
+			Assert.Equal(StackEntryType.Array, test.Type);
+			Assert.Equal(typeof(List<object>), test.GetValue()?.GetType());
+			Assert.Equal(val, test.GetValue());
+		}
+		
+		[Fact]
+		public void When_input_is_outofrange_Then_return_StackEntry_with_type_array_and_value_type_List_string()
+		{
+			//Arrange
+			Thread val = new(_ =>{} );
+			
+			//Act
+			//Assert
+			ArgumentOutOfRangeException exception = Assert.Throws<ArgumentOutOfRangeException>(() => val.ToStackEntry());
+			Assert.Equal("Specified argument was out of the range of valid values.", exception.Message);
+		}
+
 		[Fact]
 		public void When_input_is_bool_Then_return_StackEntry_with_type_bool_and_value_type_bool()
 		{

GS2Engine.UnitTests/StackExtensionsTests.cs

@@ -0,0 +1,24 @@
+using GS2Engine.Enums;
+using GS2Engine.Extensions;
+using GS2Engine.GS2.Script;
+using GS2Engine.Models;
+
+namespace GS2Engine.UnitTests
+{
+	public class StackExtensionsTests
+	{
+		[Fact]
+		public void When_input_is_int_Then_return_StackEntry_with_type_number_and_value_type_double()
+		{
+			//Arrange
+			Stack<StackEntry> stack = new();
+			stack.Push("asd".ToStackEntry());
+			
+			//Act
+			Stack<StackEntry> newStack = stack.Clone();
+			
+			//Assert
+			Assert.Equal(stack.Peek(), newStack.Peek());
+		}
+	}
+}

GS2Engine.UnitTests/TStringTests.cs

@@ -0,0 +1,63 @@
+using GS2Engine.Enums;
+using GS2Engine.Extensions;
+using GS2Engine.GS2.Script;
+using GS2Engine.Models;
+
+namespace GS2Engine.UnitTests
+{
+	public class TStringTests
+	{
+		[Fact]
+		public void When_input_is_byte_array_Then_return_TString_with_copy_of_byte_array_as_buffer()
+		{
+			//Arrange
+			byte[] bytes = { 0, 1, 2, 3 };
+
+			//Act
+			TString fromBytes = bytes;
+			
+			//Assert
+			Assert.Equal(fromBytes.buffer, bytes);
+		}
+
+		[Fact]
+		public void When_input_is_none_Then_return_TString_with_empty_byte_array_as_buffer()
+		{
+			//Arrange
+			//Act
+			TString stringy = new();
+
+			//Assert
+			Assert.Equal(stringy.buffer, Array.Empty<byte>());
+		}
+
+		[Fact]
+		public void When_checking_length_Then_value_is_correct()
+		{
+			//Arrange
+			TString stringy = "asd";
+
+			//Act
+			int length = stringy.length(); 
+			
+
+			//Assert
+			Assert.Equal(length, stringy.Length);
+		}
+
+		[Fact]
+		public void When_adding_tstring_Then_value_is_correct()
+		{
+			//Arrange
+			TString string1 = "ASD";
+			TString string2 = "123";
+
+			//Act
+			string1 += string2;
+			string1.writeChar(64);
+
+			//Assert
+			Assert.Equal("asd123@", string1.ToLower().ToString());
+		}
+	}
+}

GS2Engine/Enums/StackEntryType.cs

@@ -1,14 +1,14 @@
-namespace GS2Engine.Enums
-{
-	public enum StackEntryType
-	{
-		Number,
-		String,
-		Variable,
-		Boolean,
-		Array,
-		ArrayStart,
-		Player,
-		Function,
-	}
+namespace GS2Engine.Enums
+{
+	public enum StackEntryType
+	{
+		Number,
+		String,
+		Variable,
+		Boolean,
+		Array,
+		ArrayStart,
+		Player,
+		Function,
+	}
 }