ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [1/4] ignite git commit: Configs for Win32 platform tests, tests code changes to employ new configs
Date Tue, 11 Apr 2017 12:15:56 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3477-master 2a6afe528 -> 7eb1234cb


Configs for Win32 platform tests, tests code changes to employ new configs


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8daada7b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8daada7b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8daada7b

Branch: refs/heads/ignite-3477-master
Commit: 8daada7b4cbaebfffa538047f9710436ec1f390d
Parents: 6e67866
Author: Sergey Chugunov <sergey.chugunov@gmail.com>
Authored: Mon Apr 10 18:01:57 2017 +0300
Committer: Sergey Chugunov <sergey.chugunov@gmail.com>
Committed: Tue Apr 11 13:06:25 2017 +0300

----------------------------------------------------------------------
 .../cpp/core-test/config/cache-identity-32.xml  |  50 ++++++
 .../core-test/config/cache-identity-default.xml | 154 +++++++++++++++++++
 .../cpp/core-test/config/cache-identity.xml     | 124 +--------------
 .../cpp/core-test/config/cache-store-32.xml     |  50 ++++++
 .../core-test/config/cache-store-default.xml    |  71 +++++++++
 .../cpp/core-test/config/cache-store.xml        |  41 +----
 .../cpp/core-test/project/vs/core-test.vcxproj  |   8 +
 .../project/vs/core-test.vcxproj.filters        |  12 ++
 .../src/binary_identity_resolver_test.cpp       |   8 +
 .../cpp/core-test/src/binary_object_test.cpp    |   8 +
 .../cpp/core-test/src/cache_invoke_test.cpp     |   4 +
 .../cpp/core-test/src/cache_store_test.cpp      |  11 +-
 .../cpp/core-test/src/cluster_test.cpp          |   4 +
 .../cpp/core-test/src/continuous_query_test.cpp |   5 +
 14 files changed, 388 insertions(+), 162 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-identity-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-identity-32.xml b/modules/platforms/cpp/core-test/config/cache-identity-32.xml
