Merge pull request #39 from TeknoPT/dev

Fix a test and Added another one.
phantasma-io-archive · Sep 21, 2023 · 2dcb9d8 · 2dcb9d8
2 parents ff20195 + 3040712
commit 2dcb9d8
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 4 deletions.
diff --git a/Library/tests/Contracts/IfTests.cs b/Library/tests/Contracts/IfTests.cs
@@ -102,13 +102,16 @@ public void IfWithMultipleArgs()
             @"
 contract test {
     public sign(x:number, name:string): number {
-        if (x > 0 || name == ""hello"")
+        if (x > 5 && name == ""hello"")
         {
             return 1;
         }
         else if (x == 0 && name == ""world"")
         {
             return 5;
+        }else if (x < 5 ||  name == ""tomb"")
+        {
+            return 10;
         }
 
         return 0;        
@@ -125,8 +128,8 @@ public sign(x:number, name:string): number {
 
         // Test for the 1st case
         var vm = new TestVM(contract, storage, countStuff);
-        vm.Stack.Push(VMObject.FromObject((BigInteger)10));
         vm.Stack.Push(VMObject.FromObject("hello"));
+        vm.Stack.Push(VMObject.FromObject((BigInteger)10));
         var result = vm.Execute();
         Assert.IsTrue(result == ExecutionState.Halt);
 
@@ -136,8 +139,8 @@ public sign(x:number, name:string): number {
 
         // test for 2nd case
         vm = new TestVM(contract, storage, countStuff);
-        vm.Stack.Push(VMObject.FromObject(0));
         vm.Stack.Push(VMObject.FromObject("world"));
+        vm.Stack.Push(VMObject.FromObject(0));
         result = vm.Execute();
         Assert.IsTrue(result == ExecutionState.Halt);
         Assert.IsTrue(vm.Stack.Count == 1);
@@ -147,8 +150,19 @@ public sign(x:number, name:string): number {
 
         // test for the 3rd case
         vm = new TestVM(contract, storage, countStuff);
-        vm.Stack.Push(VMObject.FromObject(1234));
         vm.Stack.Push(VMObject.FromObject("tomb"));
+        vm.Stack.Push(VMObject.FromObject(1234));
+        result = vm.Execute();
+        Assert.IsTrue(result == ExecutionState.Halt);
+        Assert.IsTrue(vm.Stack.Count == 1);
+
+        val = vm.Stack.Pop().AsNumber();
+        Assert.AreEqual((BigInteger)10, val);
+
+        // test for the 4th case
+        vm = new TestVM(contract, storage, countStuff);
+        vm.Stack.Push(VMObject.FromObject("tombcompiler"));
+        vm.Stack.Push(VMObject.FromObject(1234));
         result = vm.Execute();
         Assert.IsTrue(result == ExecutionState.Halt);
         Assert.IsTrue(vm.Stack.Count == 1);

diff --git a/Library/tests/Contracts/StringTests.cs b/Library/tests/Contracts/StringTests.cs
@@ -206,4 +206,40 @@ public toUpper(s:string):string
         result = vm.Stack.Pop().AsString();
         Assert.IsTrue(result == "ABCD");
     }
+
+
+    [Test]
+    public void StringParameters()
+    {
+	    var sourceCode = @"
+contract handlerstring {
+	import String;
+
+	public joinStrings(s:string, idx:number, k:string, y:string):string {        	
+		return s + k + y + idx;
+	}	
+}
+";
+
+	    var parser = new TombLangCompiler();
+	    var contract = parser.Process(sourceCode).First();
+
+	    var storage = new Dictionary<byte[], byte[]>(new ByteArrayComparer());
+
+	    TestVM vm;
+
+	    var test = contract.abi.FindMethod("joinStrings");
+	    Assert.IsNotNull(test);
+
+	    vm = new TestVM(contract, storage, test);
+	    vm.Stack.Push(VMObject.FromObject("IJKL"));
+	    vm.Stack.Push(VMObject.FromObject("EFGH"));
+	    vm.Stack.Push(VMObject.FromObject(2));
+	    vm.Stack.Push(VMObject.FromObject("ABCD"));
+	    var state = vm.Execute();
+	    Assert.IsTrue(state == ExecutionState.Halt);
+
+	    var result = vm.Stack.Pop().AsString();
+	    Assert.AreEqual("ABCDEFGHIJKL2", result );
+    }
 }