You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2020/07/02 18:11:05 UTC
[geode] 29/29: WIP - fixing tests
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-8294
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0400ec3265339580aee37c87e73d3d071a6511eb
Author: Udo Kohlmeyer <uk...@pivotal.io>
AuthorDate: Thu Jul 2 11:07:45 2020 -0700
WIP - fixing tests
---
.../org/apache/geode/internal/cache/xmlcache/CacheCreationTest.java | 2 +-
.../apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java | 1 +
.../org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java | 2 +-
.../src/main/java/org/apache/geode/test/dunit/rules/CacheXmlRule.java | 2 +-
.../java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java | 1 +
.../java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java | 1 +
gradle.properties | 1 -
7 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationTest.java
index bc33fd7..5f60b41 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationTest.java
@@ -291,7 +291,7 @@ public class CacheCreationTest {
when(internalCache.createGatewayReceiverFactory()).thenReturn(receiverFactory);
when(receiverFactory.create()).thenReturn(receiver);
- cacheCreation.create(internalCache, ModuleService.DEFAULT);
+ cacheCreation.create(internalCache);
InOrder inOrder = inOrder(internalCache, receiverFactory);
inOrder.verify(internalCache).createGatewayReceiverFactory();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
index 159f040..b547711 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
@@ -23,6 +23,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPointJUnitTest;
+import org.apache.geode.services.module.ModuleService;
/**
* Unit test for {@link RegionCreation}.
diff --git a/geode-dunit/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-dunit/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 3c5ea1a..7b480be 100644
--- a/geode-dunit/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-dunit/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -583,7 +583,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase
}
public TestCacheCreation(boolean forParsing,
- ModuleService moduleService) {
+ ModuleService moduleService) {
super(forParsing, moduleService);
}
diff --git a/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/CacheXmlRule.java b/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/CacheXmlRule.java
index 88994a2..694f55b 100644
--- a/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/CacheXmlRule.java
+++ b/geode-dunit/src/main/java/org/apache/geode/test/dunit/rules/CacheXmlRule.java
@@ -154,7 +154,7 @@ public class CacheXmlRule extends AbstractDistributedRule {
private final SerializableTemporaryFolder temporaryFolder;
CacheXmlCreation(SerializableRunnableIF createCache,
- SerializableTemporaryFolder temporaryFolder, ModuleService moduleService) {
+ SerializableTemporaryFolder temporaryFolder, ModuleService moduleService) {
super(moduleService);
this.createCache = createCache;
this.temporaryFolder = temporaryFolder;
diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
index c9f39e2..495b393 100644
--- a/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
+++ b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
@@ -44,6 +44,7 @@ import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.cache.xmlcache.ParallelGatewaySenderCreation;
import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
import org.apache.geode.internal.cache.xmlcache.SerialGatewaySenderCreation;
+import org.apache.geode.services.module.ModuleService;
import org.apache.geode.test.junit.categories.WanTest;
@Category({WanTest.class})
diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
index 15b13d9..b57be03 100644
--- a/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
+++ b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.cache30.MyGatewayTransportFilter1;
import org.apache.geode.cache30.MyGatewayTransportFilter2;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
+import org.apache.geode.services.module.ModuleService;
import org.apache.geode.test.junit.categories.WanTest;
@Category({WanTest.class})
diff --git a/gradle.properties b/gradle.properties
index 752b5b3..e1c01f0 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -79,7 +79,6 @@ org.gradle.configureondemand = false
org.gradle.daemon = true
org.gradle.jvmargs = -Xmx3g
org.gradle.parallel = true
-org.gradle.workers.max = 2
org.gradle.internal.http.socketTimeout=120000
org.gradle.internal.http.connectionTimeout=120000