Author: adulceanu
Date: Wed Jan 31 11:09:41 2018
New Revision: 1822790
URL: http://svn.apache.org/viewvc?rev=1822790&view=rev
Log:
OAK-6373 - oak-run check should also check checkpoints
Adapted old tests to accept new head and checkpoints arguments
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckInvalidRepositoryTest.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckValidRepositoryTest.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckInvalidRepositoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckInvalidRepositoryTest.java?rev=1822790&r1=1822789&r2=1822790&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckInvalidRepositoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckInvalidRepositoryTest.java
Wed Jan 31 11:09:41 2018
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.segmen
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -56,6 +57,8 @@ public class CheckInvalidRepositoryTest
.withPath(new File(temporaryFolder.getRoot().getAbsolutePath()))
.withJournal("journal.log")
.withDebugInterval(Long.MAX_VALUE)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withCheckBinaries(true)
.withFilterPaths(filterPaths)
.withOutWriter(outWriter)
@@ -89,6 +92,8 @@ public class CheckInvalidRepositoryTest
.withJournal("journal.log")
.withDebugInterval(Long.MAX_VALUE)
.withCheckBinaries(true)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withFilterPaths(filterPaths)
.withOutWriter(outWriter)
.withErrWriter(errWriter)
@@ -121,6 +126,8 @@ public class CheckInvalidRepositoryTest
.withJournal("journal.log")
.withDebugInterval(Long.MAX_VALUE)
.withCheckBinaries(true)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withFilterPaths(filterPaths)
.withOutWriter(outWriter)
.withErrWriter(errWriter)
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckValidRepositoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckValidRepositoryTest.java?rev=1822790&r1=1822789&r2=1822790&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckValidRepositoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tooling/CheckValidRepositoryTest.java
Wed Jan 31 11:09:41 2018
@@ -21,14 +21,14 @@ package org.apache.jackrabbit.oak.segmen
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
+import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.segment.tool.Check;
import org.junit.Test;
-import com.google.common.collect.Lists;
-
/**
* Tests for {@link CheckCommand} assuming a consistent repository.
*/
@@ -50,6 +50,8 @@ public class CheckValidRepositoryTest ex
.withJournal("journal.log")
.withDebugInterval(Long.MAX_VALUE)
.withCheckBinaries(true)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withFilterPaths(filterPaths)
.withIOStatistics(true)
.withOutWriter(outWriter)
@@ -60,7 +62,7 @@ public class CheckValidRepositoryTest ex
outWriter.close();
errWriter.close();
- assertExpectedOutput(strOut.toString(), Lists.newArrayList("Searched
through 1 revisions", "Checked 7 nodes and 21 properties",
+ assertExpectedOutput(strOut.toString(), Lists.newArrayList("Searched
through 1 revisions and 0 checkpoints", "Checked 7 nodes and 21 properties",
"Path / is consistent"));
assertExpectedOutput(strErr.toString(), Lists.newArrayList(""));
}
@@ -86,6 +88,8 @@ public class CheckValidRepositoryTest ex
.withJournal("journal.log")
.withDebugInterval(Long.MAX_VALUE)
.withCheckBinaries(true)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withFilterPaths(filterPaths)
.withIOStatistics(true)
.withOutWriter(outWriter)
@@ -118,6 +122,8 @@ public class CheckValidRepositoryTest ex
.withPath(new File(temporaryFolder.getRoot().getAbsolutePath()))
.withJournal("journal.log")
.withDebugInterval(Long.MAX_VALUE)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withFilterPaths(filterPaths)
.withIOStatistics(true)
.withOutWriter(outWriter)
@@ -151,6 +157,8 @@ public class CheckValidRepositoryTest ex
.withPath(new File(temporaryFolder.getRoot().getAbsolutePath()))
.withJournal("journal.log")
.withDebugInterval(Long.MAX_VALUE)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withFilterPaths(filterPaths)
.withIOStatistics(true)
.withOutWriter(outWriter)
@@ -182,6 +190,8 @@ public class CheckValidRepositoryTest ex
.withPath(new File(temporaryFolder.getRoot().getAbsolutePath()))
.withJournal("journal.log")
.withDebugInterval(Long.MAX_VALUE)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withFilterPaths(filterPaths)
.withIOStatistics(true)
.withOutWriter(outWriter)
@@ -217,6 +227,8 @@ public class CheckValidRepositoryTest ex
.withDebugInterval(Long.MAX_VALUE)
.withFilterPaths(filterPaths)
.withCheckBinaries(true)
+ .withCheckHead(true)
+ .withCheckpoints(new HashSet<String>())
.withIOStatistics(true)
.withOutWriter(outWriter)
.withErrWriter(errWriter)
