Fix integration tests

apache · Dec 15, 2021 · 520d955 · 520d955
1 parent 9fc42b6
commit 520d955
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewaySender.java
@@ -157,8 +157,6 @@ public interface GatewaySender {
       .getInteger(GeodeGlossary.GEMFIRE_PREFIX + "gateway-connection-retry-interval", 1000)
       .intValue();
 
-  String DEFAULT_TYPE = "SerialGatewaySender";
-
   /**
    * The order policy. This enum is applicable only when concurrency-level is > 1.
    *

diff --git a/...e-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAttributesImpl.java b/...e-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAttributesImpl.java
@@ -81,7 +81,7 @@ public class GatewaySenderAttributesImpl implements MutableGatewaySenderAttribut
 
   private boolean groupTransactionEvents = GatewaySender.DEFAULT_MUST_GROUP_TRANSACTION_EVENTS;
 
-  private String type = GatewaySender.DEFAULT_TYPE;
+  private String type;
 
   private boolean isForInternalUse = GatewaySender.DEFAULT_IS_FOR_INTERNAL_USE;
 
@@ -179,7 +179,7 @@ public void setGroupTransactionEvents(boolean groupTransEvents) {
 
   public void setType(String type) {
     this.type = type;
-    isParallel = type.equals("Parallel") ? true : false;
+    isParallel = type.contains("Parallel") ? true : false;
   }
 
   public void setForInternalUse(boolean forInternalUse) {

diff --git a/.../java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java b/.../java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java
@@ -84,8 +84,8 @@ private GatewaySender createGatewaySender(Cache cache,
 
     String type = gatewaySenderCreateArgs.getType();
     if (type != null) {
-      gateway.setType(gatewaySenderCreateArgs.getType());
-      gateway.setParallel(gatewaySenderCreateArgs.getType().contains("Parallel"));
+      gateway.setType(type);
+      gateway.setParallel(type.contains("Parallel"));
     } else {
       Boolean isParallel = gatewaySenderCreateArgs.isParallel();
       if (isParallel != null) {

diff --git a/.../org/apache/geode/internal/cache/wan/txgrouping/TxGroupingPartitionedRegionDUnitTest.java b/.../org/apache/geode/internal/cache/wan/txgrouping/TxGroupingPartitionedRegionDUnitTest.java
@@ -40,7 +40,7 @@
 @RunWith(GeodeParamsRunner.class)
 public class TxGroupingPartitionedRegionDUnitTest extends TxGroupingBaseDUnitTest {
   @Test
-  @Parameters({"TxGroupParallelGatewaySender", "TxGroupSerialGatewaySender"})
+  @Parameters({"TxGroupingParallelGatewaySender", "TxGroupingSerialGatewaySender"})
   public void testPartitionedRegionPropagationWithGroupTransactionEventsAndMixOfEventsInAndNotInTransactions(
       String type)
       throws Exception {

diff --git a/...a/org/apache/geode/internal/cache/wan/txgrouping/WanTxGroupingConfigurationJUnitTest.java b/...a/org/apache/geode/internal/cache/wan/txgrouping/WanTxGroupingConfigurationJUnitTest.java
@@ -30,6 +30,7 @@
 import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.cache.wan.GatewaySenderFactory;
+import org.apache.geode.cache.wan.internal.txgrouping.serial.TxGroupingSerialGatewaySenderImpl;
 import org.apache.geode.internal.cache.wan.GatewaySenderException;
 
 public class WanTxGroupingConfigurationJUnitTest {
@@ -63,9 +64,8 @@ public void test_ValidateSerialGatewaySenderGroupTransactionEventsAttributeSetTo
   public void test_create_SerialGatewaySender_ThrowsException_when_GroupTransactionEvents_isTrue_and_DispatcherThreads_is_greaterThanOne() {
     cache = new CacheFactory().set(MCAST_PORT, "0").create();
     GatewaySenderFactory fact = cache.createGatewaySenderFactory();
-    fact.setParallel(false);
     fact.setDispatcherThreads(2);
-    fact.setGroupTransactionEvents(true);
+    fact.setType(TxGroupingSerialGatewaySenderImpl.TYPE);
     assertThatThrownBy(() -> fact.create("NYSender", 2))
         .isInstanceOf(GatewaySenderException.class)
         .hasMessageContaining(
@@ -77,7 +77,7 @@ public void test_create_GatewaySender_ThrowsException_when_GroupTransactionEvent
     cache = new CacheFactory().set(MCAST_PORT, "0").create();
     GatewaySenderFactory fact = cache.createGatewaySenderFactory();
     fact.setBatchConflationEnabled(true);
-    fact.setGroupTransactionEvents(true);
+    fact.setType(TxGroupingSerialGatewaySenderImpl.TYPE);
     assertThatThrownBy(() -> fact.create("NYSender", 2))
         .isInstanceOf(GatewaySenderException.class)
         .hasMessageContaining(

diff --git a/...egrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/...egrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -41,6 +41,7 @@
 import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.cache.wan.GatewaySenderFactory;
 import org.apache.geode.cache.wan.GatewayTransportFilter;
+import org.apache.geode.cache.wan.internal.parallel.ParallelGatewaySenderImpl;
 import org.apache.geode.cache30.MyGatewayEventFilter1;
 import org.apache.geode.cache30.MyGatewayTransportFilter1;
 import org.apache.geode.cache30.MyGatewayTransportFilter2;
@@ -69,7 +70,7 @@ public void test_GatewaySender_without_Locator() {
       cache = new CacheFactory().set(MCAST_PORT, "0").create();
 
       GatewaySenderFactory fact = cache.createGatewaySenderFactory();
-      fact.setParallel(true);
+      fact.setType(ParallelGatewaySenderImpl.TYPE);
       GatewaySender sender1 = fact.create("NYSender", 2);
       sender1.start();
       fail("Expected IllegalStateException but not thrown");

diff --git a/geode-wan/src/main/java/org/apache/geode/cache/wan/internal/GatewaySenderFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/cache/wan/internal/GatewaySenderFactoryImpl.java
@@ -31,6 +31,8 @@
 import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
 import org.apache.geode.cache.wan.GatewaySenderFactory;
 import org.apache.geode.cache.wan.GatewayTransportFilter;
+import org.apache.geode.cache.wan.internal.parallel.ParallelGatewaySenderImpl;
+import org.apache.geode.cache.wan.internal.serial.SerialGatewaySenderImpl;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
@@ -220,6 +222,13 @@ public GatewaySenderFactory setEnforceThreadsConnectSameReceiver(
   public @NotNull GatewaySender create(final @NotNull String id, final int remoteDSId) {
     attrs.setId(id);
     attrs.setRemoteDs(remoteDSId);
+    if (attrs.getType() == null) {
+      if (attrs.isParallel()) {
+        attrs.setType(ParallelGatewaySenderImpl.TYPE);
+      } else {
+        attrs.setType(SerialGatewaySenderImpl.TYPE);
+      }
+    }
 
     validate(cache, attrs);