Repository: incubator-geode Updated Branches: refs/heads/develop d14af16ae -> aeb8c01df
GEODE-1243: Updates to use new CategoryWithParameterizedRunnerFactory Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/aeb8c01d Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/aeb8c01d Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/aeb8c01d Branch: refs/heads/develop Commit: aeb8c01df213b8f43a10c6e9bdf1529c5f723ffc Parents: 6f4a879 Author: Jens Deppe <jde...@pivotal.io> Authored: Wed May 11 07:42:23 2016 -0700 Committer: Jens Deppe <jde...@pivotal.io> Committed: Wed May 18 14:39:17 2016 -0700 ---------------------------------------------------------------------- .../java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java | 3 ++- .../distributed/LocatorLauncherLocalFileIntegrationTest.java | 2 ++ .../distributed/LocatorLauncherLocalIntegrationTest.java | 2 ++ .../distributed/LocatorLauncherRemoteFileIntegrationTest.java | 2 ++ .../distributed/LocatorLauncherRemoteIntegrationTest.java | 2 ++ .../LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java | 5 +++++ 6 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/aeb8c01d/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java index 1d7afae..d25427a 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java @@ -31,8 +31,8 @@ import java.util.List; import java.util.Properties; import java.util.function.IntSupplier; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; +import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -60,6 +60,7 @@ import org.junit.runners.Parameterized; @Category(IntegrationTest.class) @RunWith(Parameterized.class) +@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class) public class LocatorJUnitTest { private static final int REQUEST_TIMEOUT = 5 * 1000; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/aeb8c01d/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java index 422fb7c..6451a67 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java @@ -18,6 +18,7 @@ package com.gemstone.gemfire.distributed; import com.gemstone.gemfire.internal.process.ProcessControllerFactory; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -36,6 +37,7 @@ import static org.junit.Assert.assertFalse; */ @Category(IntegrationTest.class) @RunWith(Parameterized.class) +@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class) public class LocatorLauncherLocalFileIntegrationTest extends LocatorLauncherLocalIntegrationTest { @Before http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/aeb8c01d/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java index 9137207..a8998f1 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java @@ -23,6 +23,7 @@ import java.lang.management.ManagementFactory; import java.net.BindException; import java.net.InetAddress; +import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -53,6 +54,7 @@ import org.junit.runners.Parameterized; */ @Category(IntegrationTest.class) @RunWith(Parameterized.class) +@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class) public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncherIntegrationTestCase { @Before http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/aeb8c01d/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java index 13e936d..4d8b94b 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -47,6 +48,7 @@ import org.junit.runners.Parameterized; */ @Category(IntegrationTest.class) @RunWith(Parameterized.class) +@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class) public class LocatorLauncherRemoteFileIntegrationTest extends LocatorLauncherRemoteIntegrationTest { @Before http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/aeb8c01d/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java index 508c13c..5cd1fcf 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -60,6 +61,7 @@ import org.junit.runners.Parameterized; */ @Category(IntegrationTest.class) @RunWith(Parameterized.class) +@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class) public class LocatorLauncherRemoteIntegrationTest extends AbstractLocatorLauncherRemoteIntegrationTestCase { protected volatile Process process; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/aeb8c01d/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java index 2e84905..5f024c8 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java @@ -24,6 +24,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.junit.Before; import org.junit.Rule; @@ -36,11 +37,15 @@ import com.gemstone.gemfire.internal.process.ProcessStreamReader; import com.gemstone.gemfire.internal.process.ProcessType; import com.gemstone.gemfire.internal.process.ProcessUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; /** * Integration tests for launching a Locator in a forked process with custom logging configuration */ @Category(IntegrationTest.class) +@RunWith(Parameterized.class) +@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class) public class LocatorLauncherRemoteWithCustomLoggingIntegrationTest extends AbstractLocatorLauncherRemoteIntegrationTestCase { private File customConfigFile;