new file mode 100644
index 0000000..4a8a68f
--- /dev/null
+++ b/modules/platforms/cpp/core-test/config/cache-identity-32.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<!--
+    Ignite Spring configuration file to startup grid cache.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        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">
+    <import resource="cache-identity-default.xml"/>
+
+    <bean parent="grid.cfg">
+        <property name="memoryConfiguration">
+            <bean class="org.apache.ignite.configuration.MemoryConfiguration">
+                <property name="systemCacheMemorySize" value="#{40 * 1024 * 1024}"/>
+                <property name="defaultMemoryPolicyName" value="dfltPlc"/>
+
+                <property name="memoryPolicies">
+                    <list>
+                        <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
+                            <property name="name" value="dfltPlc"/>
+                            <property name="size" value="#{100 * 1024 * 1024}"/>
+                        </bean>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+</beans>

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-identity-default.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-identity-default.xml b/modules/platforms/cpp/core-test/config/cache-identity-default.xml
new file mode 100644
index 0000000..a73d0bb
--- /dev/null
+++ b/modules/platforms/cpp/core-test/config/cache-identity-default.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<!--
+    Ignite Spring configuration file to startup grid cache.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        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">
+    <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+        <property name="localHost" value="127.0.0.1"/>
+        <property name="connectorConfiguration"><null/></property>
+
+        <property name="cacheConfiguration">
+            <list>
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="cache1"/>
+                    <property name="cacheMode" value="PARTITIONED"/>
+                    <property name="atomicityMode" value="TRANSACTIONAL"/>
+                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+                    <!-- Configure type metadata to enable queries. -->
+                    <property name="queryEntities">
+                        <list>
+                            <bean class="org.apache.ignite.cache.QueryEntity">
+                                <property name="keyType" value="CompositeKey"/>
+                                <property name="valueType" value="java.lang.Integer"/>
+
+                                <property name="fields">
+                                    <map>
+                                        <entry key="str" value="java.lang.String"/>
+                                        <entry key="ts" value="java.sql.Timestamp"/>
+                                        <entry key="guid" value="java.util.UUID"/>
+                                    </map>
+                                </property>
+
+                                <property name="keyFields">
+                                    <list>
+                                        <value>str</value>
+                                        <value>ts</value>
+                                        <value>guid</value>
+                                    </list>
+                                </property>
+                            </bean>
+                        </list>
+                    </property>
+                </bean>
+
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="cache2"/>
+                    <property name="cacheMode" value="PARTITIONED"/>
+                    <property name="atomicityMode" value="TRANSACTIONAL"/>
+                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+                    <!-- Configure type metadata to enable queries. -->
+                    <property name="queryEntities">
+                        <list>
+                            <bean class="org.apache.ignite.cache.QueryEntity">
+                                <property name="keyType" value="CompositeKeySimple"/>
+                                <property name="valueType" value="java.lang.Integer"/>
+
+                                <property name="fields">
+                                    <map>
+                                        <entry key="str" value="java.lang.String"/>
+                                        <entry key="ts" value="java.sql.Timestamp"/>
+                                        <entry key="i64" value="java.lang.Long"/>
+                                    </map>
+                                </property>
+
+                                <property name="keyFields">
+                                    <list>
+                                        <value>str</value>
+                                        <value>ts</value>
+                                        <value>i64</value>
+                                    </list>
+                                </property>
+                            </bean>
+                        </list>
+                    </property>
+                </bean>
+
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="cache3"/>
+                    <property name="cacheMode" value="PARTITIONED"/>
+                    <property name="atomicityMode" value="TRANSACTIONAL"/>
+                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+                    <!-- Configure type metadata to enable queries. -->
+                    <property name="queryEntities">
+                        <list>
+                            <bean class="org.apache.ignite.cache.QueryEntity">
+                                <property name="keyType" value="ComplexType2"/>
+                                <property name="valueType" value="java.lang.Integer"/>
+
+                                <property name="fields">
+                                    <map>
+                                        <entry key="i32Field" value="java.lang.Integer"/>
+                                        <entry key="objField" value="InnerObject"/>
+                                        <entry key="strField" value="java.lang.String"/>
+                                    </map>
+                                </property>
+
+                                <property name="keyFields">
+                                    <list>
+                                        <value>i32Field</value>
+                                        <value>objField</value>
+                                        <value>strField</value>
+                                    </list>
+                                </property>
+                            </bean>
+                        </list>
+                    </property>
+                </bean>
+            </list>
+        </property>
+
+        <property name="discoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                <property name="ipFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+                        <property name="addresses">
+                            <list>
+                                <!-- In distributed environment, replace with actual host
IP address. -->
+                                <value>127.0.0.1:47500</value>
+                            </list>
+                        </property>
+                    </bean>
+                </property>
+                <property name="socketTimeout" value="300" />
+            </bean>
+        </property>
+    </bean>
+</beans>

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-identity.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-identity.xml b/modules/platforms/cpp/core-test/config/cache-identity.xml
index c4e0b1b..67bb9e9 100644
--- a/modules/platforms/cpp/core-test/config/cache-identity.xml
+++ b/modules/platforms/cpp/core-test/config/cache-identity.xml
@@ -28,127 +28,7 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util.xsd">
-    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
-        <property name="localHost" value="127.0.0.1"/>
-        <property name="connectorConfiguration"><null/></property>
+    <import resource="cache-identity-default.xml"/>
 
