Merge branch 'master' into migrate-uts-2

tests/Neo.Compiler.CSharp.UnitTests/TestCleanup.cs

@@ -60,6 +60,7 @@ internal static CompilationContext[] EnsureArtifactsUpToDateInternal()
 
             // Get all artifacts loaded in this assembly
 
+            compilationContexts = results.ToArray();
             var b = Assembly.GetExecutingAssembly().GetTypes();
             foreach (var type in b)
             {
@@ -89,7 +90,6 @@ internal static CompilationContext[] EnsureArtifactsUpToDateInternal()
                 Assert.Fail("Error compiling templates");
             }
 
-            compilationContexts = results.ToArray();
             return compilationContexts;
         }
 

tests/Neo.Compiler.CSharp.UnitTests/UnitTest_ABI_Attributes.cs

@@ -0,0 +1,20 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Neo.Json;
+using Neo.SmartContract.Testing;
+using System.Linq;
+
+namespace Neo.Compiler.CSharp.UnitTests
+{
+    [TestClass]
+    public class UnitTest_ABI_Attributes
+    {
+        [TestMethod]
+        public void TestAbiAttributes()
+        {
+            var permissions = new JArray(Contract_ABIAttributes.Manifest.Permissions.Select(p => p.ToJson()).ToArray()).ToString(false);
+            Assert.AreEqual(@"[{""contract"":""0x0102030405060708090a0102030405060708090a"",""methods"":[""testArgs1"",""testVoid""]},{""contract"":""0x01ff00ff00ff00ff00ff00ff00ff00ff00ff00a4"",""methods"":[""a"",""b""]},{""contract"":""*"",""methods"":[""c""]}]", permissions);
+            var trust = Contract_ABIAttributes.Manifest.Trusts.ToJson(p => p.ToJson());
+            Assert.AreEqual(@"[""0x0a0b00ff00ff00ff00ff00ff00ff00ff00ff00a4""]", trust.ToString(false));
+        }
+    }
+}

tests/Neo.Compiler.CSharp.UnitTests/OldEngine/UnitTest_ABI_Event.cs → tests/Neo.Compiler.CSharp.UnitTests/UnitTest_ABI_Event.cs

@@ -1,17 +1,15 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.SmartContract.TestEngine;
+using Neo.SmartContract.Testing;
 
-namespace Neo.Compiler.CSharp.UnitTests.OldEngine
+namespace Neo.Compiler.CSharp.UnitTests
 {
     [TestClass]
     public class UnitTest_ABI_Event
     {
         [TestMethod]
         public void Test_Good()
         {
-            var testengine = new TestEngine();
-            testengine.AddEntryScript(Utils.Extensions.TestContractRoot + "Contract_Event.cs");
-            var abi = testengine.Manifest.Abi;
+            var abi = Contract_Event.Manifest.Abi;
             var events = abi.Events[0].ToJson().ToString(false);
 
             string expecteventabi = @"{""name"":""transfer"",""parameters"":[{""name"":""arg1"",""type"":""ByteArray""},{""name"":""arg2"",""type"":""ByteArray""},{""name"":""arg3"",""type"":""Integer""}]}";

tests/Neo.Compiler.CSharp.UnitTests/UnitTest_ABI_Safe.cs

@@ -0,0 +1,17 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Neo.SmartContract.Testing;
+
+namespace Neo.Compiler.CSharp.UnitTests
+{
+    [TestClass]
+    public class UnitTest_ABI_Safe
+    {
+        [TestMethod]
+        public void UnitTest_TestSafe()
+        {
+            Assert.IsFalse(Contract_ABISafe.Manifest.Abi.Methods[0].Safe);
+            Assert.IsTrue(Contract_ABISafe.Manifest.Abi.Methods[1].Safe);
+            Assert.IsFalse(Contract_ABISafe.Manifest.Abi.Methods[2].Safe);
+        }
+    }
+}

tests/Neo.Compiler.CSharp.UnitTests/UnitTest_Delegate.cs

@@ -0,0 +1,18 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Neo.SmartContract.Testing;
+using Neo.SmartContract.Testing.TestingStandards;
+
+namespace Neo.Compiler.CSharp.UnitTests
+{
+    [TestClass]
+    public class UnitTest_Delegate : TestBase<Contract_Delegate>
+    {
+        public UnitTest_Delegate() : base(Contract_Delegate.Nef, Contract_Delegate.Manifest) { }
+
+        [TestMethod]
+        public void TestFunc()
+        {
+            Assert.AreEqual(5, Contract.SumFunc(2, 3));
+        }
+    }
+}