Notification tests implementation for TestMoneroWalletCommon

Author: everoddandeven

Monero.Test/TestMoneroConnectionManager.cs

@@ -103,7 +103,7 @@ public void TestConnectionManager()
             TestUtils.StopWalletRpcProcess(walletRpcs[2]);
             TestUtils.StopWalletRpcProcess(walletRpcs[3]);
             TestUtils.StopWalletRpcProcess(walletRpcs[4]);
-            Thread.Sleep(TestUtils.SYNC_PERIOD_IN_MS + 100); // allow time to poll
+            GenUtils.WaitFor(TestUtils.SYNC_PERIOD_IN_MS + 100); // allow time to poll
             Assert.False(connectionManager.IsConnected());
             Assert.False(connectionManager.GetConnection().IsOnline());
             Assert.Null(connectionManager.GetConnection().IsAuthenticated());
@@ -143,7 +143,7 @@ public void TestConnectionManager()
 
             // test auto switch when disconnected
             connectionManager.SetAutoSwitch(true);
-            Thread.Sleep(TestUtils.SYNC_PERIOD_IN_MS + 100);
+            GenUtils.WaitFor(TestUtils.SYNC_PERIOD_IN_MS + 100);
             Assert.True(connectionManager.IsConnected());
             connection = connectionManager.GetConnection();
             Assert.True(connection.IsOnline());
@@ -251,7 +251,7 @@ public void TestConnectionManager()
             // shut down all connections
             connection = connectionManager.GetConnection();
             foreach (MoneroWalletRpc walletRpc in walletRpcs) TestUtils.StopWalletRpcProcess(walletRpc);
-            Thread.Sleep(TestUtils.SYNC_PERIOD_IN_MS + 100);
+            GenUtils.WaitFor(TestUtils.SYNC_PERIOD_IN_MS + 100);
             Assert.False(connection.IsOnline());
             Assert.True(++numExpectedChanges == listener.ChangedConnections.Count);
             Assert.True(listener.ChangedConnections[listener.ChangedConnections.Count - 1] == connection);

Monero.Test/TestMoneroDaemonRpc.cs

@@ -1227,7 +1227,7 @@ public void TestStop()
         daemon.Stop();
 
         // give the daemon time to shut down
-        Thread.Sleep(TestUtils.SYNC_PERIOD_IN_MS);
+        GenUtils.WaitFor(TestUtils.SYNC_PERIOD_IN_MS);
         // try to interact with the daemon
         try
         {

Monero.Test/TestMoneroWalletCommon.cs

@@ -48,7 +48,7 @@ internal abstract class TestUtils
         public static readonly string SEED = "silk mocked cucumber lettuce hope adrenalin aching lush roles fuel revamp baptism wrist ulong tender teardrop midst pastry pigment equip frying inbound pinched ravine frying";
         public static readonly string ADDRESS = "A1y9sbVt8nqhZAVm3me1U18rUVXcjeNKuBd1oE2cTs8biA9cozPMeyYLhe77nPv12JA3ejJN3qprmREriit2fi6tJDi99RR";
         public static readonly ulong FIRST_RECEIVE_HEIGHT = 171; // NOTE: this value must be the height of the wallet's first tx for tests
-        public static readonly int SYNC_PERIOD_IN_MS = 5000; // period between wallet syncs in milliseconds
+        public static readonly ulong SYNC_PERIOD_IN_MS = 5000; // period between wallet syncs in milliseconds
         public static readonly string OFFLINE_SERVER_URI = "offline_server_uri"; // dummy server uri to remain offline because wallet2 connects to default if not given
         public static readonly int AUTO_CONNECT_TIMEOUT_MS = 3000;
 

Monero.Test/Utils/TestUtils.cs

@@ -80,7 +80,7 @@ public void WaitForWalletTxsToClearPool(List<MoneroWallet> wallets)
                 }
 
                 // sleep for a moment
-                try { Thread.Sleep(TestUtils.SYNC_PERIOD_IN_MS); }
+                try { GenUtils.WaitFor(TestUtils.SYNC_PERIOD_IN_MS); }
                 catch (Exception e) { throw new MoneroError(e.Message); }
             }
 
@@ -124,7 +124,7 @@ public ulong WaitForUnlockedBalance(MoneroWallet wallet, uint accountIndex, uint
             while (unlockedBalance < minAmount)
             {
                 unlockedBalance = wallet.GetUnlockedBalance(accountIndex, subaddressIndex);
-                try { Thread.Sleep(TestUtils.SYNC_PERIOD_IN_MS); }
+                try { GenUtils.WaitFor(TestUtils.SYNC_PERIOD_IN_MS); }
                 catch (ThreadInterruptedException e) { throw new Exception("Thread was interrupted", e); }
             }
 

Monero.Test/Utils/WalletTxTracker.cs

@@ -106,5 +106,22 @@ public static int[] Subarray(int[] array, int startIndexInclusive, int endIndexE
             Array.Copy(array, startIndexInclusive, subarray, 0, newSize);
             return subarray;
         }
+
+        public static void WaitFor(ulong durationMs) {
+            WaitFor((int)durationMs);
+        }
+
+        public static void WaitFor(int durationMs)
+        {
+            try
+            {
+                // brutto, non mi piace
+                Thread.Sleep((int)durationMs);
+            }
+            catch (ThreadInterruptedException)
+            {
+                throw new Exception("Thread was interrupted while sleeping");
+            }
+        }
     }
 }

Monero/Common/GenUtils.cs

@@ -32,6 +32,12 @@ public override MoneroOutputQuery SetIsSpent(bool? isSpent)
             return this;
         }
 
+        public override MoneroOutputQuery SetIsFrozen(bool? isFrozen)
+        {
+            base.SetIsFrozen(isFrozen);
+            return this;
+        }
+
         public override MoneroOutputQuery SetAccountIndex(uint? accountIndex)
         {
             base.SetAccountIndex(accountIndex);