You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/01/21 18:23:21 UTC

[42/51] [partial] geode git commit: GEODE-2332: Deleted deprecated test framework support files.

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/durableTimeoutWithCq.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/durableTimeoutWithCq.xml b/src/tests/cpp/xml/Generics/CqQuery/durableTimeoutWithCq.xml
deleted file mode 100644
index 7e90fa7..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/durableTimeoutWithCq.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 1.  All Clients Close n Restart after timeout in cylcles. All Clients should miss few events.
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="durableTimeout">30</data>
-  <data name="restartTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="DurableTimeOutCqTest" description="Basic test for durable client timeout with cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" timesToRun="10" parallel="true" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKAFalse.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKAFalse.xml b/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKAFalse.xml
deleted file mode 100644
index 829d022..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKAFalse.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = false
-Details  R = 1.  All Clients Close n Restart after timeout in cylcles. All Clients should miss few events.
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="keepAlive">false</data>
-  <data name="durableTimeout">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="5" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableWithCqKAFalse" description="Basic test for durable client with KA false and cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="10" parallel="true" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="5" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKATrue.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKATrue.xml b/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKATrue.xml
deleted file mode 100644
index a695c5f..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/durableWithCqKATrue.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-<!-- Description 
-# Servers  1
-# Clients  5  durable , 1 feeder
-Purpose  - To test durable cients with cq,all Reg Ints and Close with KA = true
-Details  R = 1.  All Clients Close n Restart after timeout in cylcles. All Clients should miss few events.
--->
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-	
-  <data name="keyType">str</data>
-
-  <!--Default Values for this test only-->
-  <data name="isDurable">true</data>
-  <data name="keepAlive">true</data>
-  <data name="durableTimeout">120</data>
-  <data name="restartTime">0</data>
-  <data name="updateReceiveTime">60</data>
-  <data name="isDurableReg">true</data>
-  <data name="cq">true</data>
-  <data name="registerAndExecuteCQs">true</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="DClient"/>
-  <client-set name="Feeder"/>
-  
-  <test name="durableWithCqKATrue" description="Basic test for durable client with KA true and cq">
-    <task name="SetupCacheServer CS1" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="Feeder"/>
-      <data name="isFeeder">true</data>
-    </task>
-    <task name="Register All Keys Durable" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="2" name="DClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">2m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Close Cycle for DC" action="doCloseCacheAndReInitialize" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="25m" timesToRun="10" parallel="true" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="restartTime">10</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="5m">
-      <data name="sleepTime">60</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set count="2" name="DClient"/>
-    </task>
-    <task name="Close Cache" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServer 1" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServer 2" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/multRegCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/multRegCQOps.xml b/src/tests/cpp/xml/Generics/CqQuery/multRegCQOps.xml
deleted file mode 100644
index 157f8b4..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/multRegCQOps.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="multRegCQOps" description="multi region cq operation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/multRegServerFailoverAndCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/multRegServerFailoverAndCQOps.xml b/src/tests/cpp/xml/Generics/CqQuery/multRegServerFailoverAndCQOps.xml
deleted file mode 100644
index 664af75..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/multRegServerFailoverAndCQOps.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">1</data>
-  
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="multRegServerFailoverAndCQOps" description="multRegServerFailoverAndCQOps test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="3" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="3" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/resultSetValidationCQTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/resultSetValidationCQTest.xml b/src/tests/cpp/xml/Generics/CqQuery/resultSetValidationCQTest.xml
deleted file mode 100644
index f407c7f..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/resultSetValidationCQTest.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>10000</item>
-    </list>
-  </data>
-
-  <data name="valueSizes">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-  <!--categoryTypes are singleRegion = 1, multiRegion, operators, constants, functions, collectionOps, keywords,
-      regionInterface, nestedQueries, importAndSelect, canonicalization, unsupported,
-      queryAndIndexing, misc, qcEnd/*to mark the end of categoryTypes*/-->
-  <data name="categoryType">
-    <list>
-      <item>1</item>
-      <item>3</item>
-      <item>4</item>
-      <item>5</item>
-      <item>6</item>
-      <item>7</item>
-      <item>8</item>
-      <item>9</item>
-      <item>11</item>
-      <item>12</item>
-      <item>13</item>
-      <item>14</item>
-    </list>
-  </data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/IndexRegion</item>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-      <item>/Positions</item>
-      <item>/Portfolios/Positions</item>
-    </list>
-  </data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-  <data name="index">true</data>
-  <data name="largeSetQuery">false</data>
-  <data name="cq">true</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="resultSetValidationCQTest" description="result set validation test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csWithIndex.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="PopulateRegion Portfolios with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios2 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion Portfolios3 with Portfolio object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Position">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-      <data name="TypeId">registered</data>
-    </task> 
-    <task name="PopulateRegion Positions with Position object" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" argTypes="String,Position">
-      <data name="regionName">Positions</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Position</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <client-set count="2" name="ThinClient"/>
-      <data name="sleepTime">2</data>
-    </task>
-    <task name="Running Query for Result set" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="30m" continueOnError="true" argTypes="String,Portfolio">
-      <client-set count="2" name="ThinClient"/>
-      <data name="queryResultType">resultSet</data>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/serialCQMTTest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/serialCQMTTest.xml b/src/tests/cpp/xml/Generics/CqQuery/serialCQMTTest.xml
deleted file mode 100644
index 6e745d3..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/serialCQMTTest.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-   <list>
-     <item>10000</item>
-   </list>
-  </data>
-  <data name="valueSizes">
-   <list>
-     <item>100</item>
-    </list>
-  </data>
-  <data name="numThreads">
-   <list>
-     <item>6</item>
-   </list>
-  </data>
-  <data name="keyType">int</data>
-
-  <!-- clientCnt and serverCount attributes are needed to run the test in serial RR fashion -->
-  <data name="clientCnt">3</data>
-  <data name="serverCount">2</data>
-
-  <data name="serialExecution">true</data>
-  <data name="cqtest">true</data>
-  <data name="executeWithIR">true</data>
-  <data name="getInitialValues">true</data>
-  <data name="entryCount">10000</data>
-  <data name="NumNewKeys">200</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="TestTCR1">
-        <region-attributes caching-enabled="true" client-notification="true">
-          <cache-listener library="cacheserver" function="createSilenceListener"/>
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
- <client-set name="JCS1" hostGroup="CS"/>
- <client-set name="JCS2" hostGroup="CS"/>
- <client-set count="3" name="Client"/>
- <client-set name="Feeder"/>
-
- <test name="serialCQBridge" description="Test CQ with a variety of operations with careful validation and serial round-robin execution ,with multiple threads">
-   <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-     <data name="program">setupJavaServers</data>
-     <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH hct/csAckMirror.xml</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-     <data name="program">startJavaServers</data>
-     <data name="arguments">1</data>
-     <client-set name="JCS1"/>
-   </task>
-   <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-     <data name="regionName">TestTCR1</data>
-     <data name="regionSpec">ThinClientRegion</data>
-     <client-set count="3" name="Client"/>
-     <client-set name="Feeder"/>
-   </task>
-   <task name="Register All keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="2m">
-     <client-set count="3" name="Client"/>
-   </task>
-   <task name="InitInstance" action="doInitInstance" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="20m">
-    <client-set name="Feeder"/>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="LoadRegion" action="doFeedInt" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="20m">
-    <client-set name="Feeder"/>
-  </task>
-  <task name="Register CQ with executeWithIR " action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-    <data name="query">
-      <list>
-        <item>select * from /TestTCR1</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="DoOperations in serial RR fashion" action="doRROps" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" argTypes="int,object" waitTime="10m">
-    <data name="query">
-      <list>
-         <item>select * from /TestTCR1</item>
-      </list>
-    </data>
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="validate entry events against the listener count" action="doValidateEvents" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m">
-    <client-set count="3" name="Client"/>
-  </task>
-  <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" argTypes="int,object" waitTime="5m"/>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">1</data>
-    <client-set name="JCS1"/>
-  </task>
-  <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-    <data name="program">stopJavaServers</data>
-    <data name="arguments">2</data>
-    <client-set name="JCS2"/>
-  </task>
- </test>
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/serialEntryEvent.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/serialEntryEvent.xml b/src/tests/cpp/xml/Generics/CqQuery/serialEntryEvent.xml
deleted file mode 100644
index 63860a8..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/serialEntryEvent.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <data name="keyType">int</data>
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEvent" description="doing operations serially">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="UpdateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>45</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>50</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/serialEntryEventWithRegInterest.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/serialEntryEventWithRegInterest.xml b/src/tests/cpp/xml/Generics/CqQuery/serialEntryEventWithRegInterest.xml
deleted file mode 100644
index d8a9bbd..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/serialEntryEventWithRegInterest.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set count="2" name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialEntryEventWithRegInterest" description="cq test with register interest">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/CqQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="CreateRegion" action="doCreateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="5m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set count="2" name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register All Keys" action="doRegisterAllKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Register And execute CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="registerAndExecuteCQs">true</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="UpdateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="valueSizes">
-        <list>
-          <item>200</item>
-        </list>
-      </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="distinctKeys">
-      <list>
-        <item>100</item>
-      </list>
-  </data>
-    </task>
-    <task name="Verify update list" action="doVerifyInterestList" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="30m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="registerKeys">0</data>
-      <data name="keyIndexBegin">0</data>
-      <data name="valueSizes">0</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,byte[]">
-      <data name="cqOps">
-        <oneof>
-          <item>getCQAttributes</item>
-          <item>getCQName</item>
-          <item>getQuery</item>
-          <item>getQueryString</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-          <item>getStatistics</item>
-        </oneof>
-      </data>
-      <data name="workTime">5m</data>
-      <data name="opsSecond">5</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">10</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <data name="cqState">stopped</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-      <data name="cq">true</data>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroysKeys" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">10</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="PopulateRegion" action="doPopulateRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="10m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">10</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="destroy region" action="doDestroyRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.perftests" waitTime="2m" argTypes="String,byte[]">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">10</data>
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="verify CQ removed " action="doVerifyCqDestroyed" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]">
-      <client-set count="2" name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,byte[]"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml b/src/tests/cpp/xml/Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
deleted file mode 100644
index 1254b24..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/serialMultRegOpsCQListenerWithFeeder.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-  <data name="cq">true</data>
-
-  <data name="regionPaths">
-    <list>
-      <item>/Portfolios</item>
-      <item>/Portfolios2</item>
-      <item>/Portfolios3</item>
-    </list>
-  </data>
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serialMultRegOpsCQListenerWithFeeder" description="cq with multiregion test">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateClients" action="doAddRootAndSubRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>1000</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios3</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>900</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doSleep" action="doSleep" container="utils" waitTime="60">
-      <data name="sleepTime">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="Running Query with initial result" action="doRunQuery" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios2</item>
-           <item>select * from /Portfolios3</item>
-         </list>
-      </data>
-      <data name="resultSize">
-        <list>
-          <item>1000</item>
-          <item>1000</item>
-          <item>900</item>
-        </list>
-      </data>
-    </task>
-    <task name="destroyKeys" action="doDestroyUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios2</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-      <data name="destroyKeys">100</data>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="5m" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">1m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="multiRegion">true</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="stop all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">stopped</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="execute all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">execute</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close all cqs" action="doCqState" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="cqState">closed</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>

