From 295b9972f42e80000218ea896b116e231405a42c Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Thu, 29 Oct 2015 09:38:20 +0000 Subject: [PATCH] LUCENE-6862: Upgrade of RandomizedRunner to version 2.2.0 git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1711203 13f79535-47bb-0310-9956-ffa450edef68 --- dev-tools/idea/.idea/libraries/JUnit.xml | 2 +- lucene/CHANGES.txt | 4 ++++ lucene/ivy-versions.properties | 2 +- lucene/licenses/junit4-ant-2.1.17.jar.sha1 | 1 - lucene/licenses/junit4-ant-2.2.0.jar.sha1 | 1 + lucene/licenses/randomizedtesting-runner-2.1.17.jar.sha1 | 1 - lucene/licenses/randomizedtesting-runner-2.2.0.jar.sha1 | 1 + .../src/test/org/apache/lucene/util/WithNestedTests.java | 2 +- solr/licenses/junit4-ant-2.1.17.jar.sha1 | 1 - solr/licenses/junit4-ant-2.2.0.jar.sha1 | 1 + solr/licenses/randomizedtesting-runner-2.1.17.jar.sha1 | 1 - solr/licenses/randomizedtesting-runner-2.2.0.jar.sha1 | 1 + 12 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 lucene/licenses/junit4-ant-2.1.17.jar.sha1 create mode 100644 lucene/licenses/junit4-ant-2.2.0.jar.sha1 delete mode 100644 lucene/licenses/randomizedtesting-runner-2.1.17.jar.sha1 create mode 100644 lucene/licenses/randomizedtesting-runner-2.2.0.jar.sha1 delete mode 100644 solr/licenses/junit4-ant-2.1.17.jar.sha1 create mode 100644 solr/licenses/junit4-ant-2.2.0.jar.sha1 delete mode 100644 solr/licenses/randomizedtesting-runner-2.1.17.jar.sha1 create mode 100644 solr/licenses/randomizedtesting-runner-2.2.0.jar.sha1 diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml index 38158b7af95..9df587247a6 100644 --- a/dev-tools/idea/.idea/libraries/JUnit.xml +++ b/dev-tools/idea/.idea/libraries/JUnit.xml @@ -2,7 +2,7 @@ - + diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 35f1ada64f4..2a853dfeaed 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -233,6 +233,10 @@ Bug Fixes Other +* LUCENE-6478: Test execution can hang with java.security.debug. (Dawid Weiss) + +* LUCENE-6862: Upgrade of RandomizedRunner to version 2.2.0. (Dawid Weiss) + * LUCENE-6857: Validate StandardQueryParser with NOT operator with-in parantheses. (Jigar Shah via Dawid Weiss) diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index 0b6db2141ff..31c125d9cfe 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -7,7 +7,7 @@ /cglib/cglib-nodep = 2.2 /com.adobe.xmp/xmpcore = 5.1.2 -com.carrotsearch.randomizedtesting.version = 2.1.17 +com.carrotsearch.randomizedtesting.version = 2.2.0 /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} diff --git a/lucene/licenses/junit4-ant-2.1.17.jar.sha1 b/lucene/licenses/junit4-ant-2.1.17.jar.sha1 deleted file mode 100644 index 4a45eb89708..00000000000 --- a/lucene/licenses/junit4-ant-2.1.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afcdd0466514053750c1bcd1eeb0b152c48bc53e diff --git a/lucene/licenses/junit4-ant-2.2.0.jar.sha1 b/lucene/licenses/junit4-ant-2.2.0.jar.sha1 new file mode 100644 index 00000000000..1290d64c9e7 --- /dev/null +++ b/lucene/licenses/junit4-ant-2.2.0.jar.sha1 @@ -0,0 +1 @@ +0d401c9c729deccd5db8a5df3102eb18793c2224 diff --git a/lucene/licenses/randomizedtesting-runner-2.1.17.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.1.17.jar.sha1 deleted file mode 100644 index 623a4756718..00000000000 --- a/lucene/licenses/randomizedtesting-runner-2.1.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d1eae63c4b7f6dd1959ae314c53da06b3ae7dc79 diff --git a/lucene/licenses/randomizedtesting-runner-2.2.0.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.2.0.jar.sha1 new file mode 100644 index 00000000000..b23b23fb373 --- /dev/null +++ b/lucene/licenses/randomizedtesting-runner-2.2.0.jar.sha1 @@ -0,0 +1 @@ +60de504132241be049564a3a34fd7dcc296e2ef0 diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java b/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java index 3c1044f1f61..55285218adc 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java @@ -177,7 +177,7 @@ public abstract class WithNestedTests { b.append("\n"); b.append(f.getTrace()); } - RandomizedTest.assertFalse("Expected failures: " + expected + " but was " + + Assert.assertFalse("Expected failures: " + expected + " but was " + result.getFailureCount() + ", failures below: " + b.toString(), true); } } diff --git a/solr/licenses/junit4-ant-2.1.17.jar.sha1 b/solr/licenses/junit4-ant-2.1.17.jar.sha1 deleted file mode 100644 index 4a45eb89708..00000000000 --- a/solr/licenses/junit4-ant-2.1.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afcdd0466514053750c1bcd1eeb0b152c48bc53e diff --git a/solr/licenses/junit4-ant-2.2.0.jar.sha1 b/solr/licenses/junit4-ant-2.2.0.jar.sha1 new file mode 100644 index 00000000000..1290d64c9e7 --- /dev/null +++ b/solr/licenses/junit4-ant-2.2.0.jar.sha1 @@ -0,0 +1 @@ +0d401c9c729deccd5db8a5df3102eb18793c2224 diff --git a/solr/licenses/randomizedtesting-runner-2.1.17.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.1.17.jar.sha1 deleted file mode 100644 index 623a4756718..00000000000 --- a/solr/licenses/randomizedtesting-runner-2.1.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d1eae63c4b7f6dd1959ae314c53da06b3ae7dc79 diff --git a/solr/licenses/randomizedtesting-runner-2.2.0.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.2.0.jar.sha1 new file mode 100644 index 00000000000..b23b23fb373 --- /dev/null +++ b/solr/licenses/randomizedtesting-runner-2.2.0.jar.sha1 @@ -0,0 +1 @@ +60de504132241be049564a3a34fd7dcc296e2ef0