-        <property name="cacheConfiguration">
-            <list>
-                <bean class="org.apache.ignite.configuration.CacheConfiguration">
-                    <property name="name" value="cache1"/>
-                    <property name="cacheMode" value="PARTITIONED"/>
-                    <property name="atomicityMode" value="TRANSACTIONAL"/>
-                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
-                    <!-- Configure type metadata to enable queries. -->
-                    <property name="queryEntities">
-                        <list>
-                            <bean class="org.apache.ignite.cache.QueryEntity">
-                                <property name="keyType" value="CompositeKey"/>
-                                <property name="valueType" value="java.lang.Integer"/>
-
-                                <property name="fields">
-                                    <map>
-                                        <entry key="str" value="java.lang.String"/>
-                                        <entry key="ts" value="java.sql.Timestamp"/>
-                                        <entry key="guid" value="java.util.UUID"/>
-                                    </map>
-                                </property>
-
-                                <property name="keyFields">
-                                    <list>
-                                        <value>str</value>
-                                        <value>ts</value>
-                                        <value>guid</value>
-                                    </list>
-                                </property>
-                            </bean>
-                        </list>
-                    </property>
-                </bean>
-
-                <bean class="org.apache.ignite.configuration.CacheConfiguration">
-                    <property name="name" value="cache2"/>
-                    <property name="cacheMode" value="PARTITIONED"/>
-                    <property name="atomicityMode" value="TRANSACTIONAL"/>
-                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
-                    <!-- Configure type metadata to enable queries. -->
-                    <property name="queryEntities">
-                        <list>
-                            <bean class="org.apache.ignite.cache.QueryEntity">
-                                <property name="keyType" value="CompositeKeySimple"/>
-                                <property name="valueType" value="java.lang.Integer"/>
-
-                                <property name="fields">
-                                    <map>
-                                        <entry key="str" value="java.lang.String"/>
-                                        <entry key="ts" value="java.sql.Timestamp"/>
-                                        <entry key="i64" value="java.lang.Long"/>
-                                    </map>
-                                </property>
-
-                                <property name="keyFields">
-                                    <list>
-                                        <value>str</value>
-                                        <value>ts</value>
-                                        <value>i64</value>
-                                    </list>
-                                </property>
-                            </bean>
-                        </list>
-                    </property>
-                </bean>
-
-                <bean class="org.apache.ignite.configuration.CacheConfiguration">
-                    <property name="name" value="cache3"/>
-                    <property name="cacheMode" value="PARTITIONED"/>
-                    <property name="atomicityMode" value="TRANSACTIONAL"/>
-                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
-                    <!-- Configure type metadata to enable queries. -->
-                    <property name="queryEntities">
-                        <list>
-                            <bean class="org.apache.ignite.cache.QueryEntity">
-                                <property name="keyType" value="ComplexType2"/>
-                                <property name="valueType" value="java.lang.Integer"/>
-
-                                <property name="fields">
-                                    <map>
-                                        <entry key="i32Field" value="java.lang.Integer"/>
-                                        <entry key="objField" value="InnerObject"/>
-                                        <entry key="strField" value="java.lang.String"/>
-                                    </map>
-                                </property>
-
-                                <property name="keyFields">
-                                    <list>
-                                        <value>i32Field</value>
-                                        <value>objField</value>
-                                        <value>strField</value>
-                                    </list>
-                                </property>
-                            </bean>
-                        </list>
-                    </property>
-                </bean>
-            </list>
-        </property>
-
-        <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
-                <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
-                        <property name="addresses">
-                            <list>
-                                <!-- In distributed environment, replace with actual host
IP address. -->
-                                <value>127.0.0.1:47500</value>
-                            </list>
-                        </property>
-                    </bean>
-                </property>
-                <property name="socketTimeout" value="300" />
-            </bean>
-        </property>
-    </bean>
+    <bean parent="grid.cfg"/>
 </beans>

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-store-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-store-32.xml b/modules/platforms/cpp/core-test/config/cache-store-32.xml
new file mode 100644
index 0000000..f2b6682
--- /dev/null
+++ b/modules/platforms/cpp/core-test/config/cache-store-32.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<!--
+    Ignite Spring configuration file to startup grid cache.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        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">
+    <import resource="cache-store-default.xml"/>
+
+    <bean parent="grid.cfg">
+        <property name="memoryConfiguration">
+            <bean class="org.apache.ignite.configuration.MemoryConfiguration">
+                <property name="systemCacheMemorySize" value="#{40 * 1024 * 1024}"/>
+                <property name="defaultMemoryPolicyName" value="dfltPlc"/>
+
+                <property name="memoryPolicies">
+                    <list>
+                        <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
+                            <property name="name" value="dfltPlc"/>
+                            <property name="size" value="#{100 * 1024 * 1024}"/>
+                        </bean>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+</beans>

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-store-default.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-store-default.xml b/modules/platforms/cpp/core-test/config/cache-store-default.xml
new file mode 100644
index 0000000..06baa7e
--- /dev/null
+++ b/modules/platforms/cpp/core-test/config/cache-store-default.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<!--
+    Ignite Spring configuration file to startup grid cache.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        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">
+    <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+        <property name="localHost" value="127.0.0.1"/>
+        <property name="connectorConfiguration"><null/></property>
+
+        <property name="cacheConfiguration">
+            <list>
+                <bean class="org.apache.ignite.configuration.CacheConfiguration">
+                    <property name="name" value="cache1"/>
+                    <property name="cacheMode" value="PARTITIONED"/>
+                    <property name="atomicityMode" value="TRANSACTIONAL"/>
+                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+                    <property name="cacheStoreFactory">
+                        <bean class="org.apache.ignite.internal.processors.cache.MapCacheStoreStrategy.MapStoreFactory"/>
+                    </property>
+
+                    <property name="writeBehindEnabled" value="false"/>
+
+                    <property name="readThrough" value="false"/>
+                    <property name="writeThrough" value="true"/>
+                </bean>
+            </list>
+        </property>
+
+        <property name="discoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                <property name="ipFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
+                        <property name="addresses">
+                            <list>
+                                <!-- In distributed environment, replace with actual host
IP address. -->
+                                <value>127.0.0.1:47500</value>
+                            </list>
+                        </property>
+                    </bean>
+                </property>
+                <property name="socketTimeout" value="300" />
+            </bean>
+        </property>
+    </bean>
+</beans>

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/config/cache-store.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-store.xml b/modules/platforms/cpp/core-test/config/cache-store.xml
index 94c7ddd..8669631 100644
--- a/modules/platforms/cpp/core-test/config/cache-store.xml
+++ b/modules/platforms/cpp/core-test/config/cache-store.xml
@@ -28,44 +28,7 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util.xsd">
-    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
-        <property name="localHost" value="127.0.0.1"/>
-        <property name="connectorConfiguration"><null/></property>
+    <import resource="cache-store-default.xml"/>
 
