btf: Move plugins to the Trace Compass namespace

[deliverable/tracecompass.git] / org.eclipse.linuxtools.ctf.core.tests / src / org / eclipse / linuxtools / ctf / core / tests / types / VariantDefinitionTest.java

diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java
index 934c1ae50be22962741bd4e806a79160097538c8..8c690bad89c290111c61dc4b25192dd9f8fd7baa 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java
+++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java
@@ -21,23 +21,25 @@ import java.nio.ByteOrder;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.linuxtools.ctf.core.event.io.BitBuffer;
 import org.eclipse.linuxtools.ctf.core.event.scope.IDefinitionScope;
-import org.eclipse.linuxtools.ctf.core.event.types.ArrayDeclaration;
-import org.eclipse.linuxtools.ctf.core.event.types.ArrayDefinition;
+import org.eclipse.linuxtools.ctf.core.event.types.AbstractArrayDefinition;
+import org.eclipse.linuxtools.ctf.core.event.types.CompoundDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.types.Definition;
 import org.eclipse.linuxtools.ctf.core.event.types.Encoding;
 import org.eclipse.linuxtools.ctf.core.event.types.EnumDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.types.EnumDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.FloatDeclaration;
+import org.eclipse.linuxtools.ctf.core.event.types.IDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.IntegerDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.types.IntegerDefinition;
-import org.eclipse.linuxtools.ctf.core.event.types.SequenceDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.StringDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.types.StringDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.StructDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.types.StructDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.VariantDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.types.VariantDefinition;
+import org.eclipse.linuxtools.ctf.core.tests.io.Util;
 import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException;
+import org.eclipse.linuxtools.internal.ctf.core.event.types.ArrayDeclaration;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -55,21 +57,18 @@ public class VariantDefinitionTest {
     private VariantDefinition fixture;
 
     StructDefinition fStructDefinition;
-    @NonNull private static final String TEST_STRUCT_ID = "testStruct";
-
-    @NonNull private static final String ENUM_7 = "g";
-    @NonNull private static final String ENUM_6 = "f";
-    @NonNull private static final String ENUM_5 = "e";
-    @NonNull private static final String ENUM_4 = "d";
-    @NonNull private static final String ENUM_3 = "c";
-    @NonNull private static final String ENUM_2 = "b";
-    @NonNull private static final String ENUM_1 = "a";
-
-    @NonNull private static final String TAG_ID = "a";
-
-    @NonNull private static final String LENGTH_SEQ = "_len";
-    @NonNull private static final String VAR_FIELD_NAME = "var";
-    private static final String ENUM_8 = null;
+    private static final @NonNull String TEST_STRUCT_ID = "testStruct";
+    private static final @NonNull String ENUM_7 = "g";
+    private static final @NonNull String ENUM_6 = "f";
+    private static final @NonNull String ENUM_5 = "e";
+    private static final @NonNull String ENUM_4 = "d";
+    private static final @NonNull String ENUM_3 = "c";
+    private static final @NonNull String ENUM_2 = "b";
+    private static final @NonNull String ENUM_1 = "a";
+    private static final @NonNull String TAG_ID = "a";
+    private static final @NonNull String LENGTH_SEQ = "_len";
+    private static final @NonNull String VAR_FIELD_NAME = "var";
+    private static final @NonNull String ENUM_8 = "bbq ribs";
 
     /**
      * Perform pre-test initialization.
@@ -89,7 +88,7 @@ public class VariantDefinitionTest {
         EnumDeclaration enDec = new EnumDeclaration(iDec);
         VariantDeclaration varDec = new VariantDeclaration();
         EnumDeclaration tagDec = new EnumDeclaration(iDec);
-        ArrayDeclaration arrDec = new ArrayDeclaration(2, iDec);
+        CompoundDeclaration arrDec = new ArrayDeclaration(2, iDec);
         FloatDeclaration fDec = new FloatDeclaration(8, 24, ByteOrder.BIG_ENDIAN, 8);
         tagDec.add(0, 1, ENUM_1);
         tagDec.add(2, 3, ENUM_2);
@@ -111,7 +110,7 @@ public class VariantDefinitionTest {
         sDec.addField(VAR_FIELD_NAME, varDec);
         varDec.setTag(TAG_ID);
 
-        ByteBuffer byteBuffer = ByteBuffer.allocate(100);
+        final ByteBuffer byteBuffer = Util.testMemory(ByteBuffer.allocate(100));
         BitBuffer bb = new BitBuffer(byteBuffer);
         byteBuffer.mark();
         byteBuffer.putInt(1);
@@ -177,7 +176,7 @@ public class VariantDefinitionTest {
      */
     @Test
     public void testGetCurrentField() {
-        Definition result = fixture.getCurrentField();
+        IDefinition result = fixture.getCurrentField();
         assertNotNull(result);
     }
 
@@ -204,7 +203,7 @@ public class VariantDefinitionTest {
      */
     @Test
     public void testGetDefinitions() {
-        Definition result = fixture.getCurrentField();
+        IDefinition result = fixture.getCurrentField();
         assertNotNull(result);
     }
 
@@ -222,7 +221,7 @@ public class VariantDefinitionTest {
      */
     @Test
     public void testLookupArray() {
-        ArrayDefinition result = fixture.lookupArray(ENUM_3);
+        AbstractArrayDefinition result = fixture.lookupArrayDefinition(ENUM_3);
         assertNull(result);
     }
 
@@ -231,7 +230,7 @@ public class VariantDefinitionTest {
      */
     @Test
     public void testLookupDefinition() {
-        Definition result = fixture.lookupDefinition(ENUM_1);
+        IDefinition result = fixture.lookupDefinition(ENUM_1);
         assertNotNull(result);
         assertEquals("a", ((EnumDefinition) result).getStringValue());
     }
@@ -254,15 +253,6 @@ public class VariantDefinitionTest {
         assertNull(result);
     }
 
-    /**
-     * Run the SequenceDefinition lookupSequence(String) method test.
-     */
-    @Test
-    public void testLookupSequence_1() {
-        SequenceDefinition result = fixture.lookupSequence(ENUM_4);
-        assertNull(result);
-    }
-
     /**
      * Run the StringDefinition lookupString(String) method test.
      */