Skip to content

Commit

Permalink
GEODE-4972: Move VersionManager to geode-old-versions module
Browse files Browse the repository at this point in the history
- This will facilitate other modules being able to use VersionManager;
  specifically geode-junit.
  • Loading branch information
jdeppe-pivotal committed Mar 29, 2018
1 parent a2cc503 commit 5ba96d7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion geode-core/build.gradle
Expand Up @@ -131,7 +131,8 @@ dependencies {
jcaCompile sourceSets.main.output

testCompile project(':geode-junit')
testCompile project(':geode-old-versions')

testCompile files(project(':geode-old-versions').sourceSets.main.output)

// Test Dependencies
// External
Expand Down
4 changes: 4 additions & 0 deletions geode-old-versions/build.gradle
Expand Up @@ -20,6 +20,10 @@ disableMavenPublishing()

project.ext.installs = new Properties();

dependencies {
testCompile project(":geode-junit")
}

def addOldVersion(def source, def geodeVersion, def downloadInstall) {
sourceSets.create(source, {
compileClasspath += configurations.provided
Expand Down
Expand Up @@ -26,15 +26,13 @@
import java.util.Properties;
import java.util.function.BiConsumer;

import org.apache.geode.test.dunit.Host;

/**
* VersionManager loads the class-paths for all of the releases of Geode configured for
* backward-compatibility testing in the geode-core build.gradle file.
* <p>
* Tests may use these versions in launching VMs to run older clients or servers.
*
* @see Host#getVM(String, int)
* see Host.getVM(String, int)
*/
public class VersionManager {
public static final String CURRENT_VERSION = "000";
Expand Down
Expand Up @@ -14,7 +14,6 @@
*/
package org.apache.geode.test.dunit.standalone;

import static org.apache.geode.internal.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import org.junit.Assert;
Expand Down Expand Up @@ -45,6 +44,6 @@ public void exceptionIsThrownOnUse() throws Exception {
@Test
public void managerIsAbleToFindVersions() throws Exception {
VersionManager instance = VersionManager.getInstance();
assertTrue(instance.getVersionsWithoutCurrent().size() > 0);
Assert.assertTrue(instance.getVersionsWithoutCurrent().size() > 0);
}
}

0 comments on commit 5ba96d7

Please sign in to comment.