http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinariesNearPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinariesNearPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinariesNearPartitionedByteArrayValuesSelfTest.java new file mode 100644 index 0000000..13b374c --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinariesNearPartitionedByteArrayValuesSelfTest.java @@ -0,0 +1,41 @@ +/* + * 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. + */ +package org.apache.ignite.internal.processors.cache.binary.distributed.dht; + +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAbstractNearPartitionedByteArrayValuesSelfTest; +import org.apache.ignite.internal.binary.BinaryMarshaller; + +/** + * + */ +public class GridCacheBinariesNearPartitionedByteArrayValuesSelfTest + extends GridCacheAbstractNearPartitionedByteArrayValuesSelfTest { + /** {@inheritDoc} */ + @Override protected boolean peerClassLoading() { + return false; + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setMarshaller(new BinaryMarshaller()); + + return cfg; + } +}
http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java deleted file mode 100644 index 9c1572e..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCachePortablesNearPartitionedByteArrayValuesSelfTest.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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. - */ -package org.apache.ignite.internal.processors.cache.binary.distributed.dht; - -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAbstractNearPartitionedByteArrayValuesSelfTest; -import org.apache.ignite.internal.binary.BinaryMarshaller; - -/** - * - */ -public class GridCachePortablesNearPartitionedByteArrayValuesSelfTest - extends GridCacheAbstractNearPartitionedByteArrayValuesSelfTest { - /** {@inheritDoc} */ - @Override protected boolean peerClassLoading() { - return false; - } - - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new BinaryMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java new file mode 100644 index 0000000..3dc78cc --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java @@ -0,0 +1,37 @@ +/* + * 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. + */ + +package org.apache.ignite.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.testframework.config.GridTestProperties; + +/** + * Cache full API suite with portable marshaller. + */ +public class IgniteBinaryCacheFullApiTestSuite extends TestSuite { + /** + * @return Suite. + * @throws Exception In case of error. + */ + public static TestSuite suite() throws Exception { + GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); + + return IgniteCacheFullApiSelfTestSuite.suite(); + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java new file mode 100644 index 0000000..729bebe --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java @@ -0,0 +1,101 @@ +/* + * 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. + */ + +package org.apache.ignite.testsuites; + +import java.util.HashSet; +import junit.framework.TestSuite; +import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheMvccSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.expiry.IgniteCacheAtomicLocalExpiryPolicyTest; +import org.apache.ignite.internal.processors.cache.binary.GridBinaryCacheEntryMemorySizeSelfTest; +import org.apache.ignite.internal.processors.cache.binary.datastreaming.DataStreamProcessorBinarySelfTest; +import org.apache.ignite.internal.processors.cache.binary.datastreaming.GridDataStreamerImplSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAffinityRoutingBinarySelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultiNodeSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultithreadedSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryMultiNodeSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryMultithreadedSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheMemoryModeBinarySelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredAtomicBinarySelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredEvictionAtomicBinarySelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredEvictionBinarySelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredBinarySelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesNearPartitionedByteArrayValuesSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest; +import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSelfTest; +import org.apache.ignite.testframework.config.GridTestProperties; + +/** + * Cache suite with portable marshaller. + */ +public class IgniteBinaryCacheTestSuite extends TestSuite { + /** + * @return Suite. + * @throws Exception In case of error. + */ + public static TestSuite suite() throws Exception { + GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); + + TestSuite suite = new TestSuite("Portable Cache Test Suite"); + + HashSet<Class> ignoredTests = new HashSet<>(); + + // Tests below have a special version for Portable Marshaller + ignoredTests.add(DataStreamProcessorSelfTest.class); + ignoredTests.add(GridCacheOffHeapTieredEvictionAtomicSelfTest.class); + ignoredTests.add(GridCacheOffHeapTieredEvictionSelfTest.class); + ignoredTests.add(GridCacheOffHeapTieredSelfTest.class); + ignoredTests.add(GridCacheOffHeapTieredAtomicSelfTest.class); + ignoredTests.add(GridCacheAffinityRoutingSelfTest.class); + ignoredTests.add(IgniteCacheAtomicLocalExpiryPolicyTest.class); + ignoredTests.add(GridCacheEntryMemorySizeSelfTest.class); + + // Tests that are not ready to be used with PortableMarshaller + ignoredTests.add(GridCacheMvccSelfTest.class); + + suite.addTest(IgniteCacheTestSuite.suite(ignoredTests)); + + suite.addTestSuite(GridCacheMemoryModeBinarySelfTest.class); + suite.addTestSuite(GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.class); + suite.addTestSuite(GridCacheOffHeapTieredEvictionBinarySelfTest.class); + + suite.addTestSuite(GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest.class); + suite.addTestSuite(GridCacheBinariesNearPartitionedByteArrayValuesSelfTest.class); + suite.addTestSuite(GridCacheOffHeapTieredBinarySelfTest.class); + suite.addTestSuite(GridCacheOffHeapTieredAtomicBinarySelfTest.class); + + suite.addTestSuite(GridDataStreamerImplSelfTest.class); + suite.addTestSuite(DataStreamProcessorBinarySelfTest.class); + suite.addTestSuite(GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultiNodeSelfTest.class); + suite.addTestSuite(GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultithreadedSelfTest.class); + + suite.addTestSuite(GridCacheAtomicPartitionedOnlyBinaryMultiNodeSelfTest.class); + suite.addTestSuite(GridCacheAtomicPartitionedOnlyBinaryMultithreadedSelfTest.class); + + suite.addTestSuite(GridCacheAffinityRoutingBinarySelfTest.class); + suite.addTestSuite(GridBinaryCacheEntryMemorySizeSelfTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java new file mode 100644 index 0000000..271ff33 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java @@ -0,0 +1,114 @@ +/* + * 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. + */ + +package org.apache.ignite.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.binary.BinaryEnumsSelfTest; +import org.apache.ignite.internal.binary.GridBinaryAffinityKeySelfTest; +import org.apache.ignite.internal.binary.BinaryObjectBuilderAdditionalSelfTest; +import org.apache.ignite.internal.binary.BinaryObjectBuilderSelfTest; +import org.apache.ignite.internal.binary.GridBinaryMarshallerCtxDisabledSelfTest; +import org.apache.ignite.internal.binary.BinaryMarshallerSelfTest; +import org.apache.ignite.internal.binary.GridBinaryMetaDataSelfTest; +import org.apache.ignite.internal.binary.GridBinaryWildcardsSelfTest; +import org.apache.ignite.internal.binary.BinaryFooterOffsetsHeapSelfTest; +import org.apache.ignite.internal.binary.BinaryFooterOffsetsOffheapSelfTest; +import org.apache.ignite.internal.binary.BinaryFieldsHeapSelfTest; +import org.apache.ignite.internal.binary.BinaryFieldsOffheapSelfTest; +import org.apache.ignite.internal.binary.noncompact.BinaryFieldsHeapNonCompactSelfTest; +import org.apache.ignite.internal.binary.noncompact.BinaryFieldsOffheapNonCompactSelfTest; +import org.apache.ignite.internal.binary.noncompact.BinaryFooterOffsetsHeapNonCompactSelfTest; +import org.apache.ignite.internal.binary.noncompact.BinaryFooterOffsetsOffheapNonCompactSelfTest; +import org.apache.ignite.internal.binary.noncompact.BinaryMarshallerNonCompactSelfTest; +import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderAdditionalNonCompactSelfTest; +import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderNonCompactSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.IgniteBinaryMetadataUpdateChangingTopologySelfTest; +import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataMultinodeTest; +import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataTest; +import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreObjectsSelfTest; +import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreBinariesSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.replicated.GridCacheBinaryObjectsReplicatedSelfTest; +import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsAtomicLocalSelfTest; +import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalOffheapTieredSelfTest; +import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalSelfTest; + +/** + * Test for portable objects stored in cache. + */ +public class IgniteBinaryObjectsTestSuite extends TestSuite { + /** + * @return Suite. + * @throws Exception If failed. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("Ignite Binary Objects Test Suite"); + + suite.addTestSuite(BinaryMarshallerSelfTest.class); + suite.addTestSuite(GridBinaryMarshallerCtxDisabledSelfTest.class); + suite.addTestSuite(BinaryObjectBuilderSelfTest.class); + suite.addTestSuite(BinaryObjectBuilderAdditionalSelfTest.class); + suite.addTestSuite(BinaryFieldsHeapSelfTest.class); + suite.addTestSuite(BinaryFieldsOffheapSelfTest.class); + suite.addTestSuite(BinaryFooterOffsetsHeapSelfTest.class); + suite.addTestSuite(BinaryFooterOffsetsOffheapSelfTest.class); + suite.addTestSuite(BinaryEnumsSelfTest.class); + suite.addTestSuite(GridBinaryMetaDataSelfTest.class); + suite.addTestSuite(GridBinaryAffinityKeySelfTest.class); + suite.addTestSuite(GridBinaryWildcardsSelfTest.class); + + // Tests for objects with non-compact footers. + suite.addTestSuite(BinaryMarshallerNonCompactSelfTest.class); + suite.addTestSuite(BinaryObjectBuilderNonCompactSelfTest.class); + suite.addTestSuite(BinaryObjectBuilderAdditionalNonCompactSelfTest.class); + suite.addTestSuite(BinaryFieldsHeapNonCompactSelfTest.class); + suite.addTestSuite(BinaryFieldsOffheapNonCompactSelfTest.class); + suite.addTestSuite(BinaryFooterOffsetsHeapNonCompactSelfTest.class); + suite.addTestSuite(BinaryFooterOffsetsOffheapNonCompactSelfTest.class); + + suite.addTestSuite(GridCacheBinaryObjectsLocalSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicLocalSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsReplicatedSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsPartitionedSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledSelfTest.class); + + suite.addTestSuite(GridCacheBinaryObjectsLocalOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest.class); + suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest.class); + + suite.addTestSuite(GridCacheBinaryStoreObjectsSelfTest.class); + suite.addTestSuite(GridCacheBinaryStoreBinariesSelfTest.class); + + suite.addTestSuite(GridCacheClientNodeBinaryObjectMetadataTest.class); + suite.addTestSuite(GridCacheClientNodeBinaryObjectMetadataMultinodeTest.class); + suite.addTestSuite(IgniteBinaryMetadataUpdateChangingTopologySelfTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java deleted file mode 100644 index 3ba5b45..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * Cache full API suite with portable marshaller. - */ -public class IgnitePortableCacheFullApiTestSuite extends TestSuite { - /** - * @return Suite. - * @throws Exception In case of error. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - return IgniteCacheFullApiSelfTestSuite.suite(); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java deleted file mode 100644 index f5745d8..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * 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. - */ - -package org.apache.ignite.testsuites; - -import java.util.HashSet; -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.internal.processors.cache.GridCacheAffinityRoutingSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheEntryMemorySizeSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheMvccSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredEvictionSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheOffHeapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.expiry.IgniteCacheAtomicLocalExpiryPolicyTest; -import org.apache.ignite.internal.processors.cache.binary.GridBinaryCacheEntryMemorySizeSelfTest; -import org.apache.ignite.internal.processors.cache.binary.datastreaming.DataStreamProcessorBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.datastreaming.GridDataStreamerImplSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAffinityRoutingBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultiNodeSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultithreadedSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryMultiNodeSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheAtomicPartitionedOnlyBinaryMultithreadedSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheMemoryModeBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredAtomicBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredEvictionAtomicBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredEvictionBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheOffHeapTieredBinarySelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCachePortablesNearPartitionedByteArrayValuesSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest; -import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSelfTest; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * Cache suite with portable marshaller. - */ -public class IgnitePortableCacheTestSuite extends TestSuite { - /** - * @return Suite. - * @throws Exception In case of error. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - TestSuite suite = new TestSuite("Portable Cache Test Suite"); - - HashSet<Class> ignoredTests = new HashSet<>(); - - // Tests below have a special version for Portable Marshaller - ignoredTests.add(DataStreamProcessorSelfTest.class); - ignoredTests.add(GridCacheOffHeapTieredEvictionAtomicSelfTest.class); - ignoredTests.add(GridCacheOffHeapTieredEvictionSelfTest.class); - ignoredTests.add(GridCacheOffHeapTieredSelfTest.class); - ignoredTests.add(GridCacheOffHeapTieredAtomicSelfTest.class); - ignoredTests.add(GridCacheAffinityRoutingSelfTest.class); - ignoredTests.add(IgniteCacheAtomicLocalExpiryPolicyTest.class); - ignoredTests.add(GridCacheEntryMemorySizeSelfTest.class); - - // Tests that are not ready to be used with PortableMarshaller - ignoredTests.add(GridCacheMvccSelfTest.class); - - suite.addTest(IgniteCacheTestSuite.suite(ignoredTests)); - - suite.addTestSuite(GridCacheMemoryModeBinarySelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredEvictionBinarySelfTest.class); - - suite.addTestSuite(GridCacheBinariesPartitionedOnlyByteArrayValuesSelfTest.class); - suite.addTestSuite(GridCachePortablesNearPartitionedByteArrayValuesSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredBinarySelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredAtomicBinarySelfTest.class); - - suite.addTestSuite(GridDataStreamerImplSelfTest.class); - suite.addTestSuite(DataStreamProcessorBinarySelfTest.class); - suite.addTestSuite(GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultiNodeSelfTest.class); - suite.addTestSuite(GridCacheAtomicPartitionedOnlyBinaryDataStreamerMultithreadedSelfTest.class); - - suite.addTestSuite(GridCacheAtomicPartitionedOnlyBinaryMultiNodeSelfTest.class); - suite.addTestSuite(GridCacheAtomicPartitionedOnlyBinaryMultithreadedSelfTest.class); - - suite.addTestSuite(GridCacheAffinityRoutingBinarySelfTest.class); - suite.addTestSuite(GridBinaryCacheEntryMemorySizeSelfTest.class); - - return suite; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java deleted file mode 100644 index 942a5fa..0000000 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * 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. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.binary.BinaryEnumsSelfTest; -import org.apache.ignite.internal.binary.GridBinaryAffinityKeySelfTest; -import org.apache.ignite.internal.binary.BinaryObjectBuilderAdditionalSelfTest; -import org.apache.ignite.internal.binary.BinaryObjectBuilderSelfTest; -import org.apache.ignite.internal.binary.GridBinaryMarshallerCtxDisabledSelfTest; -import org.apache.ignite.internal.binary.BinaryMarshallerSelfTest; -import org.apache.ignite.internal.binary.GridPortableMetaDataSelfTest; -import org.apache.ignite.internal.binary.GridPortableWildcardsSelfTest; -import org.apache.ignite.internal.binary.BinaryFooterOffsetsHeapSelfTest; -import org.apache.ignite.internal.binary.BinaryFooterOffsetsOffheapSelfTest; -import org.apache.ignite.internal.binary.BinaryFieldsHeapSelfTest; -import org.apache.ignite.internal.binary.BinaryFieldsOffheapSelfTest; -import org.apache.ignite.internal.binary.noncompact.BinaryFieldsHeapNonCompactSelfTest; -import org.apache.ignite.internal.binary.noncompact.BinaryFieldsOffheapNonCompactSelfTest; -import org.apache.ignite.internal.binary.noncompact.BinaryFooterOffsetsHeapNonCompactSelfTest; -import org.apache.ignite.internal.binary.noncompact.BinaryFooterOffsetsOffheapNonCompactSelfTest; -import org.apache.ignite.internal.binary.noncompact.BinaryMarshallerNonCompactSelfTest; -import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderAdditionalNonCompactSelfTest; -import org.apache.ignite.internal.binary.noncompact.BinaryObjectBuilderNonCompactSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.IgniteBinaryMetadataUpdateChangingTopologySelfTest; -import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataMultinodeTest; -import org.apache.ignite.internal.processors.cache.binary.GridCacheClientNodeBinaryObjectMetadataTest; -import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStoreObjectsSelfTest; -import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryStorePortablesSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicNearDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedNearDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryObjectsPartitionedSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.replicated.GridCacheBinaryObjectsReplicatedSelfTest; -import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsAtomicLocalSelfTest; -import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalOffheapTieredSelfTest; -import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalSelfTest; - -/** - * Test for portable objects stored in cache. - */ -public class IgnitePortableObjectsTestSuite extends TestSuite { - /** - * @return Suite. - * @throws Exception If failed. - */ - public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Ignite Binary Objects Test Suite"); - - suite.addTestSuite(BinaryMarshallerSelfTest.class); - suite.addTestSuite(GridBinaryMarshallerCtxDisabledSelfTest.class); - suite.addTestSuite(BinaryObjectBuilderSelfTest.class); - suite.addTestSuite(BinaryObjectBuilderAdditionalSelfTest.class); - suite.addTestSuite(BinaryFieldsHeapSelfTest.class); - suite.addTestSuite(BinaryFieldsOffheapSelfTest.class); - suite.addTestSuite(BinaryFooterOffsetsHeapSelfTest.class); - suite.addTestSuite(BinaryFooterOffsetsOffheapSelfTest.class); - suite.addTestSuite(BinaryEnumsSelfTest.class); - suite.addTestSuite(GridPortableMetaDataSelfTest.class); - suite.addTestSuite(GridBinaryAffinityKeySelfTest.class); - suite.addTestSuite(GridPortableWildcardsSelfTest.class); - - // Tests for objects with non-compact footers. - suite.addTestSuite(BinaryMarshallerNonCompactSelfTest.class); - suite.addTestSuite(BinaryObjectBuilderNonCompactSelfTest.class); - suite.addTestSuite(BinaryObjectBuilderAdditionalNonCompactSelfTest.class); - suite.addTestSuite(BinaryFieldsHeapNonCompactSelfTest.class); - suite.addTestSuite(BinaryFieldsOffheapNonCompactSelfTest.class); - suite.addTestSuite(BinaryFooterOffsetsHeapNonCompactSelfTest.class); - suite.addTestSuite(BinaryFooterOffsetsOffheapNonCompactSelfTest.class); - - suite.addTestSuite(GridCacheBinaryObjectsLocalSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsAtomicLocalSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsReplicatedSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsPartitionedSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsAtomicSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledSelfTest.class); - - suite.addTestSuite(GridCacheBinaryObjectsLocalOffheapTieredSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsAtomicOffheapTieredSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsAtomicNearDisabledOffheapTieredSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsPartitionedOffheapTieredSelfTest.class); - suite.addTestSuite(GridCacheBinaryObjectsPartitionedNearDisabledOffheapTieredSelfTest.class); - - suite.addTestSuite(GridCacheBinaryStoreObjectsSelfTest.class); - suite.addTestSuite(GridCacheBinaryStorePortablesSelfTest.class); - - suite.addTestSuite(GridCacheClientNodeBinaryObjectMetadataTest.class); - suite.addTestSuite(GridCacheClientNodeBinaryObjectMetadataMultinodeTest.class); - suite.addTestSuite(IgniteBinaryMetadataUpdateChangingTopologySelfTest.class); - - return suite; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java new file mode 100644 index 0000000..daf9c45 --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java @@ -0,0 +1,119 @@ +/* + * 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. + */ + +package org.apache.ignite.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest; +import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest; +import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest; +import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexingDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheReduceQueryMultithreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteBinaryObjectFieldsQuerySelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheFieldsQueryNoDataSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheLargeResultSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapTieredMultithreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheP2pUnmarshallingQueryErrorTest; +import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryDuplicateIndexObjectPartitionedAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryDuplicateIndexObjectPartitionedTransactionalSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicNearEnabledSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicP2PDisabledSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryLocalAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedOnlySelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedAtomicSelfTest; +import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest; +import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest; +import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryTest; +import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest; +import org.apache.ignite.testframework.config.GridTestProperties; + +/** + * Cache query suite with portable marshaller. + */ +public class IgniteBinaryCacheQueryTestSuite extends TestSuite { + /** + * @return Suite. + * @throws Exception In case of error. + */ + public static TestSuite suite() throws Exception { + GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); + + TestSuite suite = new TestSuite("Grid Cache Query Test Suite using PortableMarshaller"); + + // Parsing + suite.addTestSuite(GridQueryParsingTest.class); + + // Queries tests. + suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class); + suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class); + suite.addTestSuite(IgniteCacheLargeResultSelfTest.class); + suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); + suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); + suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); + + suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class); + suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); + + + // Fields queries. + suite.addTestSuite(IgniteCacheFieldsQueryNoDataSelfTest.class); + suite.addTestSuite(IgniteBinaryObjectFieldsQuerySelfTest.class); + + // Continuous queries. + suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class); + suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class); + + suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class); + + //Should be adjusted. Not ready to be used with PortableMarshaller. + //suite.addTestSuite(GridCachePortableSwapScanQuerySelfTest.class); + + suite.addTestSuite(GridOrderedMessageCancelSelfTest.class); + + // Ignite cache and H2 comparison. + suite.addTestSuite(BaseH2CompareQueryTest.class); + suite.addTestSuite(H2CompareBigQueryTest.class); + + // Metrics tests + suite.addTestSuite(CacheLocalQueryMetricsSelfTest.class); + suite.addTestSuite(CachePartitionedQueryMetricsDistributedSelfTest.class); + suite.addTestSuite(CachePartitionedQueryMetricsLocalSelfTest.class); + suite.addTestSuite(CacheReplicatedQueryMetricsDistributedSelfTest.class); + suite.addTestSuite(CacheReplicatedQueryMetricsLocalSelfTest.class); + + //Unmarshallig query test. + suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class); + + suite.addTestSuite(GridCacheBinaryDuplicateIndexObjectPartitionedAtomicSelfTest.class); + suite.addTestSuite(GridCacheBinaryDuplicateIndexObjectPartitionedTransactionalSelfTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/469bf6d6/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java deleted file mode 100644 index 2df9026..0000000 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheQueryTestSuite.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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. - */ - -package org.apache.ignite.testsuites; - -import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.cache.CacheLocalQueryMetricsSelfTest; -import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsDistributedSelfTest; -import org.apache.ignite.internal.processors.cache.CachePartitionedQueryMetricsLocalSelfTest; -import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsDistributedSelfTest; -import org.apache.ignite.internal.processors.cache.CacheReplicatedQueryMetricsLocalSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheQueryIndexingDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.GridCacheReduceQueryMultithreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteBinaryObjectFieldsQuerySelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheFieldsQueryNoDataSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheLargeResultSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapTieredMultithreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheP2pUnmarshallingQueryErrorTest; -import org.apache.ignite.internal.processors.cache.IgniteCachePartitionedQueryMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheQueryOffheapMultiThreadedSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryDuplicateIndexObjectPartitionedAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.binary.distributed.dht.GridCacheBinaryDuplicateIndexObjectPartitionedTransactionalSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicNearEnabledSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicP2PDisabledSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryLocalAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryPartitionedOnlySelfTest; -import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryReplicatedAtomicSelfTest; -import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest; -import org.apache.ignite.internal.processors.query.h2.sql.GridQueryParsingTest; -import org.apache.ignite.internal.processors.query.h2.sql.H2CompareBigQueryTest; -import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest; -import org.apache.ignite.testframework.config.GridTestProperties; - -/** - * Cache query suite with portable marshaller. - */ -public class IgnitePortableCacheQueryTestSuite extends TestSuite { - /** - * @return Suite. - * @throws Exception In case of error. - */ - public static TestSuite suite() throws Exception { - GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); - - TestSuite suite = new TestSuite("Grid Cache Query Test Suite using PortableMarshaller"); - - // Parsing - suite.addTestSuite(GridQueryParsingTest.class); - - // Queries tests. - suite.addTestSuite(GridCacheQueryIndexDisabledSelfTest.class); - suite.addTestSuite(IgniteCachePartitionedQueryMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheLargeResultSelfTest.class); - suite.addTestSuite(IgniteCacheQueryMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryEvictsMultiThreadedSelfTest.class); - suite.addTestSuite(IgniteCacheQueryOffheapMultiThreadedSelfTest.class); - - suite.addTestSuite(IgniteCacheOffheapTieredMultithreadedSelfTest.class); - suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); - - - // Fields queries. - suite.addTestSuite(IgniteCacheFieldsQueryNoDataSelfTest.class); - suite.addTestSuite(IgniteBinaryObjectFieldsQuerySelfTest.class); - - // Continuous queries. - suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryPartitionedOnlySelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicNearEnabledSelfTest.class); - suite.addTestSuite(GridCacheContinuousQueryAtomicP2PDisabledSelfTest.class); - - suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class); - - //Should be adjusted. Not ready to be used with PortableMarshaller. - //suite.addTestSuite(GridCachePortableSwapScanQuerySelfTest.class); - - suite.addTestSuite(GridOrderedMessageCancelSelfTest.class); - - // Ignite cache and H2 comparison. - suite.addTestSuite(BaseH2CompareQueryTest.class); - suite.addTestSuite(H2CompareBigQueryTest.class); - - // Metrics tests - suite.addTestSuite(CacheLocalQueryMetricsSelfTest.class); - suite.addTestSuite(CachePartitionedQueryMetricsDistributedSelfTest.class); - suite.addTestSuite(CachePartitionedQueryMetricsLocalSelfTest.class); - suite.addTestSuite(CacheReplicatedQueryMetricsDistributedSelfTest.class); - suite.addTestSuite(CacheReplicatedQueryMetricsLocalSelfTest.class); - - //Unmarshallig query test. - suite.addTestSuite(IgniteCacheP2pUnmarshallingQueryErrorTest.class); - - suite.addTestSuite(GridCacheBinaryDuplicateIndexObjectPartitionedAtomicSelfTest.class); - suite.addTestSuite(GridCacheBinaryDuplicateIndexObjectPartitionedTransactionalSelfTest.class); - - return suite; - } -}
