SGF-199 fixed GatewaySender manual-start

src/test/java/org/springframework/data/gemfire/config/GemfireV7GatewayNamespaceTest.java

@@ -48,9 +48,9 @@ import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
 
 /**
  * This test is only valid for GF 7.0 and above
- * 
+ *
  * @author David Turanski
- * 
+ *
  */
 
 public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest {
@@ -148,7 +148,8 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest {
 		assertTrue(transportFilters.get(0) instanceof TestTransportFilter);
 
 		assertEquals(1, gws.getRemoteDSId());
-		assertEquals(true, gws.isManualStart());
+		assertEquals(false, gws.isManualStart());
+        assertEquals(true,gws.isRunning());
 		assertEquals(10, gws.getAlertThreshold());
 		assertEquals(11, gws.getBatchSize());
 		assertEquals(3000, gws.getBatchTimeInterval());

src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java

@@ -1,35 +1,41 @@
 /*
  * Copyright 2002-2013 the original author or authors.
- * 
+ *
  * Licensed 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.
  */
 package org.springframework.data.gemfire.test;
 
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.util.Gateway.OrderPolicy;
 import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
 import com.gemstone.gemfire.cache.wan.GatewaySender;
 import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
 import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 /**
  * @author David Turanski
  *
  */
 public class StubGatewaySenderFactory implements GatewaySenderFactory {
-	
+
 	private int alertThreshold;
 	private boolean batchConflationEnabled;
 	private int batchSize;
@@ -49,6 +55,8 @@ public class StubGatewaySenderFactory implements GatewaySenderFactory {
 
 	private String name;
 
+    private boolean running = true;
+
 	private int remoteSystemId;
 
 	public StubGatewaySenderFactory() {
@@ -92,6 +100,18 @@ public class StubGatewaySenderFactory implements GatewaySenderFactory {
 		when(gatewaySender.isDiskSynchronous()).thenReturn(this.diskSynchronous);
 		when(gatewaySender.isParallel()).thenReturn(this.parallel);
 		when(gatewaySender.isPersistenceEnabled()).thenReturn(this.persistenceEnabled);
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) {
+                running = true;
+               return null;
+            }
+        }).when(gatewaySender).start();
+        when(gatewaySender.isRunning()).thenAnswer(new Answer<Boolean>(){
+            @Override
+            public Boolean answer(InvocationOnMock invocation) throws Throwable {
+                return running;
+            }
+        });
 		return gatewaySender;
 	}
 

src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml

@@ -7,17 +7,17 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" default-lazy-init="true">
- 
+
 	<gfe:cache/>
-    
+
 	<gfe:partitioned-region id="region-inner-gateway-sender" >
-        <gfe:gateway-sender 
-        manual-start="true"
-        remote-distributed-system-id="1" 
-        alert-threshold="10" 
-        batch-size="11" 
-        batch-time-interval="3000" 
-        dispatcher-threads="2" 
+        <gfe:gateway-sender
+        manual-start="false"
+        remote-distributed-system-id="1"
+        alert-threshold="10"
+        batch-size="11"
+        batch-time-interval="3000"
+        dispatcher-threads="2"
         disk-store-ref="diskstore"
         enable-batch-conflation="true"
         maximum-queue-memory="50"
@@ -35,12 +35,12 @@
         </gfe:gateway-sender>
         <gfe:gateway-sender-ref bean="gateway-sender"/>
     </gfe:partitioned-region>
-    
-    <gfe:async-event-queue id="async-event-queue" 
-    batch-size="10" 
-    persistent="true" 
-    disk-store-ref="diskstore" 
-    maximum-queue-memory="50" 
+
+    <gfe:async-event-queue id="async-event-queue"
+    batch-size="10"
+    persistent="true"
+    disk-store-ref="diskstore"
+    maximum-queue-memory="50"
     parallel="true"
     batch-conflation-enabled="true"
     batch-time-interval="3"
@@ -51,21 +51,21 @@
           <bean class="org.springframework.data.gemfire.config.GemfireV7GatewayNamespaceTest.TestAsyncEventListener"/>
         </gfe:async-event-listener>
     </gfe:async-event-queue>
-    
+
     <gfe:disk-store id="diskstore"/>
-    
-    <gfe:gateway-receiver id="gateway-receiver" 
+
+    <gfe:gateway-receiver id="gateway-receiver"
     start-port="12345" end-port="23456" bind-address="192.168.0.1" maximum-time-between-pings="3000" socket-buffer-size="16536">
         <gfe:transport-filter>
             <bean class="org.springframework.data.gemfire.config.GemfireV7GatewayNamespaceTest.TestTransportFilter"/>
         </gfe:transport-filter>
     </gfe:gateway-receiver>
-    
+
     <!-- need manual-start=true for the unit test because GF will throw an exception if no locators are configured -->
-    <gfe:gateway-sender id="gateway-sender" 
+    <gfe:gateway-sender id="gateway-sender"
     remote-distributed-system-id="2"
-    alert-threshold="10" 
-    batch-size="11" 
+    alert-threshold="10"
+    batch-size="11"
     dispatcher-threads="12"
     manual-start="true">
             <gfe:event-filter>
@@ -77,8 +77,8 @@
                 <bean class="org.springframework.data.gemfire.config.GemfireV7GatewayNamespaceTest.TestTransportFilter"/>
             </gfe:transport-filter>
    </gfe:gateway-sender>
-   
+
    <bean id="event-filter" class="org.springframework.data.gemfire.config.GemfireV7GatewayNamespaceTest.TestEventFilter"/>
    <bean id="transport-filter" class="org.springframework.data.gemfire.config.GemfireV7GatewayNamespaceTest.TestTransportFilter"/>
-    
+
 </beans>