Fixing rowset holder tests

dasatomic · Dec 1, 2021 · a13ff3e · a13ff3e
1 parent dc44ea0
commit a13ff3e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/tests/E2EQueryExecutionTests/FileSystemProviderTests.cs b/tests/E2EQueryExecutionTests/FileSystemProviderTests.cs
@@ -125,6 +125,7 @@ public async Task VideoChunkerTest()
         }
 
         [Test]
+        [Ignore("Takes 20s. Use it only in full runs")]
         public async Task VideoImageExtraction()
         {
             await using ITransaction tran = this.logManager.CreateTransaction(pageManager, "GET_ROWS");

diff --git a/tests/PageManagerTests/FixedRowsetHolderTests.cs b/tests/PageManagerTests/FixedRowsetHolderTests.cs
@@ -353,9 +353,10 @@ public void InsertOrderedMultipleSeq()
 
             Assert.AreEqual(100, rs.GetRowCount());
 
-            for (int i = 0; i < 100; i++)
+            int expected = 0;
+            foreach (RowHolder rh in rs.Iterate(schema))
             {
-                Assert.AreEqual(i, rs.GetRowGeneric<int>(i, 0));
+                Assert.AreEqual(expected++, rh.GetField<int>(0));
             }
         }
 
@@ -385,9 +386,10 @@ public void InsertOrderedMultipleSeqReverse()
 
             Assert.AreEqual(100, rs.GetRowCount());
 
-            for (int i = 0; i < 100; i++)
+            int expected = 0;
+            foreach (RowHolder rh in rs.Iterate(schema))
             {
-                Assert.AreEqual(i, rs.GetRowGeneric<int>(i, 0));
+                Assert.AreEqual(expected++, rh.GetField<int>(0));
             }
         }
 
@@ -416,10 +418,12 @@ public void InsertOrderedMultipleSeqReverseMultiColumn()
 
             Assert.AreEqual(100, rs.GetRowCount());
 
-            for (int i = 0; i < 100; i++)
+            int expected = 0;
+            foreach (RowHolder rh in rs.Iterate(schema))
             {
-                Assert.AreEqual(i, rs.GetRowGeneric<int>(i, 0));
-                Assert.AreEqual(i * 1.1, rs.GetRowGeneric<double>(i, 1));
+                Assert.AreEqual(expected, rh.GetField<int>(0));
+                Assert.AreEqual(expected * 1.1, rh.GetField<double>(1));
+                expected++;
             }
         }
 
@@ -458,9 +462,11 @@ public void InsertOrderedRandom()
 
             Assert.AreEqual(maxRowCount, rs.GetRowCount());
 
-            for (int i = 0; i < maxRowCount; i++)
+            int pos = 0;
+            foreach (RowHolder rh in rs.Iterate(schema))
             {
-                Assert.AreEqual(sortedArray[i], rs.GetRowGeneric<int>(i, 0));
+                Assert.AreEqual(sortedArray[pos], rh.GetField<int>(0));
+                pos++;
             }
         }
 
@@ -503,13 +509,13 @@ public void InsertOrderedRandomMultipleColumns()
 
             Assert.AreEqual(maxRowCount, rs.GetRowCount());
 
-            for (int i = 0; i < maxRowCount; i++)
+            int pos = 0;
+            foreach (RowHolder rh in rs.Iterate(schema))
             {
-                var rhf = new RowHolder(schema);
-                rs.GetRow(i, ref rhf);
-                Assert.AreEqual(sortedArray[i], rhf.GetField<int>(0));
-                Assert.AreEqual(sortedArray[i] * 1.1, rhf.GetField<double>(1));
-                Assert.AreEqual(sortedArray[i].ToString(), new string(rhf.GetStringField(2)));
+                Assert.AreEqual(sortedArray[pos], rh.GetField<int>(0));
+                Assert.AreEqual(sortedArray[pos] * 1.1, rh.GetField<double>(1));
+                Assert.AreEqual(sortedArray[pos].ToString(), new string(rh.GetStringField(2)));
+                pos++;
             }
         }