SGF-164,SGF-165 upgrade to Gemfire 7.0.1

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

@@ -89,9 +89,6 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest {
 		}
 	}
 
-	/**
-	 * 
-	 */
 	@Test
 	public void testAsyncEventQueue() {
 		AsyncEventQueue aseq = ctx.getBean("async-event-queue", AsyncEventQueue.class);
@@ -100,8 +97,12 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest {
 		assertTrue(aseq.isParallel());
 		assertEquals("diskstore", aseq.getDiskStoreName());
 		assertEquals(50, aseq.getMaximumQueueMemory());
+		assertEquals(3, aseq.getBatchTimeInterval());
+		assertEquals(OrderPolicy.KEY, aseq.getOrderPolicy());
+		assertEquals(true, aseq.isDiskSynchronous());
+		assertEquals(true, aseq.isBatchConflationEnabled());
 	}
-	
+
 	@Test
 	public void testGatewaySender() throws Exception {
 		GatewaySenderFactoryBean gwsfb = ctx.getBean("&gateway-sender", GatewaySenderFactoryBean.class);

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

@@ -18,6 +18,7 @@ import static org.mockito.Mockito.when;
 import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
 import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
 import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
+import com.gemstone.gemfire.cache.util.Gateway.OrderPolicy;
 
 /**
  * @author David Turanski
@@ -82,4 +83,30 @@ public class StubAsyncEventQueueFactory implements AsyncEventQueueFactory {
 		this.parallel = parallel;
 		return this;
 	}
+
+	//The following added in 7.0.1
+	public AsyncEventQueueFactory setBatchConflationEnabled(boolean arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public AsyncEventQueueFactory setBatchTimeInterval(int arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public AsyncEventQueueFactory setDiskSynchronous(boolean arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public AsyncEventQueueFactory setDispatcherThreads(int arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public AsyncEventQueueFactory setOrderPolicy(OrderPolicy arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

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

@@ -36,8 +36,17 @@
         <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" parallel="true">
+    <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"
+    dispatcher-threads="4"
+    disk-synchronous="true"
+    order-policy="KEY">
         <gfe:async-event-listener>
           <bean class="org.springframework.data.gemfire.config.GemfireV7GatewayNamespaceTest.TestAsyncEventListener"/>
         </gfe:async-event-listener>