This is an automated email from the ASF dual-hosted git repository.
dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5f9d2ec IGNITE-11892 Incorrect assert in wal scanner test
5f9d2ec is described below
commit 5f9d2eca0eae26f03b0ac576aa5eefdb9440539b
Author: Anton Kalashnikov <[email protected]>
AuthorDate: Wed Jun 5 16:38:30 2019 +0300
IGNITE-11892 Incorrect assert in wal scanner test
Signed-off-by: Dmitriy Govorukhin <[email protected]>
---
.../persistence/wal/scanner/WalScannerTest.java | 42 +++++++++++++---------
1 file changed, 25 insertions(+), 17 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/scanner/WalScannerTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/scanner/WalScannerTest.java
index 098f16c..469b102 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/scanner/WalScannerTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/scanner/WalScannerTest.java
@@ -96,7 +96,7 @@ public class WalScannerTest {
List<WALRecord> holder = new ArrayList<>();
ScannerHandler recordCaptor = (rec) -> holder.add(rec.get2());
- Set<T2<Integer,Long>> groupAndPageIds = new HashSet<>();
+ Set<T2<Integer, Long>> groupAndPageIds = new HashSet<>();
groupAndPageIds.add(new T2<>(grpId, expPageId));
@@ -148,7 +148,7 @@ public class WalScannerTest {
List<WALRecord> holder = new ArrayList<>();
ScannerHandler recordCaptor = (rec) -> holder.add(rec.get2());
- Set<T2<Integer,Long>> groupAndPageIds = new HashSet<>();
+ Set<T2<Integer, Long>> groupAndPageIds = new HashSet<>();
groupAndPageIds.add(new T2<>(grpId, expPageId1));
groupAndPageIds.add(new T2<>(grpId, expPageId2));
@@ -191,7 +191,7 @@ public class WalScannerTest {
IgniteWalIteratorFactory factory =
mock(IgniteWalIteratorFactory.class);
when(factory.iterator(any(IteratorParametersBuilder.class))).thenReturn(mockedIter);
- Set<T2<Integer,Long>> groupAndPageIds = new HashSet<>();
+ Set<T2<Integer, Long>> groupAndPageIds = new HashSet<>();
groupAndPageIds.add(new T2<>(grpId, expPageId));
@@ -205,9 +205,17 @@ public class WalScannerTest {
assertEquals(actualRecords.size(), 1);
- assertTrue(actualRecords.get(0),
actualRecords.get(0).contains("PageSnapshot ["));
- assertTrue(actualRecords.get(0),
actualRecords.get(0).contains("CheckpointRecord ["));
- assertTrue(actualRecords.get(0),
actualRecords.get(0).contains("FixCountRecord ["));
+ assertRecord(actualRecords.get(0), "PageSnapshot [", "PAGE_RECORD");
+ assertRecord(actualRecords.get(0), "CheckpointRecord [",
"CHECKPOINT_RECORD");
+ assertRecord(actualRecords.get(0), "FixCountRecord [",
"BTREE_FIX_COUNT");
+ }
+
+ /**
+ * @param actual Actual value to check.
+ * @param oneOfExpected One of expected value.
+ */
+ private static void assertRecord(String actual, String... oneOfExpected) {
+ assertTrue(actual,
Arrays.stream(oneOfExpected).anyMatch(actual::contains));
}
/**
@@ -230,7 +238,7 @@ public class WalScannerTest {
IgniteWalIteratorFactory factory =
mock(IgniteWalIteratorFactory.class);
when(factory.iterator(any(IteratorParametersBuilder.class))).thenReturn(mockedIter);
- Set<T2<Integer,Long>> groupAndPageIds = new HashSet<>();
+ Set<T2<Integer, Long>> groupAndPageIds = new HashSet<>();
groupAndPageIds.add(new T2<>(grpId, expectedPageId));
@@ -251,9 +259,9 @@ public class WalScannerTest {
// then: Should be find only expected value from file.
assertEquals(actualRecords.size(), 3);
- assertTrue(actualRecords.get(0),
actualRecords.get(0).contains("PageSnapshot ["));
- assertTrue(actualRecords.get(1),
actualRecords.get(1).contains("CheckpointRecord ["));
- assertTrue(actualRecords.get(2),
actualRecords.get(2).contains("FixCountRecord ["));
+ assertRecord(actualRecords.get(0), "PageSnapshot [", "PAGE_RECORD");
+ assertRecord(actualRecords.get(1), "CheckpointRecord [",
"CHECKPOINT_RECORD");
+ assertRecord(actualRecords.get(2), "FixCountRecord [",
"BTREE_FIX_COUNT");
}
/**
@@ -281,7 +289,7 @@ public class WalScannerTest {
IgniteWalIteratorFactory factory =
mock(IgniteWalIteratorFactory.class);
when(factory.iterator(any(IteratorParametersBuilder.class))).thenReturn(mockedIter);
- Set<T2<Integer,Long>> groupAndPageIds = new HashSet<>();
+ Set<T2<Integer, Long>> groupAndPageIds = new HashSet<>();
groupAndPageIds.add(new T2<>(grpId, expPageId));
@@ -302,18 +310,18 @@ public class WalScannerTest {
// then: Should be find only expected value from file.
assertEquals(actualFileRecords.size(), 3);
- assertTrue(actualFileRecords.get(0),
actualFileRecords.get(0).contains("PageSnapshot ["));
- assertTrue(actualFileRecords.get(1),
actualFileRecords.get(1).contains("CheckpointRecord ["));
- assertTrue(actualFileRecords.get(2),
actualFileRecords.get(2).contains("FixCountRecord ["));
+ assertRecord(actualFileRecords.get(0), "PageSnapshot [",
"PAGE_RECORD");
+ assertRecord(actualFileRecords.get(1), "CheckpointRecord [",
"CHECKPOINT_RECORD");
+ assertRecord(actualFileRecords.get(2), "FixCountRecord [",
"BTREE_FIX_COUNT");
// then: Should be find only expected value from log.
List<String> actualLogRecords = valCapture.getAllValues();
assertEquals(actualLogRecords.size(), 1);
- assertTrue(actualLogRecords.get(0),
actualLogRecords.get(0).contains("PageSnapshot ["));
- assertTrue(actualLogRecords.get(0),
actualLogRecords.get(0).contains("CheckpointRecord ["));
- assertTrue(actualLogRecords.get(0),
actualLogRecords.get(0).contains("FixCountRecord ["));
+ assertRecord(actualLogRecords.get(0), "PageSnapshot [", "PAGE_RECORD");
+ assertRecord(actualLogRecords.get(0), "CheckpointRecord [",
"CHECKPOINT_RECORD");
+ assertRecord(actualLogRecords.get(0), "FixCountRecord [",
"BTREE_FIX_COUNT");
}
/**