http://git-wip-us.apache.org/repos/asf/geode/blob/86df4a7c/src/tests/cpp/xml/Generics/CqQuery/serverFailoverAndCQOps.xml
----------------------------------------------------------------------
diff --git a/src/tests/cpp/xml/Generics/CqQuery/serverFailoverAndCQOps.xml b/src/tests/cpp/xml/Generics/CqQuery/serverFailoverAndCQOps.xml
deleted file mode 100644
index e67161e..0000000
--- a/src/tests/cpp/xml/Generics/CqQuery/serverFailoverAndCQOps.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-driver version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../testDefinition.xsd">
-
-  <data name="cacheType">CLIENT</data>
-  <data name="redundancyLevel">1</data>
-  <data name="minServers">1</data>
-
-  <data name="distinctKeys">
-    <list>
-      <item>1000</item>
-    </list>
-  </data>
-  <data name="valueSizes">
-    <list>
-      <item>100</item>
-    </list>
-  </data>
-  <data name="sleepTime">
-    <oneof>
-      <item>40</item>
-      <item>50</item>
-      <item>60</item>
-      <item>90</item>
-    </oneof>
-  </data>
-  <data name="operation">
-    <oneof>
-      <item>stop</item>
-      <item>term</item>
-      <item>kill</item>
-    </oneof>
-  </data>
-
-  <data name="numThreads">
-    <list>
-      <item>1</item>
-    </list>
-  </data>
-
-  <!--data name="keyType">int</data-->
-
-  <data name="ThinClientRegion">
-    <snippet>
-      <region name="Portfolios">
-        <region-attributes caching-enabled="true" client-notification="true">
-        </region-attributes>
-      </region>
-    </snippet>
-  </data>
-  <data name="regionSpec">ThinClientRegion</data>
-
-  <client-set name="JCS1" hostGroup="CS"/>
-  <client-set name="JCS2" hostGroup="CS"/>
-  <client-set name="ThinClient"/>
-  <client-set name="Feeder"/>
-
-  <test name="serverFailoverAndCQOps" description="failover test with single region">
-    <task name="SetupCacheServer" action="doRunProcess" container="utils" waitTime="5m">
-      <data name="program">setupJavaServers</data>
-      <data name="arguments">-c 2 -e CLASSPATH=\$BUILDDIR/framework/lib/javaobject.jar:\$CLASSPATH Generics/RemoteQuery/csAckMirror.xml</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StartCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">startJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="CreateRegion" action="doCreateUserDefineRegion" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <data name="regionSpec">ThinClientRegion</data>
-      <client-set name="ThinClient"/>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="Register CQ" action="doRegisterCqForConc" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-      <data name="query">
-         <list>
-           <item>select * from /Portfolios</item>
-           <item>select * from /Portfolios where ID =  2</item>
-         </list>
-      </data>
-    </task>
-    <task name="PopulateRegion" action="doPopulateUserObject" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="10m" argTypes="String,Portfolio">
-      <data name="regionName">Portfolios</data>
-      <client-set name="Feeder"/>
-      <data name="objectType">Portfolio</data>
-    </task>
-    <task name="doCqOperations" action="doCQOperation" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="cqOps">
-        <oneof>
-          <item>executeCQWithIR</item>
-          <item>executeCQ</item>
-          <item>closeCQ</item>
-          <item>stopCq</item>
-        </oneof>
-      </data>
-      <data name="workTime">7m</data>
-      <data name="opsSecond">5</data>
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="do random entry ops on portfolio" action="doEntryOperations" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.cacheserver" waitTime="15m" parallel="true" argTypes="String,Portfolio">
-      <data name="entryOps">
-        <oneof>
-          <item>add</item>
-          <item>update</item>
-          <item>update</item>
-          <item>putAll</item>
-          <item>destroy</item>
-          <item>destroy</item>
-        </oneof>
-      </data>
-      <data name="workTime">10m</data>
-      <data name="opsSecond">5</data>
-      <data name="entryCount">1000</data>
-      <data name="valueSizes">100</data>
-      <data name="regionName">Portfolios</data>
-      <data name="objectType">Portfolio</data>
-      <client-set name="Feeder"/>
-    </task>
-    <task name="stopStartCacheServer 1" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="stopStartCacheServer 2" action="doStopStartServer" container="utils" timesToRun="2" waitTime="30m" continueOnError="true" parallel="true">
-      <data name="ServerId">2</data>
-      <client-set name="JCS2"/>
-    </task>
-    <task name="verify CQ listener is called" action="doVerifyCQListenerInvoked" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio">
-      <client-set name="ThinClient"/>
-    </task>
-    <task name="close cache for CPP clients" action="doCloseCache" container="NewFwkLib.GemStone.GemFire.Cache.FwkLib.querytests" waitTime="5m" argTypes="String,Portfolio"/>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">1</data>
-      <client-set name="JCS1"/>
-    </task>
-    <task name="StopCacheServers" action="doRunProcess" container="utils" waitTime="5m" parallel="true">
-      <data name="program">stopJavaServers</data>
-      <data name="arguments">2</data>
-      <client-set name="JCS2"/>
-    </task>
-  </test>
-
-</test-driver>