-        <property name="cacheConfiguration">
-            <list>
-                <bean class="org.apache.ignite.configuration.CacheConfiguration">
-                    <property name="name" value="cache1"/>
-                    <property name="cacheMode" value="PARTITIONED"/>
-                    <property name="atomicityMode" value="TRANSACTIONAL"/>
-                    <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
-                    <property name="cacheStoreFactory">
-                        <bean class="org.apache.ignite.internal.processors.cache.MapCacheStoreStrategy.MapStoreFactory"/>
-                    </property>
-
-                    <property name="writeBehindEnabled" value="false"/>
-
-                    <property name="readThrough" value="false"/>
-                    <property name="writeThrough" value="true"/>
-                </bean>
-            </list>
-        </property>
-
-        <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
-                <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
-                        <property name="addresses">
-                            <list>
-                                <!-- In distributed environment, replace with actual host
IP address. -->
-                                <value>127.0.0.1:47500</value>
-                            </list>
-                        </property>
-                    </bean>
-                </property>
-                <property name="socketTimeout" value="300" />
-            </bean>
-        </property>
-    </bean>
+    <bean parent="grid.cfg"/>
 </beans>

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj
index d97f917..5d97d20 100644
--- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj
+++ b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj
@@ -34,14 +34,22 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\config\cache-identity.xml" />
+    <None Include="..\..\config\cache-identity-32.xml" />
+    <None Include="..\..\config\cache-identity-default.xml" />
     <None Include="..\..\config\cache-query-continuous.xml" />
     <None Include="..\..\config\cache-query-32.xml" />
     <None Include="..\..\config\cache-query.xml" />
     <None Include="..\..\config\cache-query-default.xml" />
     <None Include="..\..\config\cache-test-32.xml" />
