ignite-1258: removed duplicated test suites
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7cbb887d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7cbb887d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7cbb887d Branch: refs/heads/ignite-1258 Commit: 7cbb887d5f2061ccc6a54d7ba3ea53f541794f52 Parents: 0b21358 Author: Denis Magda <dma...@gridgain.com> Authored: Wed Aug 19 12:28:10 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Aug 19 12:28:10 2015 +0300 ---------------------------------------------------------------------- ...ridPortableCacheEntryMemorySizeSelfTest.java | 47 +++++++++++ ...ridCacheAffinityRoutingPortableSelfTest.java | 48 +++++++++++ ...arEnabledPortableEnabledFullApiSelfTest.java | 37 -------- ...PortableEnabledFullApiMultiNodeSelfTest.java | 36 -------- ...cheAtomicPortableEnabledFullApiSelfTest.java | 36 -------- ...omicPortableMultiThreadedUpdateSelfTest.java | 37 -------- ...arEnabledPortableEnabledFullApiSelfTest.java | 33 -------- ...PortableEnabledFullApiMultiNodeSelfTest.java | 33 -------- ...redAtomicPortableEnabledFullApiSelfTest.java | 33 -------- ...rDisabledPortableEnabledFullApiSelfTest.java | 32 ------- ...PortableEnabledFullApiMultiNodeSelfTest.java | 33 -------- ...rtitionedPortableEnabledFullApiSelfTest.java | 33 -------- ...rDisabledPortableEnabledFullApiSelfTest.java | 37 -------- ...PortableEnabledFullApiMultiNodeSelfTest.java | 37 -------- ...rtitionedPortableEnabledFullApiSelfTest.java | 36 -------- ...eplicatedPortableEnabledFullApiSelfTest.java | 33 -------- ...eplicatedPortableEnabledFullApiSelfTest.java | 36 -------- ...omicLocalPortableEnabledFullApiSelfTest.java | 42 --------- ...acheLocalPortableEnabledFullApiSelfTest.java | 35 -------- ...omicLocalPortableEnabledFullApiSelfTest.java | 33 -------- ...eredLocalPortableEnabledFullApiSelfTest.java | 33 -------- .../IgnitePortableCacheFullApiTestSuite.java | 38 +++++++++ .../IgnitePortableCacheTestSuite.java | 89 ++++++++++++++++++++ .../IgnitePortableObjectsTestSuite.java | 45 ---------- 24 files changed, 222 insertions(+), 710 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java new file mode 100644 index 0000000..be30835 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) GridGain Systems. All Rights Reserved. + * _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.internal.processors.cache.portable; + +import org.apache.ignite.*; +import org.apache.ignite.internal.portable.*; +import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.util.*; +import org.apache.ignite.marshaller.*; +import org.apache.ignite.marshaller.portable.*; +import org.apache.ignite.plugin.*; +import org.apache.ignite.portable.*; + +import java.util.*; + +/** + * + */ +public class GridPortableCacheEntryMemorySizeSelfTest extends GridCacheEntryMemorySizeSelfTest { + /** {@inheritDoc} */ + @Override protected Marshaller createMarshaller() throws IgniteCheckedException { + PortableMarshaller marsh = new PortableMarshaller(); + + marsh.setContext(new MarshallerContextTestImpl(null)); + + GridPortableContext pCtx = new GridPortableContext(new GridPortableMetaDataHandler() { + @Override public void addMeta(int typeId, GridPortableMetaDataImpl meta) throws PortableException { + // No-op + } + + @Override public PortableMetadata metadata(int typeId) throws PortableException { + return null; + } + }, null); + + IgniteUtils.invoke(PortableMarshaller.class, marsh, "setPortableContext", pCtx); + + return marsh; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java new file mode 100644 index 0000000..c7c0900 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAffinityRoutingPortableSelfTest.java @@ -0,0 +1,48 @@ +/* + * 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.portable.distributed.dht; + +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.marshaller.portable.*; +import org.apache.ignite.portable.*; + +import java.util.*; + +/** + * + */ +public class GridCacheAffinityRoutingPortableSelfTest extends GridCacheAffinityRoutingSelfTest { + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(); + + typeCfg.setClassName(AffinityTestKey.class.getName()); + typeCfg.setAffinityKeyFieldName("affKey"); + + PortableMarshaller marsh = new PortableMarshaller(); + + marsh.setTypeConfigurations(Collections.singleton(typeCfg)); + + cfg.setMarshaller(marsh); + + return cfg; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicNearEnabledPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicNearEnabledPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicNearEnabledPortableEnabledFullApiSelfTest.java deleted file mode 100644 index e4fa5fa..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicNearEnabledPortableEnabledFullApiSelfTest.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.internal.processors.cache.portable.distributed.dht; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * Atomic cache with portables. - */ -public class GridCacheAtomicNearEnabledPortableEnabledFullApiSelfTest - extends GridCacheAtomicNearEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPortableEnabledFullApiMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPortableEnabledFullApiMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPortableEnabledFullApiMultiNodeSelfTest.java deleted file mode 100644 index e0c8355..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPortableEnabledFullApiMultiNodeSelfTest.java +++ /dev/null @@ -1,36 +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.portable.distributed.dht; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.distributed.near.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * Atomic cache with portables multi-node test. - */ -public class GridCacheAtomicPortableEnabledFullApiMultiNodeSelfTest extends GridCacheAtomicMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPortableEnabledFullApiSelfTest.java deleted file mode 100644 index b3de8c7..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheAtomicPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,36 +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.portable.distributed.dht; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * Atomic cache with portables. - */ -public class GridCacheAtomicPortableEnabledFullApiSelfTest extends GridCacheAtomicFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapAtomicPortableMultiThreadedUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapAtomicPortableMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapAtomicPortableMultiThreadedUpdateSelfTest.java deleted file mode 100644 index 0f30619..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapAtomicPortableMultiThreadedUpdateSelfTest.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.internal.processors.cache.portable.distributed.dht; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * - */ -public class GridCacheOffHeapAtomicPortableMultiThreadedUpdateSelfTest - extends GridCacheOffHeapAtomicMultiThreadedUpdateSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicNearEnabledPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicNearEnabledPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicNearEnabledPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 24f29ce..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicNearEnabledPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,33 +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.portable.distributed.dht; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * Atomic cache with portables. - */ -public class GridCacheOffHeapTieredAtomicNearEnabledPortableEnabledFullApiSelfTest extends - GridCacheAtomicNearEnabledPortableEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableEnabledFullApiMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableEnabledFullApiMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableEnabledFullApiMultiNodeSelfTest.java deleted file mode 100644 index 16e2685..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableEnabledFullApiMultiNodeSelfTest.java +++ /dev/null @@ -1,33 +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.portable.distributed.dht; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * Atomic cache with portables multi-node test in off-heap tiered mode. - */ -public class GridCacheOffHeapTieredAtomicPortableEnabledFullApiMultiNodeSelfTest extends - GridCacheAtomicPortableEnabledFullApiMultiNodeSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 066e005..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredAtomicPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,33 +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.portable.distributed.dht; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * Atomic cache with portables. - */ -public class GridCacheOffHeapTieredAtomicPortableEnabledFullApiSelfTest extends - GridCacheAtomicPortableEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedNearDisabledPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedNearDisabledPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedNearDisabledPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 287abb4..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedNearDisabledPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,32 +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.portable.distributed.dht; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * Transactional cache with portables. - */ -public class GridCacheOffHeapTieredPartitionedNearDisabledPortableEnabledFullApiSelfTest extends - GridCachePartitionedNearDisabledPortableEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedPortableEnabledFullApiMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedPortableEnabledFullApiMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedPortableEnabledFullApiMultiNodeSelfTest.java deleted file mode 100644 index 4aa9ff7..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedPortableEnabledFullApiMultiNodeSelfTest.java +++ /dev/null @@ -1,33 +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.portable.distributed.dht; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * - */ -public class GridCacheOffHeapTieredPartitionedPortableEnabledFullApiMultiNodeSelfTest extends - GridCachePartitionedPortableEnabledFullApiMultiNodeSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedPortableEnabledFullApiSelfTest.java deleted file mode 100644 index e828422..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCacheOffHeapTieredPartitionedPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,33 +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.portable.distributed.dht; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * Transactional cache with portables. - */ -public class GridCacheOffHeapTieredPartitionedPortableEnabledFullApiSelfTest extends - GridCachePartitionedPortableEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedNearDisabledPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedNearDisabledPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedNearDisabledPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 59d74fb..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedNearDisabledPortableEnabledFullApiSelfTest.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.internal.processors.cache.portable.distributed.dht; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * Transactional cache with portables. - */ -public class GridCachePartitionedNearDisabledPortableEnabledFullApiSelfTest - extends GridCachePartitionedNearDisabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedPortableEnabledFullApiMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedPortableEnabledFullApiMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedPortableEnabledFullApiMultiNodeSelfTest.java deleted file mode 100644 index 49fbe81..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedPortableEnabledFullApiMultiNodeSelfTest.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.internal.processors.cache.portable.distributed.dht; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.distributed.near.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * - */ -public class GridCachePartitionedPortableEnabledFullApiMultiNodeSelfTest - extends GridCachePartitionedMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 1c4c4ce..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/dht/GridCachePartitionedPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,36 +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.portable.distributed.dht; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.distributed.near.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * Transactional cache with portables. - */ -public class GridCachePartitionedPortableEnabledFullApiSelfTest extends GridCachePartitionedFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheOffHeapTieredReplicatedPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheOffHeapTieredReplicatedPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheOffHeapTieredReplicatedPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 6285319..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheOffHeapTieredReplicatedPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,33 +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.portable.distributed.replicated; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * Atomic cache with portables. - */ -public class GridCacheOffHeapTieredReplicatedPortableEnabledFullApiSelfTest extends - GridCacheReplicatedPortableEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheReplicatedPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheReplicatedPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheReplicatedPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 95bdad7..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/distributed/replicated/GridCacheReplicatedPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,36 +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.portable.distributed.replicated; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.distributed.replicated.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * Atomic cache with portables. - */ -public class GridCacheReplicatedPortableEnabledFullApiSelfTest extends GridCacheReplicatedFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheAtomicLocalPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheAtomicLocalPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheAtomicLocalPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 15033f2..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheAtomicLocalPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,42 +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.portable.local; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheAtomicityMode.*; - -/** - * - */ -public class GridCacheAtomicLocalPortableEnabledFullApiSelfTest extends GridCacheLocalPortableEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheAtomicityMode atomicityMode() { - return ATOMIC; - } - - /** {@inheritDoc} */ - @Override protected boolean txEnabled() { - return false; - } - - /** {@inheritDoc} */ - @Override protected boolean lockingEnabled() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheLocalPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheLocalPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheLocalPortableEnabledFullApiSelfTest.java deleted file mode 100644 index d438c0f..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheLocalPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,35 +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.portable.local; - -import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.local.*; -import org.apache.ignite.marshaller.portable.*; - -/** - * Local transactional cache with portables. - */ -public class GridCacheLocalPortableEnabledFullApiSelfTest extends GridCacheLocalFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - cfg.setMarshaller(new PortableMarshaller()); - - return cfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheOffHeapTieredAtomicLocalPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheOffHeapTieredAtomicLocalPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheOffHeapTieredAtomicLocalPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 1901d6d..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheOffHeapTieredAtomicLocalPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,33 +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.portable.local; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * - */ -public class GridCacheOffHeapTieredAtomicLocalPortableEnabledFullApiSelfTest extends - GridCacheAtomicLocalPortableEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheOffHeapTieredLocalPortableEnabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheOffHeapTieredLocalPortableEnabledFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheOffHeapTieredLocalPortableEnabledFullApiSelfTest.java deleted file mode 100644 index 453f936..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/local/GridCacheOffHeapTieredLocalPortableEnabledFullApiSelfTest.java +++ /dev/null @@ -1,33 +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.portable.local; - -import org.apache.ignite.cache.*; - -import static org.apache.ignite.cache.CacheMemoryMode.*; - -/** - * Local transactional cache with portables. - */ -public class GridCacheOffHeapTieredLocalPortableEnabledFullApiSelfTest extends - GridCacheLocalPortableEnabledFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheMemoryMode memoryMode() { - return OFFHEAP_TIERED; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/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 new file mode 100644 index 0000000..81c45a7 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheFullApiTestSuite.java @@ -0,0 +1,38 @@ +/* + * 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 org.apache.ignite.marshaller.portable.*; +import org.apache.ignite.testframework.config.*; + +import junit.framework.*; + +/** + * 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, PortableMarshaller.class.getName()); + + return IgniteCacheFullApiSelfTestSuite.suite(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/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 new file mode 100644 index 0000000..fe6bf39 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableCacheTestSuite.java @@ -0,0 +1,89 @@ +/* + * 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 org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.expiry.*; +import org.apache.ignite.internal.processors.cache.portable.*; +import org.apache.ignite.internal.processors.cache.portable.datastreaming.*; +import org.apache.ignite.internal.processors.cache.portable.distributed.dht.*; +import org.apache.ignite.internal.processors.datastreamer.*; +import org.apache.ignite.marshaller.portable.*; +import org.apache.ignite.testframework.config.*; + +import junit.framework.*; + +import java.util.*; + +/** + * 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, PortableMarshaller.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.addTest(IgniteCacheExpiryPolicyTestSuite.suite()); + + suite.addTestSuite(GridCacheMemoryModePortableSelfTest.class); + suite.addTestSuite(GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.class); + suite.addTestSuite(GridCacheOffHeapTieredEvictionPortableSelfTest.class); + + suite.addTestSuite(GridCachePortablesPartitionedOnlyByteArrayValuesSelfTest.class); + suite.addTestSuite(GridCachePortablesNearPartitionedByteArrayValuesSelfTest.class); + suite.addTestSuite(GridCacheOffHeapTieredPortableSelfTest.class); + suite.addTestSuite(GridCacheOffHeapTieredAtomicPortableSelfTest.class); + + suite.addTestSuite(GridDataStreamerImplSelfTest.class); + suite.addTestSuite(DataStreamProcessorPortableSelfTest.class); + suite.addTestSuite(GridCacheAtomicPartitionedOnlyPortableDataStreamerMultiNodeSelfTest.class); + suite.addTestSuite(GridCacheAtomicPartitionedOnlyPortableDataStreamerMultithreadedSelfTest.class); + + suite.addTestSuite(GridCacheAtomicPartitionedOnlyPortableMultiNodeSelfTest.class); + suite.addTestSuite(GridCacheAtomicPartitionedOnlyPortableMultithreadedSelfTest.class); + + suite.addTestSuite(GridCachePortableDuplicateIndexObjectPartitionedAtomicSelfTest.class); + suite.addTestSuite(GridCachePortableDuplicateIndexObjectPartitionedTransactionalSelfTest.class); + + suite.addTestSuite(GridCacheAffinityRoutingPortableSelfTest.class); + suite.addTestSuite(GridPortableCacheEntryMemorySizeSelfTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cbb887d/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 index 0668ca3..ece949d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePortableObjectsTestSuite.java @@ -62,51 +62,6 @@ public class IgnitePortableObjectsTestSuite extends TestSuite { suite.addTestSuite(GridCachePortableObjectsPartitionedOffheapTieredSelfTest.class); suite.addTestSuite(GridCachePortableObjectsPartitionedNearDisabledOffheapTieredSelfTest.class); - /** Full API on-heap tests. */ - suite.addTestSuite(GridCacheLocalPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicLocalPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheReplicatedPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicNearEnabledPortableEnabledFullApiSelfTest.class); - - /** Full API off-heap tiered mode tests. */ - suite.addTestSuite(GridCacheOffHeapTieredLocalPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredAtomicLocalPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredReplicatedPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredPartitionedPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredPartitionedNearDisabledPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredAtomicPortableEnabledFullApiSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredAtomicNearEnabledPortableEnabledFullApiSelfTest.class); - - suite.addTestSuite(GridCachePartitionedPortableEnabledFullApiMultiNodeSelfTest.class); - suite.addTestSuite(GridCacheAtomicPortableEnabledFullApiMultiNodeSelfTest.class); - - suite.addTestSuite(GridCacheOffHeapTieredPartitionedPortableEnabledFullApiMultiNodeSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredAtomicPortableEnabledFullApiMultiNodeSelfTest.class); - - suite.addTestSuite(GridCacheAtomicPartitionedOnlyPortableMultiNodeSelfTest.class); - suite.addTestSuite(GridCacheAtomicPartitionedOnlyPortableMultithreadedSelfTest.class); - - suite.addTestSuite(GridCacheAtomicPartitionedOnlyPortableDataStreamerMultiNodeSelfTest.class); - suite.addTestSuite(GridCacheAtomicPartitionedOnlyPortableDataStreamerMultithreadedSelfTest.class); - - suite.addTestSuite(GridCachePortableDuplicateIndexObjectPartitionedAtomicSelfTest.class); - suite.addTestSuite(GridCachePortableDuplicateIndexObjectPartitionedTransactionalSelfTest.class); - - suite.addTestSuite(GridCacheMemoryModePortableSelfTest.class); - suite.addTestSuite(GridCacheOffHeapAtomicPortableMultiThreadedUpdateSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredEvictionAtomicPortableSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredEvictionPortableSelfTest.class); - suite.addTestSuite(GridCachePortablesPartitionedOnlyByteArrayValuesSelfTest.class); - suite.addTestSuite(GridCachePortablesNearPartitionedByteArrayValuesSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredPortableSelfTest.class); - suite.addTestSuite(GridCacheOffHeapTieredAtomicPortableSelfTest.class); - - suite.addTestSuite(GridDataStreamerImplSelfTest.class); - suite.addTestSuite(DataStreamProcessorPortableSelfTest.class); - suite.addTestSuite(GridCachePortableStoreObjectsSelfTest.class); suite.addTestSuite(GridCachePortableStorePortablesSelfTest.class);
