You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/05/18 07:12:23 UTC
svn commit: r1795487 - in /jackrabbit/oak/trunk/oak-run: pom.xml
src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
Author: chetanm
Date: Thu May 18 07:12:22 2017
New Revision: 1795487
URL: http://svn.apache.org/viewvc?rev=1795487&view=rev
Log:
OAK-6234 - Update jopt-simple version to 5.0.3
The new version has a slight change in exception message format. So adapted
the tests assertions for the same
Modified:
jackrabbit/oak/trunk/oak-run/pom.xml
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1795487&r1=1795486&r2=1795487&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Thu May 18 07:12:22 2017
@@ -237,7 +237,7 @@
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
- <version>4.6</version>
+ <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java?rev=1795487&r1=1795486&r2=1795487&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java Thu May 18 07:12:22 2017
@@ -198,7 +198,7 @@ public class DataStoreCheckTest {
.newArrayList("--" + dsOption, cfgFilePath, "--store", storePath,
"--dump", dump.getAbsolutePath());
log.info("Running testMissinOpParams: {}", argsList);
- testIncorrectParams(argsList, Lists.newArrayList("Missing required option(s)", "'id'", "'ref'", "'consistency'"));
+ testIncorrectParams(argsList, Lists.newArrayList("Missing required option(s)", "id", "ref", "consistency"));
}
@Test
@@ -219,12 +219,12 @@ public class DataStoreCheckTest {
List<String> argsList = Lists
.newArrayList("--consistency", "--" + dsOption, cfgFilePath,
"--dump", dump.getAbsolutePath());
- testIncorrectParams(argsList, Lists.newArrayList("Missing required option(s) ['store']"));
+ testIncorrectParams(argsList, Lists.newArrayList("Missing required option(s) [store]"));
argsList = Lists
.newArrayList("--ref", "--" + dsOption, cfgFilePath,
"--dump", dump.getAbsolutePath());
- testIncorrectParams(argsList, Lists.newArrayList("Missing required option(s) ['store']"));
+ testIncorrectParams(argsList, Lists.newArrayList("Missing required option(s) [store]"));
}
public static void testIncorrectParams(List<String> argList, ArrayList<String> assertMsg) throws Exception {