add StackItemAssertions BeEquivalentTo ReadOnlySpan<byte> overload (#14)

* add StackItemAssertions BeEquivalentTo ReadOnlySpan<byte> overload * GetContractAddress -> GetContractScriptHash * update Neo.BlockchainToolkit3 Version Co-authored-by: Harry <harrypierson@outlook.com>
N3developertoolkit · Jun 22, 2021 · 4f35fc0 · 4f35fc0
1 parent 90c3f1f
commit 4f35fc0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/src/assertions/StackItemAssertions.cs b/src/assertions/StackItemAssertions.cs
@@ -37,6 +37,8 @@ public AndConstraint<StackItemAssertions> BeEquivalentTo(object? expected, strin
                     bool expectedBool => BeEquivalentTo(expectedBool, because, becauseArgs),
                     UInt160 expectedHash => BeEquivalentTo(expectedHash, because, becauseArgs),
                     UInt256 expectedHash => BeEquivalentTo(expectedHash, because, becauseArgs),
+                    byte[] expectedByteArray => BeEquivalentTo(expectedByteArray.AsSpan(), because, becauseArgs),
+                    ReadOnlyMemory<byte> expectedMemory => BeEquivalentTo(expectedMemory.Span, because, becauseArgs),
                     _ => UnsupportedType(expected)
                 };
             }
@@ -170,5 +172,28 @@ public AndConstraint<StackItemAssertions> BeEquivalentTo(UInt256 expected, strin
 
             return new AndConstraint<StackItemAssertions>(this);
         }
+
+        public AndConstraint<StackItemAssertions> BeEquivalentTo(ReadOnlySpan<byte> expected, string because = "", params object[] becauseArgs)
+        {
+            try
+            {
+                var span = Subject.GetSpan();
+
+                Execute.Assertion
+                    .BecauseOf(because, becauseArgs)
+                    .ForCondition(span.SequenceEqual(expected))
+                    .FailWith("Expected {context:StackItem} to be {0}{reason}, but found {1}.", 
+                        Convert.ToHexString(expected), Convert.ToHexString(span));
+            }
+            catch (Exception ex)
+            {
+                Execute.Assertion
+                    .BecauseOf(because, becauseArgs)
+                    .FailWith("Expected {context:StackItem} to support GetString{reason}, but GetString failed with:{0}.", ex.Message);
+            }
+
+            return new AndConstraint<StackItemAssertions>(this);
+        }
+
     }
 }
diff --git a/src/test-harness/Extensions.cs b/src/test-harness/Extensions.cs
@@ -42,7 +42,7 @@ public static void LoadScript<T>(this TestApplicationEngine engine, params Expre
         public static Script CreateScript<T>(this DataCache snapshot, params Expression<Action<T>>[] expressions)
             where T : class
         {
-            var scriptHash = snapshot.GetContractAddress<T>();
+            var scriptHash = snapshot.GetContractScriptHash<T>();
             using var builder = new ScriptBuilder();
             for (int i = 0; i < expressions.Length; i++)
             {
@@ -115,7 +115,7 @@ public static bool TryGetValue(this NeoStorage storage, UInt256 key, [NotNullWhe
         public static BigInteger ToBigInteger(this StorageItem storageItem)
             => new BigInteger(storageItem.Value);
 
-        public static UInt160 GetContractAddress<T>(this DataCache snapshot)
+        public static UInt160 GetContractScriptHash<T>(this DataCache snapshot)
             where T : class
             => snapshot.GetContract<T>().Hash;
 

diff --git a/src/test-harness/test-harness.csproj b/src/test-harness/test-harness.csproj
@@ -7,6 +7,6 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Neo.BlockchainToolkit3" Version="1.0.51-preview" />
+    <PackageReference Include="Neo.BlockchainToolkit3" Version="1.0.52-preview" />
   </ItemGroup>
 </Project>