Fix UT for PR#2215

src/neo/SmartContract/Native/NonfungibleToken.cs

@@ -144,7 +144,7 @@ protected bool Transfer(ApplicationEngine engine, UInt160 to, byte[] tokenId)
                 return false;
             if (!from.Equals(to))
             {
-                token = engine.Snapshot.Storages.GetAndChange(key_token).GetInteroperable<TokenState>();
+                token = engine.Snapshot.GetAndChange(key_token).GetInteroperable<TokenState>();
                 StorageKey key_from = CreateStorageKey(Prefix_Account).Add(from);
                 NFTAccountState account = engine.Snapshot.GetAndChange(key_from).GetInteroperable<NFTAccountState>();
                 account.Remove(tokenId);

tests/neo.UnitTests/IO/Caching/UT_CloneCache.cs

@@ -5,19 +5,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 
 namespace Neo.UnitTests.IO.Caching
 {
     [TestClass]
     public class UT_CloneCache
     {
         ClonedCache clonedCache;
-        MyDataCache<MyKey, MyValue> myDataCache;
+        MyDataCache myDataCache;
 
         [TestInitialize]
         public void Init()
         {
-            myDataCache = new MyDataCache<MyKey, MyValue>();
+            myDataCache = new MyDataCache();
             clonedCache = new ClonedCache(myDataCache);
         }
 
@@ -62,12 +63,12 @@ public void TestFindInternal()
 
             items = clonedCache.Find(new MyKey("key2").ToArray());
             items.ElementAt(0).Key.Should().Be(new MyKey("key2"));
-            items.ElementAt(0).Value.Should().Be(new MyValue("value2"));
+            new MyValue("value2").Should().Be(items.ElementAt(0).Value);
             items.Count().Should().Be(1);
 
             items = clonedCache.Find(new MyKey("key3").ToArray());
             items.ElementAt(0).Key.Should().Be(new MyKey("key3"));
-            items.ElementAt(0).Value.Should().Be(new MyValue("value3"));
+            new MyValue("value3").Should().Be(items.ElementAt(0).Value);
             items.Count().Should().Be(1);
 
             items = clonedCache.Find(new MyKey("key4").ToArray());
@@ -81,9 +82,9 @@ public void TestGetInternal()
             myDataCache.Add(new MyKey("key2"), new MyValue("value2"));
             myDataCache.InnerDict.Add(new MyKey("key3"), new MyValue("value3"));
 
-            clonedCache[new MyKey("key1")].Should().Be(new MyValue("value1"));
-            clonedCache[new MyKey("key2")].Should().Be(new MyValue("value2"));
-            clonedCache[new MyKey("key3")].Should().Be(new MyValue("value3"));
+            new MyValue("value1").Should().Be(clonedCache[new MyKey("key1")]);
+            new MyValue("value2").Should().Be(clonedCache[new MyKey("key2")]);
+            new MyValue("value3").Should().Be(clonedCache[new MyKey("key3")]);
 
             Action action = () =>
             {
@@ -99,9 +100,9 @@ public void TestTryGetInternal()
             myDataCache.Add(new MyKey("key2"), new MyValue("value2"));
             myDataCache.InnerDict.Add(new MyKey("key3"), new MyValue("value3"));
 
-            clonedCache.TryGet(new MyKey("key1")).Should().Be(new MyValue("value1"));
-            clonedCache.TryGet(new MyKey("key2")).Should().Be(new MyValue("value2"));
-            clonedCache.TryGet(new MyKey("key3")).Should().Be(new MyValue("value3"));
+            new MyValue("value1").Should().Be(clonedCache.TryGet(new MyKey("key1")));
+            new MyValue("value2").Should().Be(clonedCache.TryGet(new MyKey("key2")));
+            new MyValue("value3").Should().Be(clonedCache.TryGet(new MyKey("key3")));
             clonedCache.TryGet(new MyKey("key4")).Should().BeNull();
         }
 
@@ -112,16 +113,16 @@ public void TestUpdateInternal()
             myDataCache.Add(new MyKey("key2"), new MyValue("value2"));
             myDataCache.InnerDict.Add(new MyKey("key3"), new MyValue("value3"));
 
-            clonedCache.GetAndChange(new MyKey("key1")).Value = "value_new_1";
-            clonedCache.GetAndChange(new MyKey("key2")).Value = "value_new_2";
-            clonedCache.GetAndChange(new MyKey("key3")).Value = "value_new_3";
+            clonedCache.GetAndChange(new MyKey("key1")).Value = Encoding.Default.GetBytes("value_new_1");
+            clonedCache.GetAndChange(new MyKey("key2")).Value = Encoding.Default.GetBytes("value_new_2");
+            clonedCache.GetAndChange(new MyKey("key3")).Value = Encoding.Default.GetBytes("value_new_3");
 
             clonedCache.Commit();
 
-            clonedCache[new MyKey("key1")].Should().Be(new MyValue("value_new_1"));
-            clonedCache[new MyKey("key2")].Should().Be(new MyValue("value_new_2"));
-            clonedCache[new MyKey("key3")].Should().Be(new MyValue("value_new_3"));
-            myDataCache[new MyKey("key2")].Should().Be(new MyValue("value_new_2"));
+            new MyValue("value_new_1").Should().Be(clonedCache[new MyKey("key1")]);
+            new MyValue("value_new_2").Should().Be(clonedCache[new MyKey("key2")]);
+            new MyValue("value_new_3").Should().Be(clonedCache[new MyKey("key3")]);
+            new MyValue("value_new_2").Should().Be(clonedCache[new MyKey("key2")]);
         }
     }
 }