[08/15] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
GEODE-2433 Backwards compatibility tests are not actually running Tests will now fail of there are no older versions of Geode to test against. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5e6f6734 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5e6f6734 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5e6f6734 Branch: refs/heads/develop Commit: 5e6f67346c75a92084bbb1e46f7f0c016353eb97 Parents: 5554dd2 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:38:47 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 13:31:05 2017 -0800 -- .../cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 8 +++- .../cache/rollingupgrade/RollingUpgradeDUnitTest.java| 8 +++- .../cache/tier/sockets/ClientServerMiscBCDUnitTest.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 14d87f9..5106935 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -112,7 +112,13 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } // just a test flag that can be set when trying to run a test in eclipse and avoiding IllegalState http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 369bc3b..54b51de 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -74,7 +74,13 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } private File[] testingDirs = new File[3]; http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 28fe3f2..be0ac6b 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -32,7 +32,7 @@ import java.util.List; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { throw new RuntimeException("No older versions of Geode were found to test against"); } else {
[10/15] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
GEODE-2433 Backwards compatibility tests are not actually running Show current working directory if unable to run backward compatibility tests. For some reason we aren't finding the classpaths file when running under Jenkins. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c8d10ec6 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c8d10ec6 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c8d10ec6 Branch: refs/heads/develop Commit: c8d10ec6440a3030a5da8c3022fb16fa2809150d Parents: 05b6965 Author: Bruce SchuchardtAuthored: Tue Feb 7 11:07:49 2017 -0800 Committer: Bruce Schuchardt Committed: Tue Feb 7 11:07:49 2017 -0800 -- .../internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 3 ++- .../internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java | 3 ++- .../internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java | 4 +++- .../org/apache/geode/test/dunit/standalone/VersionManager.java | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/c8d10ec6/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 5106935..2137ed8 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -114,7 +114,8 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { public static Collection data() { List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { - throw new RuntimeException("No older versions of Geode were found to test against"); + throw new RuntimeException("No older versions of Geode were found to test against. " + + "Current directory is " + new File(".").getAbsolutePath()); } else { System.out.println("running against these versions: " + result); } http://git-wip-us.apache.org/repos/asf/geode/blob/c8d10ec6/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 54b51de..b105d58 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -76,7 +76,8 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase { public static Collection data() { List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { - throw new RuntimeException("No older versions of Geode were found to test against"); + throw new RuntimeException("No older versions of Geode were found to test against. " + + "Current directory is " + new File(".").getAbsolutePath()); } else { System.out.println("running against these versions: " + result); } http://git-wip-us.apache.org/repos/asf/geode/blob/c8d10ec6/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index be0ac6b..332b386 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -23,6 +23,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import java.io.File; import java.util.Collection; import java.util.List; @@ -34,7 +35,8 @@ public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { public static Collection data() { List result =
[07/15] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
GEODE-2433 Backwards compatibility tests are not actually running The geode-old-versions/build.gradle file was not included in the original commit for backward-compatibility testing. It's needed to establish the old-version source sets and generate the classpaths file used by VersionManager. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5554dd24 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5554dd24 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5554dd24 Branch: refs/heads/develop Commit: 5554dd24a3932900b28956cac357f0e4bbe9d6e0 Parents: 90760d3 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:32:59 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 13:30:51 2017 -0800 -- .../sockets/ClientServerMiscBCDUnitTest.java| 9 ++- geode-old-versions/build.gradle | 77 2 files changed, 85 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/5554dd24/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 54367fd..28fe3f2 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.util.Collection; +import java.util.List; @Category({DistributedTest.class, ClientServerTest.class, BackwardCompatibilityTest.class}) @RunWith(Parameterized.class) @@ -31,7 +32,13 @@ import java.util.Collection; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } public ClientServerMiscBCDUnitTest(String version) { http://git-wip-us.apache.org/repos/asf/geode/blob/5554dd24/geode-old-versions/build.gradle -- diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle new file mode 100644 index 000..a09b2d7 --- /dev/null +++ b/geode-old-versions/build.gradle @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +disableMavenPublishing() + +def addTestSource(def source, def geodeVersion, def includeEclipse) { +// def sourceSet = + sourceSets.create(source, { +compileClasspath += configurations.provided +runtimeClasspath += configurations.provided + }) + + dependencies.add "${source}Compile", "org.apache.geode:geode-common:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-core:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-lucene:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-old-client-support:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-wan:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-cq:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-rebalancer:$geodeVersion" + + dependencies.add "${source}Compile", sourceSets.test.output + +// dependencies.add "${source}Compile", configurations.testCompile +// dependencies.add
[43/50] [abbrv] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
GEODE-2433 Backwards compatibility tests are not actually running Tests will now fail of there are no older versions of Geode to test against. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5e6f6734 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5e6f6734 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5e6f6734 Branch: refs/heads/master Commit: 5e6f67346c75a92084bbb1e46f7f0c016353eb97 Parents: 5554dd2 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:38:47 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 13:31:05 2017 -0800 -- .../cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 8 +++- .../cache/rollingupgrade/RollingUpgradeDUnitTest.java| 8 +++- .../cache/tier/sockets/ClientServerMiscBCDUnitTest.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 14d87f9..5106935 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -112,7 +112,13 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } // just a test flag that can be set when trying to run a test in eclipse and avoiding IllegalState http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 369bc3b..54b51de 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -74,7 +74,13 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } private File[] testingDirs = new File[3]; http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 28fe3f2..be0ac6b 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -32,7 +32,7 @@ import java.util.List; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { throw new RuntimeException("No older versions of Geode were found to test against"); } else {
[45/50] [abbrv] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
GEODE-2433 Backwards compatibility tests are not actually running Show current working directory if unable to run backward compatibility tests. For some reason we aren't finding the classpaths file when running under Jenkins. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c8d10ec6 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c8d10ec6 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c8d10ec6 Branch: refs/heads/master Commit: c8d10ec6440a3030a5da8c3022fb16fa2809150d Parents: 05b6965 Author: Bruce SchuchardtAuthored: Tue Feb 7 11:07:49 2017 -0800 Committer: Bruce Schuchardt Committed: Tue Feb 7 11:07:49 2017 -0800 -- .../internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 3 ++- .../internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java | 3 ++- .../internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java | 4 +++- .../org/apache/geode/test/dunit/standalone/VersionManager.java | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/c8d10ec6/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 5106935..2137ed8 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -114,7 +114,8 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { public static Collection data() { List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { - throw new RuntimeException("No older versions of Geode were found to test against"); + throw new RuntimeException("No older versions of Geode were found to test against. " + + "Current directory is " + new File(".").getAbsolutePath()); } else { System.out.println("running against these versions: " + result); } http://git-wip-us.apache.org/repos/asf/geode/blob/c8d10ec6/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 54b51de..b105d58 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -76,7 +76,8 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase { public static Collection data() { List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { - throw new RuntimeException("No older versions of Geode were found to test against"); + throw new RuntimeException("No older versions of Geode were found to test against. " + + "Current directory is " + new File(".").getAbsolutePath()); } else { System.out.println("running against these versions: " + result); } http://git-wip-us.apache.org/repos/asf/geode/blob/c8d10ec6/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index be0ac6b..332b386 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -23,6 +23,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import java.io.File; import java.util.Collection; import java.util.List; @@ -34,7 +35,8 @@ public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { public static Collection data() { List result =
geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
Repository: geode Updated Branches: refs/heads/develop 40cdce161 -> da91cd401 GEODE-2433 Backwards compatibility tests are not actually running Modified to look for the file on the class-path instead of poking around in the file system, and to cause tests expecting to use the old versions to fail if the file cannot be found. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/da91cd40 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/da91cd40 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/da91cd40 Branch: refs/heads/develop Commit: da91cd4018d1fa8c3e86e56875542f12d6cee9cc Parents: 40cdce1 Author: Bruce SchuchardtAuthored: Fri Feb 10 09:13:47 2017 -0800 Committer: Bruce Schuchardt Committed: Fri Feb 10 09:16:33 2017 -0800 -- .../test/dunit/standalone/VersionManager.java | 107 --- .../standalone/VersionManagerJUnitTest.java | 47 2 files changed, 90 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/da91cd40/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java -- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java index c06d4e8..8eefa01 100755 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java @@ -15,15 +15,10 @@ package org.apache.geode.test.dunit.standalone; import org.apache.geode.test.dunit.Host; -import org.apache.geode.test.dunit.VM; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; import java.io.InputStream; +import java.net.URL; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -44,9 +39,12 @@ public class VersionManager { private static VersionManager instance; + protected String loadFailure = ""; + protected static void init() { instance = new VersionManager(); -instance.findVersions(); +final String fileName = "geodeOldVersionClasspaths.txt"; +instance.findVersions(fileName); } public static VersionManager getInstance() { @@ -57,14 +55,22 @@ public class VersionManager { } /** + * for unit testing, this creates a VersionManager with paths loaded from the given file, which + * may or may not exist. The instance is not retained + */ + protected static VersionManager getInstance(String classpathsFileName) { +VersionManager result = new VersionManager(); +result.findVersions(classpathsFileName); +return result; + } + + /** * classPaths for old versions loaded from a file generated by Gradle */ private Map classPaths = new HashMap<>(); private List testVersions = new ArrayList(10); - private String oldestVersion; - /** * Test to see if a version string is known to VersionManager. Versions are either CURRENT_VERSION * or one of the versions returned by VersionManager#getVersions() @@ -92,77 +98,50 @@ public class VersionManager { * Returns a list of older versions available for testing */ public List getVersions() { +checkForLoadFailure(); return Collections.unmodifiableList(testVersions); } public List getVersionsWithoutCurrent() { +checkForLoadFailure(); List result = new ArrayList<>(testVersions); result.remove(CURRENT_VERSION); return result; } - /** - * returns the oldest version defined in the geodeOldVersionClasspaths.txt file - */ - public String getOldestVersion() { -return oldestVersion; - } - private void findVersions() { -// this file is created by the gradle task createClasspathsPropertiesFile -File propFile = new File( - "../../../geode-old-versions/build/generated-resources/main/geodeOldVersionClasspaths.txt"); -if (!propFile.exists()) { - // running under an IDE - propFile = new File( - "../geode-old-versions/build/generated-resources/main/geodeOldVersionClasspaths.txt"); -} -String oldver = "ZZZ"; -if (propFile.exists()) { - System.out.println("found geodeOldVersionClasspaths.txt - loading properties"); - Properties dunitProperties = loadProperties(propFile); - for (Map.Entry
[01/19] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
Repository: geode Updated Branches: refs/heads/feature/GEODE-2267 086df14b0 -> aec5d1559 GEODE-2433 Backwards compatibility tests are not actually running The geode-old-versions/build.gradle file was not included in the original commit for backward-compatibility testing. It's needed to establish the old-version source sets and generate the classpaths file used by VersionManager. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3ce2a127 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3ce2a127 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3ce2a127 Branch: refs/heads/feature/GEODE-2267 Commit: 3ce2a127c94515a8a57d8589d91e497fec7f2544 Parents: 086df14 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:32:59 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 11:32:59 2017 -0800 -- .../sockets/ClientServerMiscBCDUnitTest.java| 9 ++- geode-old-versions/build.gradle | 77 2 files changed, 85 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/3ce2a127/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 54367fd..28fe3f2 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.util.Collection; +import java.util.List; @Category({DistributedTest.class, ClientServerTest.class, BackwardCompatibilityTest.class}) @RunWith(Parameterized.class) @@ -31,7 +32,13 @@ import java.util.Collection; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } public ClientServerMiscBCDUnitTest(String version) { http://git-wip-us.apache.org/repos/asf/geode/blob/3ce2a127/geode-old-versions/build.gradle -- diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle new file mode 100644 index 000..a09b2d7 --- /dev/null +++ b/geode-old-versions/build.gradle @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +disableMavenPublishing() + +def addTestSource(def source, def geodeVersion, def includeEclipse) { +// def sourceSet = + sourceSets.create(source, { +compileClasspath += configurations.provided +runtimeClasspath += configurations.provided + }) + + dependencies.add "${source}Compile", "org.apache.geode:geode-common:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-core:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-lucene:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-old-client-support:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-wan:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-cq:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-rebalancer:$geodeVersion" + + dependencies.add "${source}Compile",
[01/11] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running [Forced Update!]
Repository: geode Updated Branches: refs/heads/feature/GEODE-1930-2 d3e160b96 -> 8f48a585e (forced update) GEODE-2433 Backwards compatibility tests are not actually running The geode-old-versions/build.gradle file was not included in the original commit for backward-compatibility testing. It's needed to establish the old-version source sets and generate the classpaths file used by VersionManager. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3ce2a127 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3ce2a127 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3ce2a127 Branch: refs/heads/feature/GEODE-1930-2 Commit: 3ce2a127c94515a8a57d8589d91e497fec7f2544 Parents: 086df14 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:32:59 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 11:32:59 2017 -0800 -- .../sockets/ClientServerMiscBCDUnitTest.java| 9 ++- geode-old-versions/build.gradle | 77 2 files changed, 85 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/3ce2a127/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 54367fd..28fe3f2 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.util.Collection; +import java.util.List; @Category({DistributedTest.class, ClientServerTest.class, BackwardCompatibilityTest.class}) @RunWith(Parameterized.class) @@ -31,7 +32,13 @@ import java.util.Collection; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } public ClientServerMiscBCDUnitTest(String version) { http://git-wip-us.apache.org/repos/asf/geode/blob/3ce2a127/geode-old-versions/build.gradle -- diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle new file mode 100644 index 000..a09b2d7 --- /dev/null +++ b/geode-old-versions/build.gradle @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +disableMavenPublishing() + +def addTestSource(def source, def geodeVersion, def includeEclipse) { +// def sourceSet = + sourceSets.create(source, { +compileClasspath += configurations.provided +runtimeClasspath += configurations.provided + }) + + dependencies.add "${source}Compile", "org.apache.geode:geode-common:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-core:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-lucene:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-old-client-support:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-wan:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-cq:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-rebalancer:$geodeVersion" + + dependencies.add
[02/11] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
GEODE-2433 Backwards compatibility tests are not actually running Tests will now fail of there are no older versions of Geode to test against. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c8d21665 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c8d21665 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c8d21665 Branch: refs/heads/feature/GEODE-1930-2 Commit: c8d216654ac436797fc703faf63de36b300bf116 Parents: 3ce2a12 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:38:47 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 11:38:47 2017 -0800 -- .../cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 8 +++- .../cache/rollingupgrade/RollingUpgradeDUnitTest.java| 8 +++- .../cache/tier/sockets/ClientServerMiscBCDUnitTest.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/c8d21665/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 14d87f9..5106935 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -112,7 +112,13 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } // just a test flag that can be set when trying to run a test in eclipse and avoiding IllegalState http://git-wip-us.apache.org/repos/asf/geode/blob/c8d21665/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 369bc3b..54b51de 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -74,7 +74,13 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } private File[] testingDirs = new File[3]; http://git-wip-us.apache.org/repos/asf/geode/blob/c8d21665/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 28fe3f2..be0ac6b 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -32,7 +32,7 @@ import java.util.List; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { throw new RuntimeException("No older versions of Geode were found to test against"); } else {
[1/2] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
Repository: geode Updated Branches: refs/heads/release/1.1.0 90760d334 -> 5e6f67346 GEODE-2433 Backwards compatibility tests are not actually running The geode-old-versions/build.gradle file was not included in the original commit for backward-compatibility testing. It's needed to establish the old-version source sets and generate the classpaths file used by VersionManager. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5554dd24 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5554dd24 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5554dd24 Branch: refs/heads/release/1.1.0 Commit: 5554dd24a3932900b28956cac357f0e4bbe9d6e0 Parents: 90760d3 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:32:59 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 13:30:51 2017 -0800 -- .../sockets/ClientServerMiscBCDUnitTest.java| 9 ++- geode-old-versions/build.gradle | 77 2 files changed, 85 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/5554dd24/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 54367fd..28fe3f2 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.util.Collection; +import java.util.List; @Category({DistributedTest.class, ClientServerTest.class, BackwardCompatibilityTest.class}) @RunWith(Parameterized.class) @@ -31,7 +32,13 @@ import java.util.Collection; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } public ClientServerMiscBCDUnitTest(String version) { http://git-wip-us.apache.org/repos/asf/geode/blob/5554dd24/geode-old-versions/build.gradle -- diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle new file mode 100644 index 000..a09b2d7 --- /dev/null +++ b/geode-old-versions/build.gradle @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +disableMavenPublishing() + +def addTestSource(def source, def geodeVersion, def includeEclipse) { +// def sourceSet = + sourceSets.create(source, { +compileClasspath += configurations.provided +runtimeClasspath += configurations.provided + }) + + dependencies.add "${source}Compile", "org.apache.geode:geode-common:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-core:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-lucene:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-old-client-support:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-wan:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-cq:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-rebalancer:$geodeVersion" + + dependencies.add "${source}Compile", sourceSets.test.output +
[2/2] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
GEODE-2433 Backwards compatibility tests are not actually running Tests will now fail of there are no older versions of Geode to test against. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/5e6f6734 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/5e6f6734 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/5e6f6734 Branch: refs/heads/release/1.1.0 Commit: 5e6f67346c75a92084bbb1e46f7f0c016353eb97 Parents: 5554dd2 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:38:47 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 13:31:05 2017 -0800 -- .../cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 8 +++- .../cache/rollingupgrade/RollingUpgradeDUnitTest.java| 8 +++- .../cache/tier/sockets/ClientServerMiscBCDUnitTest.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 14d87f9..5106935 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -112,7 +112,13 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } // just a test flag that can be set when trying to run a test in eclipse and avoiding IllegalState http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 369bc3b..54b51de 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -74,7 +74,13 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } private File[] testingDirs = new File[3]; http://git-wip-us.apache.org/repos/asf/geode/blob/5e6f6734/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 28fe3f2..be0ac6b 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -32,7 +32,7 @@ import java.util.List; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { throw new RuntimeException("No older versions of Geode were found to test against"); } else {
[1/3] geode git commit: GEODE-2433 Backwards compatibility tests are not actually running [Forced Update!]
Repository: geode Updated Branches: refs/heads/awaitility 0bfe4d157 -> ca5c7088a (forced update) GEODE-2433 Backwards compatibility tests are not actually running The geode-old-versions/build.gradle file was not included in the original commit for backward-compatibility testing. It's needed to establish the old-version source sets and generate the classpaths file used by VersionManager. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3ce2a127 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3ce2a127 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3ce2a127 Branch: refs/heads/awaitility Commit: 3ce2a127c94515a8a57d8589d91e497fec7f2544 Parents: 086df14 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:32:59 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 11:32:59 2017 -0800 -- .../sockets/ClientServerMiscBCDUnitTest.java| 9 ++- geode-old-versions/build.gradle | 77 2 files changed, 85 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/3ce2a127/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 54367fd..28fe3f2 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.util.Collection; +import java.util.List; @Category({DistributedTest.class, ClientServerTest.class, BackwardCompatibilityTest.class}) @RunWith(Parameterized.class) @@ -31,7 +32,13 @@ import java.util.Collection; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } public ClientServerMiscBCDUnitTest(String version) { http://git-wip-us.apache.org/repos/asf/geode/blob/3ce2a127/geode-old-versions/build.gradle -- diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle new file mode 100644 index 000..a09b2d7 --- /dev/null +++ b/geode-old-versions/build.gradle @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +disableMavenPublishing() + +def addTestSource(def source, def geodeVersion, def includeEclipse) { +// def sourceSet = + sourceSets.create(source, { +compileClasspath += configurations.provided +runtimeClasspath += configurations.provided + }) + + dependencies.add "${source}Compile", "org.apache.geode:geode-common:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-core:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-lucene:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-old-client-support:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-wan:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-cq:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-rebalancer:$geodeVersion" + + dependencies.add "${source}Compile",
geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
Repository: geode Updated Branches: refs/heads/develop 3ce2a127c -> c8d216654 GEODE-2433 Backwards compatibility tests are not actually running Tests will now fail of there are no older versions of Geode to test against. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c8d21665 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c8d21665 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c8d21665 Branch: refs/heads/develop Commit: c8d216654ac436797fc703faf63de36b300bf116 Parents: 3ce2a12 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:38:47 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 11:38:47 2017 -0800 -- .../cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 8 +++- .../cache/rollingupgrade/RollingUpgradeDUnitTest.java| 8 +++- .../cache/tier/sockets/ClientServerMiscBCDUnitTest.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/c8d21665/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java index 14d87f9..5106935 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java @@ -112,7 +112,13 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } // just a test flag that can be set when trying to run a test in eclipse and avoiding IllegalState http://git-wip-us.apache.org/repos/asf/geode/blob/c8d21665/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java index 369bc3b..54b51de 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java @@ -74,7 +74,13 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } private File[] testingDirs = new File[3]; http://git-wip-us.apache.org/repos/asf/geode/blob/c8d21665/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 28fe3f2..be0ac6b 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -32,7 +32,7 @@ import java.util.List; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); if (result.size() < 1) { throw new RuntimeException("No older versions of Geode were found to test
geode git commit: GEODE-2433 Backwards compatibility tests are not actually running
Repository: geode Updated Branches: refs/heads/develop 086df14b0 -> 3ce2a127c GEODE-2433 Backwards compatibility tests are not actually running The geode-old-versions/build.gradle file was not included in the original commit for backward-compatibility testing. It's needed to establish the old-version source sets and generate the classpaths file used by VersionManager. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3ce2a127 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3ce2a127 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3ce2a127 Branch: refs/heads/develop Commit: 3ce2a127c94515a8a57d8589d91e497fec7f2544 Parents: 086df14 Author: Bruce SchuchardtAuthored: Mon Feb 6 11:32:59 2017 -0800 Committer: Bruce Schuchardt Committed: Mon Feb 6 11:32:59 2017 -0800 -- .../sockets/ClientServerMiscBCDUnitTest.java| 9 ++- geode-old-versions/build.gradle | 77 2 files changed, 85 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/geode/blob/3ce2a127/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java -- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java index 54367fd..28fe3f2 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.util.Collection; +import java.util.List; @Category({DistributedTest.class, ClientServerTest.class, BackwardCompatibilityTest.class}) @RunWith(Parameterized.class) @@ -31,7 +32,13 @@ import java.util.Collection; public class ClientServerMiscBCDUnitTest extends ClientServerMiscDUnitTest { @Parameterized.Parameters public static Collection data() { -return VersionManager.getInstance().getVersionsWithoutCurrent(); +List result = VersionManager.getInstance().getVersionsWithoutCurrent(); +if (result.size() < 1) { + throw new RuntimeException("No older versions of Geode were found to test against"); +} else { + System.out.println("running against these versions: " + result); +} +return result; } public ClientServerMiscBCDUnitTest(String version) { http://git-wip-us.apache.org/repos/asf/geode/blob/3ce2a127/geode-old-versions/build.gradle -- diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle new file mode 100644 index 000..a09b2d7 --- /dev/null +++ b/geode-old-versions/build.gradle @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +disableMavenPublishing() + +def addTestSource(def source, def geodeVersion, def includeEclipse) { +// def sourceSet = + sourceSets.create(source, { +compileClasspath += configurations.provided +runtimeClasspath += configurations.provided + }) + + dependencies.add "${source}Compile", "org.apache.geode:geode-common:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-core:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-lucene:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-old-client-support:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-wan:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-cq:$geodeVersion" + dependencies.add "${source}Compile", "org.apache.geode:geode-rebalancer:$geodeVersion" + + dependencies.add "${source}Compile", sourceSets.test.output + +//