FrancoisZhang commented on a change in pull request #525:
URL: https://github.com/apache/jackrabbit-oak/pull/525#discussion_r834562588
##########
File path:
oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionTest.java
##########
@@ -80,39 +85,63 @@ public void deleteOldIndexCompletely() throws Exception {
createCustomIndex(TEST_INDEX_PATH, 4, 0, false);
createCustomIndex(TEST_INDEX_PATH, 4, 1, false);
createCustomIndex(TEST_INDEX_PATH, 4, 2, false);
- fixture.getAsyncIndexUpdate("async").run();
- fixture.close();
- PurgeOldIndexVersionCommand command = new
PurgeOldIndexVersionCommand();
- File storeDir = fixture.getDir();
- String[] args = {
- storeDir.getAbsolutePath(),
- "--read-write",
- "--threshold=1"
- };
- command.execute(args);
- fixture = new RepositoryFixture(storeDir);
- fixture.close();
+ runIndexPurgeCommand(true, 1, "");
+
+ NodeState indexRootNode =
fixture.getNodeStore().getRoot().getChildNode("oak:index");
- Assert.assertFalse("Index:" + "fooIndex-2" + " deleted",
fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-2").exists());
- Assert.assertFalse("Index:" + "fooIndex-2-custom-1" + " deleted",
fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-2-custom-1").exists());
- Assert.assertFalse("Index:" + "fooIndex-3" + " deleted",
fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-3").exists());
- Assert.assertFalse("Index:" + "fooIndex-3-custom-1" + " deleted",
fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-3-custom-1").exists());
- Assert.assertFalse("Index:" + "fooIndex-3-custom-2" + " deleted",
fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-3-custom-2").exists());
- Assert.assertFalse("Index:" + "fooIndex" + " deleted",
fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex").exists());
-
Assert.assertEquals(fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-4").getProperty("type").getValue(Type.STRING),
"disabled");
-
Assert.assertFalse(isHiddenChildNodePresent(fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-4")));
- Assert.assertFalse("Index:" + "fooIndex-4-custom-1" + " deleted",
fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-4-custom-1").exists());
- Assert.assertTrue("Index:" + "fooIndex-4-custom-2" + " deleted",
fixture.getNodeStore().getRoot().getChildNode("oak:index").getChildNode("fooIndex-4-custom-2").exists());
+ Assert.assertFalse("Index:" + "fooIndex-2" + " deleted",
indexRootNode.getChildNode("fooIndex-2").exists());
+ Assert.assertFalse("Index:" + "fooIndex-2-custom-1" + " deleted",
indexRootNode.getChildNode("fooIndex-2-custom-1").exists());
+ Assert.assertFalse("Index:" + "fooIndex-3" + " deleted",
indexRootNode.getChildNode("fooIndex-3").exists());
+ Assert.assertFalse("Index:" + "fooIndex-3-custom-1" + " deleted",
indexRootNode.getChildNode("fooIndex-3-custom-1").exists());
+ Assert.assertFalse("Index:" + "fooIndex-3-custom-2" + " deleted",
indexRootNode.getChildNode("fooIndex-3-custom-2").exists());
+ Assert.assertFalse("Index:" + "fooIndex" + " deleted",
indexRootNode.getChildNode("fooIndex").exists());
+
Assert.assertEquals(indexRootNode.getChildNode("fooIndex-4").getProperty("type").getValue(Type.STRING),
"disabled");
Review comment:
@thomasmueller makes sense, missed this legacy tests, just made another
commit for refining it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
