Fix coverage results (#192)

* Add UT * Fix namespaces and coverage * change exclude * fix quotes
neo-project · Mar 2, 2020 · adf9425 · adf9425
1 parent cf4f8c8
commit adf9425
Show file tree

Hide file tree

Showing 49 changed files with 85 additions and 67 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,9 +26,9 @@ jobs:
     - name: Add package coverlet.msbuild
       run: find tests -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild
     - name: Test Neo.Compiler.MSIL.UnitTests
-      run: dotnet test tests/Neo.Compiler.MSIL.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/ /p:Exclude="[Neo.SmartContract.*]*"
+      run: dotnet test tests/Neo.Compiler.MSIL.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/ /p:Exclude=\"[Neo.SmartContract.*]*,[Neo.Compiler.MSIL.UnitTests]*,[Neo.Compiler.MSIL.UnitTests.*]*\"
     - name: Test Neo.SmartContract.Framework.UnitTests
-      run: dotnet test tests/Neo.SmartContract.Framework.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json /p:Exclude="[Neo.SmartContract.*]*" /p:CoverletOutputFormat=lcov
+      run: dotnet test tests/Neo.SmartContract.Framework.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json /p:Exclude=\"[Neo.SmartContract.*]*,[Neo.Compiler.MSIL.UnitTests]*,[Neo.Compiler.MSIL.UnitTests.*]*\" /p:CoverletOutputFormat=lcov
     - name: Coveralls
       uses: coverallsapp/github-action@master
       with:

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract1.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract1.cs
@@ -1,4 +1,4 @@
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     public class Contract1 : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract2.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract2.cs
@@ -1,4 +1,4 @@
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     public class Contract2 : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_Array.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_Array.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Numerics;
 
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     struct State
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_Event.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_Event.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Numerics;
 
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     public class Contract_Event : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_MultipleContracts.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_MultipleContracts.cs
@@ -1,6 +1,6 @@
 using Neo.SmartContract.Framework;
 
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_a : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_MultipleContracts2.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_MultipleContracts2.cs
@@ -1,6 +1,6 @@
 using Neo.SmartContract.Framework;
 
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_a : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_NULL.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_NULL.cs
@@ -1,6 +1,7 @@
 using Neo.SmartContract.Framework.Services.Neo;
 using Neo.SmartContract.Framework;
-namespace Neo.Compiler.MSIL.TestClasses
+
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_NULL : SmartContract.Framework.SmartContract
     {
@@ -40,10 +41,22 @@ public static string NullCollation(string code)
             string myname = code ?? "linux";
             return myname;
         }
+
+        public static bool IfNull(object obj)
+        {
+            if ((bool)obj)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         public static object NullCollationAndCollation(string code)
         {
             return Storage.Get(code)?.AsBigInteger() ?? 123;
         }
+
         public static object NullCollationAndCollation2(string code)
         {
             Storage.Put(code, "111");

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_StaticVar.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_StaticVar.cs
@@ -1,4 +1,4 @@
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_staticvar : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_StaticVarInit.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_StaticVarInit.cs
@@ -1,6 +1,6 @@
 using Neo.SmartContract.Framework.Services.System;
 
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_staticvar : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_Switch6.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_Switch6.cs
@@ -1,4 +1,4 @@
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_SwitchValid : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_SwitchLong.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_SwitchLong.cs
@@ -1,4 +1,4 @@
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_SwitchInvalid : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_WrongEvent.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_WrongEvent.cs
@@ -1,6 +1,6 @@
-using System.ComponentModel;
+using System.ComponentModel;
 
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     public class Contract_WrongEvent : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_appcall.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_appcall.cs
@@ -1,6 +1,6 @@
 using Neo.SmartContract.Framework;
 
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_syscall : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_autoentrypoint.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_autoentrypoint.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_autoentrypoint : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_shift.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_shift.cs
@@ -1,4 +1,4 @@
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_shift : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_shift_bigint.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_shift_bigint.cs
@@ -1,4 +1,4 @@
-namespace Neo.Compiler.MSIL.TestClasses
+namespace Neo.Compiler.MSIL.UnitTests.TestClasses
 {
     class Contract_shift_bigint : SmartContract.Framework.SmartContract
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/NoContract.cs b/tests/Neo.Compiler.MSIL.UnitTests/TestClasses/NoContract.cs
@@ -1,5 +1,3 @@
-using Neo.SmartContract.Framework;
-
 namespace Neo.Compiler.MSIL.TestClasses
 {
     class NoContract 

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest1.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest1.cs
@@ -1,9 +1,9 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.VM.Types;
 using System;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest1

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_ABI_Event.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_ABI_Event.cs
@@ -1,9 +1,8 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
-using Neo.VM;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using System;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_ABI_Event

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Appcall.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Appcall.cs
@@ -1,8 +1,8 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.VM.Types;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_AppCall

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Array.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Array.cs
@@ -1,9 +1,9 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.VM.Types;
 using System.Linq;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_Array

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_AutoEntrypoint.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_AutoEntrypoint.cs
@@ -1,9 +1,9 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.VM;
 using Neo.VM.Types;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_AutoEntryPoint

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_EntryPoints.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_EntryPoints.cs
@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_EntryPoints

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_NULL.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_NULL.cs
@@ -1,9 +1,9 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.SmartContract.Manifest;
 using Neo.VM.Types;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_NULL
@@ -39,6 +39,17 @@ public void IsNull()
             Assert.IsFalse(item.ToBoolean());
         }
 
+        [TestMethod]
+        public void IfNull()
+        {
+            testengine.Reset();
+            var result = testengine.ExecuteTestCaseStandard("ifNull", StackItem.Null);
+            var item = result.Pop();
+
+            Assert.IsInstanceOfType(item, typeof(Integer));
+            Assert.IsFalse(item.ToBoolean());
+        }
+
         [TestMethod]
         public void NullCoalescing()
         {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Shift.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Shift.cs
@@ -1,11 +1,11 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.SmartContract;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_Shift

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_StaticVar.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_StaticVar.cs
@@ -1,8 +1,8 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.VM.Types;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_StaticVar

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Switch.cs b/tests/Neo.Compiler.MSIL.UnitTests/UnitTest_Switch.cs
@@ -1,8 +1,8 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.VM;
 
-namespace Neo.Compiler.MSIL
+namespace Neo.Compiler.MSIL.UnitTests
 {
     [TestClass]
     public class UnitTest_Switch

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/BuildScript.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/BuildScript.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Neo.Compiler.MSIL.Utils
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     public class BuildScript
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/DefLogger.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/DefLogger.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Neo.Compiler.MSIL.Utils
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     internal class DefLogger : ILogger
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/NeonTestTool.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/NeonTestTool.cs
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Neo.Compiler.MSIL.Utils
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     internal static class NeonTestTool
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestDataCache.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestDataCache.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Neo.Compiler.MSIL.Utils
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     public class TestDataCache<TKey, TValue> : DataCache<TKey, TValue>
         where TKey : IEquatable<TKey>, ISerializable

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestEngine.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestEngine.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Neo.Compiler.MSIL.Utils
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     public class TestEngine : ApplicationEngine
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestMetaDataCache.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestMetaDataCache.cs
@@ -1,7 +1,7 @@
 using Neo.IO;
 using Neo.IO.Caching;
 
-namespace Neo.Compiler.MSIL.Utils
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     public class TestMetaDataCache<T> : MetaDataCache<T> where T : class, ICloneable<T>, ISerializable, new()
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestSnapshot.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestSnapshot.cs
@@ -4,7 +4,7 @@
 using Neo.Network.P2P.Payloads;
 using Neo.Persistence;
 
-namespace Neo.Compiler.MSIL.Utils
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     public class TestSnapshot : StoreView
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestStorageContext.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/TestStorageContext.cs
@@ -1,4 +1,4 @@
-namespace Neo.Compiler.MSIL.Utils
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     class TestStorageContext
     {

diff --git a/tests/Neo.Compiler.MSIL.UnitTests/Utils/base58.cs b/tests/Neo.Compiler.MSIL.UnitTests/Utils/base58.cs
@@ -1,12 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 
-namespace ThinNeo.Cryptography.Cryptography
+namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
     public static class Base58
     {

diff --git a/tests/Neo.SmartContract.Framework.UnitTests/FeatureTest.cs b/tests/Neo.SmartContract.Framework.UnitTests/FeatureTest.cs
@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using System.Linq;
 
 namespace Neo.SmartContract.Framework.UnitTests

diff --git a/tests/Neo.SmartContract.Framework.UnitTests/Services/Neo/AccountTest.cs b/tests/Neo.SmartContract.Framework.UnitTests/Services/Neo/AccountTest.cs
@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.Ledger;
 using Neo.VM.Types;
 

diff --git a/tests/Neo.SmartContract.Framework.UnitTests/Services/Neo/BlockchainTest.cs b/tests/Neo.SmartContract.Framework.UnitTests/Services/Neo/BlockchainTest.cs
@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Compiler.MSIL.Utils;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.IO;
 using Neo.Ledger;
 using Neo.VM;