+    <None Include="..\..\config\cache-store-default.xml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="..\..\config\cache-store.xml">
       <SubType>Designer</SubType>
     </None>
+    <None Include="..\..\config\cache-store-32.xml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="..\..\config\cache-test.xml" />
     <None Include="..\..\config\cache-test-default.xml" />
     <None Include="..\..\config\cache-query-continuous-32.xml" />

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters
index 933118f..08652d9 100644
--- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters
+++ b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj.filters
@@ -157,12 +157,24 @@
     <None Include="..\..\config\cache-identity.xml">
       <Filter>Configs</Filter>
     </None>
+    <None Include="..\..\config\cache-identity-32.xml">
+      <Filter>Configs</Filter>
+    </None>
+    <None Include="..\..\config\cache-identity-default.xml">
+      <Filter>Configs</Filter>
+    </None>
     <None Include="..\..\config\cache-query-continuous.xml">
       <Filter>Configs</Filter>
     </None>
+    <None Include="..\..\config\cache-store-default.xml">
+      <Filter>Configs</Filter>
+    </None>
     <None Include="..\..\config\cache-store.xml">
       <Filter>Configs</Filter>
     </None>
+    <None Include="..\..\config\cache-store-32.xml">
+      <Filter>Configs</Filter>
+    </None>
     <None Include="..\..\config\cache-query-continuous.xml">
       <Filter>Configs</Filter>
     </None>

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp b/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp
index b6831c3..62f37f9 100644
--- a/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp
+++ b/modules/platforms/cpp/core-test/src/binary_identity_resolver_test.cpp
@@ -298,7 +298,11 @@ BOOST_AUTO_TEST_CASE(GetDataHashCode)
 
 BOOST_AUTO_TEST_CASE(IdentityEquilityWithGuid)
 {
+#ifdef IGNITE_TESTS_32
+    Ignite grid = ignite_test::StartNode("cache-identity-32.xml");
+#else
     Ignite grid = ignite_test::StartNode("cache-identity.xml");
+#endif
 
     CompositeKey key("Key String", Timestamp(123851, 562304134), Guid(0x4A950C6206FE4502,
0xAC06145097E56F02));
     int32_t value = 12321;
@@ -321,7 +325,11 @@ BOOST_AUTO_TEST_CASE(IdentityEquilityWithGuid)
 
 BOOST_AUTO_TEST_CASE(IdentityEquilityWithoutGuid)
 {
+#ifdef IGNITE_TESTS_32
+    Ignite grid = ignite_test::StartNode("cache-identity-32.xml");
+#else
     Ignite grid = ignite_test::StartNode("cache-identity.xml");
+#endif
 
     CompositeKeySimple key("Lorem ipsum", Timestamp(112460, 163002155), 1337);
     int32_t value = 42;

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/binary_object_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/binary_object_test.cpp b/modules/platforms/cpp/core-test/src/binary_object_test.cpp
index bc30428..fa8878d 100644
--- a/modules/platforms/cpp/core-test/src/binary_object_test.cpp
+++ b/modules/platforms/cpp/core-test/src/binary_object_test.cpp
@@ -328,7 +328,11 @@ BOOST_AUTO_TEST_CASE(RemoteSchemaRetrieval)
     try
     {
         BOOST_CHECKPOINT("Node1 startup");
+#ifdef IGNITE_TESTS_32
+        Ignite node1 = ignite_test::StartNode("cache-test-32.xml", "node1");
+#else
         Ignite node1 = ignite_test::StartNode("cache-test.xml", "node1");
+#endif
 
         BOOST_CHECKPOINT("Creating cache");
         cache::Cache<int32_t, BinaryFields> cache = node1.GetOrCreateCache<int32_t,
BinaryFields>("cache");
@@ -339,7 +343,11 @@ BOOST_AUTO_TEST_CASE(RemoteSchemaRetrieval)
         cache.Put(42, some);
 
         BOOST_CHECKPOINT("Node2 startup");
+#ifdef IGNITE_TESTS_32
+        Ignite node2 = ignite_test::StartNode("cache-test-32.xml", "node2");
+#else
         Ignite node2 = ignite_test::StartNode("cache-test.xml", "node2");
+#endif
 
         impl::IgniteImpl* nodeImpl = impl::IgniteImpl::GetFromProxy(node2);
         impl::IgniteEnvironment* env = nodeImpl->GetEnvironment();

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp b/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp
index f094d1c..73b419e 100644
--- a/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cache_invoke_test.cpp
@@ -396,7 +396,11 @@ struct CacheInvokeTestSuiteFixture
      * Constructor.
      */
     CacheInvokeTestSuiteFixture() :
+#ifdef IGNITE_TESTS_32
+        node(ignite_test::StartNode("cache-query-32.xml", "InvokeTest"))
+#else
         node(ignite_test::StartNode("cache-query.xml", "InvokeTest"))
+#endif
     {
         // No-op.
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/cache_store_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/cache_store_test.cpp b/modules/platforms/cpp/core-test/src/cache_store_test.cpp
index f1b4630..396cad0 100644
--- a/modules/platforms/cpp/core-test/src/cache_store_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cache_store_test.cpp
@@ -41,8 +41,13 @@ struct CacheStoreTestSuiteFixture
     /*
      * Constructor.
      */
-    CacheStoreTestSuiteFixture() : 
+    CacheStoreTestSuiteFixture() :
+#ifdef IGNITE_TESTS_32
+        node1(ignite_test::StartNode("cache-store-32.xml", "node1"))
+#else
         node1(ignite_test::StartNode("cache-store.xml", "node1"))
+#endif
+
     {
         // No-op.
     }
@@ -102,7 +107,11 @@ BOOST_AUTO_TEST_CASE(LoadCacheSingleNodeNoPredicate)
 BOOST_AUTO_TEST_CASE(LoadCacheSeveralNodesNoPredicate)
 {
     BOOST_CHECKPOINT("Starting additional node");
+#ifdef IGNITE_TESTS_32
+    Ignite node2 = ignite_test::StartNode("cache-store-32.xml", "node2");
+#else
     Ignite node2 = ignite_test::StartNode("cache-store.xml", "node2");
+#endif
 
     const int64_t entriesNum = 100;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/cluster_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/cluster_test.cpp b/modules/platforms/cpp/core-test/src/cluster_test.cpp
index c681ca2..754fe7e 100644
--- a/modules/platforms/cpp/core-test/src/cluster_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cluster_test.cpp
@@ -40,7 +40,11 @@ struct ClusterTestSuiteFixture
      * Constructor.
      */
     ClusterTestSuiteFixture() :
+#ifdef IGNITE_TESTS_32
+        node(ignite_test::StartNode("cache-test-32.xml", "ClusterTest"))
+#else
         node(ignite_test::StartNode("cache-test.xml", "ClusterTest"))
+#endif
     {
         // No-op.
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/8daada7b/modules/platforms/cpp/core-test/src/continuous_query_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/continuous_query_test.cpp b/modules/platforms/cpp/core-test/src/continuous_query_test.cpp
index 46ffc2f..e09b403 100644
--- a/modules/platforms/cpp/core-test/src/continuous_query_test.cpp
+++ b/modules/platforms/cpp/core-test/src/continuous_query_test.cpp
@@ -718,8 +718,13 @@ BOOST_AUTO_TEST_CASE(TestFilterSingleNode)
 
 BOOST_AUTO_TEST_CASE(TestFilterMultipleNodes)
 {
+#ifdef IGNITE_TESTS_32
+    Ignite node2 = ignite_test::StartNode("cache-query-continuous-32.xml", "node-02");
+    Ignite node3 = ignite_test::StartNode("cache-query-continuous-32.xml", "node-03");
+#else
     Ignite node2 = ignite_test::StartNode("cache-query-continuous.xml", "node-02");
     Ignite node3 = ignite_test::StartNode("cache-query-continuous.xml", "node-03");
+#endif
 
     node.GetBinding().RegisterCacheEntryEventFilter< RangeFilter<int, TestEntry>
>();
 


Mime
View raw message