Repository: ignite Updated Branches: refs/heads/ignite-1816 93f12f766 -> f7aa70eee
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsAbstractSelfTest.java deleted file mode 100644 index 10633ae..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsAbstractSelfTest.java +++ /dev/null @@ -1,190 +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.portable; - -import org.apache.ignite.binary.BinaryField; -import org.apache.ignite.binary.BinaryTypeConfiguration; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.util.IgniteUtils; -import org.apache.ignite.marshaller.MarshallerContextTestImpl; -import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; - -import java.util.Arrays; - -/** - * Contains tests for compact offsets. - */ -public abstract class PortableCompactOffsetsAbstractSelfTest extends GridCommonAbstractTest { - /** 2 pow 8. */ - private static int POW_8 = 1 << 8; - - /** 2 pow 16. */ - private static int POW_16 = 1 << 16; - - /** Marshaller. */ - protected PortableMarshaller marsh; - - /** Portable context. */ - protected PortableContext ctx; - - /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { - super.beforeTest(); - - ctx = new PortableContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration()); - - marsh = new PortableMarshaller(); - - marsh.setTypeConfigurations(Arrays.asList(new BinaryTypeConfiguration(TestObject.class.getName()))); - marsh.setContext(new MarshallerContextTestImpl(null)); - - IgniteUtils.invoke(PortableMarshaller.class, marsh, "setPortableContext", ctx); - } - - /** - * Test 1 byte. - * - * @throws Exception If failed. - */ - public void test1Byte() throws Exception { - check(POW_8 >> 2); - } - - /** - * Test 1 byte with sign altering. - * - * @throws Exception If failed. - */ - public void test1ByteSign() throws Exception { - check(POW_8 >> 1); - } - - /** - * Test 2 bytes. - * - * @throws Exception If failed. - */ - public void test2Bytes() throws Exception { - check(POW_16 >> 2); - } - - /** - * Test 2 bytes with sign altering. - * - * @throws Exception If failed. - */ - public void test2BytesSign() throws Exception { - check(POW_16 >> 1); - } - - /** - * Test 4 bytes. - * - * @throws Exception If failed. - */ - public void test4Bytes() throws Exception { - check(POW_16 << 2); - } - - /** - * Main check routine. - * - * @param len Length of the first field. - * - * @throws Exception If failed. - */ - private void check(int len) throws Exception { - TestObject obj = new TestObject(len); - - BinaryObjectEx portObj = toPortable(marsh, obj); - - // 1. Test portable object content. - assert portObj.hasField("field1"); - assert portObj.hasField("field2"); - - byte[] field1 = portObj.field("field1"); - Integer field2 = portObj.field("field2"); - - assert field1 != null; - assert field2 != null; - - assert Arrays.equals(obj.field1, field1); - assert obj.field2 == field2; - - // 2. Test fields API. - BinaryField field1Desc = portObj.type().field("field1"); - BinaryField field2Desc = portObj.type().field("field2"); - - assert field1Desc.exists(portObj); - assert field2Desc.exists(portObj); - - assert Arrays.equals(obj.field1, (byte[])field1Desc.value(portObj)); - assert obj.field2 == (Integer)field2Desc.value(portObj); - - // 3. Test deserialize. - TestObject objRestored = portObj.deserialize(); - - assert objRestored != null; - - assert Arrays.equals(obj.field1, objRestored.field1); - assert obj.field2 == objRestored.field2; - } - - /** - * Convert object to portable object. - * - * @param marsh Marshaller. - * @param obj Object. - * @return Portable object. - * @throws Exception If failed. - */ - protected abstract BinaryObjectEx toPortable(PortableMarshaller marsh, Object obj) throws Exception; - - /** - * Test object. - */ - public static class TestObject { - /** First field with variable length. */ - public byte[] field1; - - /** Second field. */ - public int field2; - - /** - * Default constructor. - */ - public TestObject() { - // No-op. - } - - /** - * Constructor. - * - * @param len Array length. - */ - public TestObject(int len) { - field1 = new byte[len]; - - field1[0] = 1; - field1[len - 1] = 2; - - field2 = len; - } - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsHeapSelfTest.java deleted file mode 100644 index ebdef38..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsHeapSelfTest.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.portable; - -import org.apache.ignite.marshaller.portable.PortableMarshaller; - -/** - * Compact offsets tests for heap portable objects. - */ -public class PortableCompactOffsetsHeapSelfTest extends PortableCompactOffsetsAbstractSelfTest { - /** {@inheritDoc} */ - @Override protected BinaryObjectEx toPortable(PortableMarshaller marsh, Object obj) throws Exception { - byte[] bytes = marsh.marshal(obj); - - return new BinaryObjectImpl(ctx, bytes, 0); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsOffheapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsOffheapSelfTest.java deleted file mode 100644 index e3b6bda..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/PortableCompactOffsetsOffheapSelfTest.java +++ /dev/null @@ -1,61 +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.portable; - -import org.apache.ignite.internal.util.GridUnsafe; -import org.apache.ignite.marshaller.portable.PortableMarshaller; -import org.eclipse.jetty.util.ConcurrentHashSet; -import sun.misc.Unsafe; - -/** - * Compact offsets tests for offheap portable objects. - */ -public class PortableCompactOffsetsOffheapSelfTest extends PortableCompactOffsetsAbstractSelfTest { - /** Unsafe instance. */ - private static final Unsafe UNSAFE = GridUnsafe.unsafe(); - - /** Byte array offset for unsafe mechanics. */ - protected static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class); - - /** Allocated unsafe pointer. */ - private final ConcurrentHashSet<Long> ptrs = new ConcurrentHashSet<>(); - - /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { - super.afterTest(); - - // Cleanup allocated objects. - for (Long ptr : ptrs) - UNSAFE.freeMemory(ptr); - - ptrs.clear(); - } - - /** {@inheritDoc} */ - @Override protected BinaryObjectEx toPortable(PortableMarshaller marsh, Object obj) throws Exception { - byte[] arr = marsh.marshal(obj); - - long ptr = UNSAFE.allocateMemory(arr.length); - - ptrs.add(ptr); - - UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr, arr.length); - - return new BinaryObjectOffheapImpl(ctx, ptr, 0, arr.length); - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFieldsHeapNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFieldsHeapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFieldsHeapNonCompactSelfTest.java new file mode 100644 index 0000000..9e7619f --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFieldsHeapNonCompactSelfTest.java @@ -0,0 +1,34 @@ +/* + * 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.portable.noncompact; + +import org.apache.ignite.internal.portable.BinaryFieldsAbstractSelfTest; +import org.apache.ignite.internal.portable.BinaryFieldsHeapSelfTest; +import org.apache.ignite.internal.portable.BinaryObjectEx; +import org.apache.ignite.internal.portable.BinaryObjectImpl; +import org.apache.ignite.marshaller.portable.PortableMarshaller; + +/** + * Field tests for heap-based portables with non-compact footer. + */ +public class BinaryFieldsHeapNonCompactSelfTest extends BinaryFieldsHeapSelfTest { + /** {@inheritDoc} */ + @Override protected boolean compactFooter() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java new file mode 100644 index 0000000..0bca601 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.portable.noncompact; + +import org.apache.ignite.internal.portable.BinaryFieldsOffheapSelfTest; + +/** + * Field tests for offheap-based portables with non-compact footer. + */ +public class BinaryFieldsOffheapNonCompactSelfTest extends BinaryFieldsOffheapSelfTest { + /** {@inheritDoc} */ + @Override protected boolean compactFooter() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java new file mode 100644 index 0000000..8fba738 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.portable.noncompact; + +import org.apache.ignite.internal.portable.BinaryFooterOffsetsHeapSelfTest; + +/** + * Compact offsets tests for heap portable objects with non-compact footer. + */ +public class BinaryFooterOffsetsHeapNonCompactSelfTest extends BinaryFooterOffsetsHeapSelfTest { + /** {@inheritDoc} */ + @Override protected boolean compactFooter() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java new file mode 100644 index 0000000..b52bd83 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.portable.noncompact; + +import org.apache.ignite.internal.portable.BinaryFooterOffsetsOffheapSelfTest; + +/** + * Compact offsets tests for offheap portable objects with non-compact footer. + */ +public class BinaryFooterOffsetsOffheapNonCompactSelfTest extends BinaryFooterOffsetsOffheapSelfTest { + /** {@inheritDoc} */ + @Override protected boolean compactFooter() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryMarshallerNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryMarshallerNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryMarshallerNonCompactSelfTest.java new file mode 100644 index 0000000..0484dea --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryMarshallerNonCompactSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.portable.noncompact; + +import org.apache.ignite.internal.portable.BinaryMarshallerSelfTest; + +/** + * Basic marshaller test with non-compact footer. + */ +public class BinaryMarshallerNonCompactSelfTest extends BinaryMarshallerSelfTest { + /** {@inheritDoc} */ + @Override protected boolean compactFooter() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryObjectBuilderAdditionalNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryObjectBuilderAdditionalNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryObjectBuilderAdditionalNonCompactSelfTest.java new file mode 100644 index 0000000..8811029 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryObjectBuilderAdditionalNonCompactSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.portable.noncompact; + +import org.apache.ignite.internal.portable.BinaryObjectBuilderAdditionalSelfTest; + +/** + * + */ +public class BinaryObjectBuilderAdditionalNonCompactSelfTest extends BinaryObjectBuilderAdditionalSelfTest { + /** {@inheritDoc} */ + @Override protected boolean compactFooter() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryObjectBuilderNonCompactSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryObjectBuilderNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryObjectBuilderNonCompactSelfTest.java new file mode 100644 index 0000000..0b0916d --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/noncompact/BinaryObjectBuilderNonCompactSelfTest.java @@ -0,0 +1,30 @@ +/* + * 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.portable.noncompact; + +import org.apache.ignite.internal.portable.BinaryObjectBuilderSelfTest; + +/** + * Portable builder test for objects with non-compact footer. + */ +public class BinaryObjectBuilderNonCompactSelfTest extends BinaryObjectBuilderSelfTest { + /** {@inheritDoc} */ + @Override protected boolean compactFooter() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f7aa70ee/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 4fe8633..1128d67 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 @@ -19,16 +19,23 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.portable.GridPortableAffinityKeySelfTest; -import org.apache.ignite.internal.portable.GridBinaryObjectBuilderAdditionalSelfTest; -import org.apache.ignite.internal.portable.GridBinaryObjectBuilderSelfTest; +import org.apache.ignite.internal.portable.BinaryObjectBuilderAdditionalSelfTest; +import org.apache.ignite.internal.portable.BinaryObjectBuilderSelfTest; import org.apache.ignite.internal.portable.GridPortableMarshallerCtxDisabledSelfTest; -import org.apache.ignite.internal.portable.GridPortableMarshallerSelfTest; +import org.apache.ignite.internal.portable.BinaryMarshallerSelfTest; import org.apache.ignite.internal.portable.GridPortableMetaDataSelfTest; import org.apache.ignite.internal.portable.GridPortableWildcardsSelfTest; -import org.apache.ignite.internal.portable.PortableCompactOffsetsHeapSelfTest; -import org.apache.ignite.internal.portable.PortableCompactOffsetsOffheapSelfTest; +import org.apache.ignite.internal.portable.BinaryFooterOffsetsHeapSelfTest; +import org.apache.ignite.internal.portable.BinaryFooterOffsetsOffheapSelfTest; import org.apache.ignite.internal.portable.BinaryFieldsHeapSelfTest; import org.apache.ignite.internal.portable.BinaryFieldsOffheapSelfTest; +import org.apache.ignite.internal.portable.noncompact.BinaryFieldsHeapNonCompactSelfTest; +import org.apache.ignite.internal.portable.noncompact.BinaryFieldsOffheapNonCompactSelfTest; +import org.apache.ignite.internal.portable.noncompact.BinaryFooterOffsetsHeapNonCompactSelfTest; +import org.apache.ignite.internal.portable.noncompact.BinaryFooterOffsetsOffheapNonCompactSelfTest; +import org.apache.ignite.internal.portable.noncompact.BinaryMarshallerNonCompactSelfTest; +import org.apache.ignite.internal.portable.noncompact.BinaryObjectBuilderAdditionalNonCompactSelfTest; +import org.apache.ignite.internal.portable.noncompact.BinaryObjectBuilderNonCompactSelfTest; import org.apache.ignite.internal.processors.cache.portable.GridCacheClientNodeBinaryObjectMetadataMultinodeTest; import org.apache.ignite.internal.processors.cache.portable.GridCacheClientNodeBinaryObjectMetadataTest; import org.apache.ignite.internal.processors.cache.portable.GridCachePortableStoreObjectsSelfTest; @@ -57,18 +64,27 @@ public class IgnitePortableObjectsTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("GridGain Portable Objects Test Suite"); - suite.addTestSuite(GridPortableMarshallerSelfTest.class); + suite.addTestSuite(BinaryMarshallerSelfTest.class); suite.addTestSuite(GridPortableMarshallerCtxDisabledSelfTest.class); - suite.addTestSuite(GridBinaryObjectBuilderSelfTest.class); - suite.addTestSuite(GridBinaryObjectBuilderAdditionalSelfTest.class); + suite.addTestSuite(BinaryObjectBuilderSelfTest.class); + suite.addTestSuite(BinaryObjectBuilderAdditionalSelfTest.class); suite.addTestSuite(BinaryFieldsHeapSelfTest.class); suite.addTestSuite(BinaryFieldsOffheapSelfTest.class); - suite.addTestSuite(PortableCompactOffsetsHeapSelfTest.class); - suite.addTestSuite(PortableCompactOffsetsOffheapSelfTest.class); + suite.addTestSuite(BinaryFooterOffsetsHeapSelfTest.class); + suite.addTestSuite(BinaryFooterOffsetsOffheapSelfTest.class); suite.addTestSuite(GridPortableMetaDataSelfTest.class); suite.addTestSuite(GridPortableAffinityKeySelfTest.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);
