ctf: Disable NLS warnings in test plugin
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Fri, 15 Mar 2013 21:33:54 +0000 (17:33 -0400)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Wed, 3 Apr 2013 20:12:08 +0000 (16:12 -0400)
Test plugins are never meant to be shipped to end-users, so
instead of having to put $NON-NLS-1$ and SuppressWarnings
everywhere, just disable those in the project settings instead.

Change-Id: Ifc9d23e4ce9944fb03cb8c019dd5176d2247a70e
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/11214
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bhufmann@gmail.com>
IP-Clean: Bernd Hufmann <bhufmann@gmail.com>

34 files changed:
org.eclipse.linuxtools.ctf.core.tests/.settings/org.eclipse.jdt.core.prefs
org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTraces.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCorePluginTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/CtfCoreTestPlugin.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFCallsiteTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFEventFieldTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/CTFTraceCallsitePerformanceTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/CTFTraceReaderTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/CTFTraceTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/IOstructgenTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/UtilsTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDefinitionTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/DefinitionTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDefinitionTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EventDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/FloatDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/FloatDefinitionTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDefinitionTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDefinitionTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDefinitionTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDefinitionTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDeclarationTest.java
org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDefinitionTest.java

index bca8c277d1a92859366d3c086a78249037f4e1ed..2e1d0e670c9a96bd447d9b6278c51ad8276e9273 100644 (file)
@@ -60,7 +60,7 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
 org.eclipse.jdt.core.compiler.problem.nullReference=error
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
index ca27fcc5332b3e1098ad675f6a6530c29c5875f7..71ce0bf1c95c31b2d2f63236602740716038f008 100644 (file)
@@ -21,7 +21,6 @@ import org.eclipse.linuxtools.ctf.core.trace.CTFTrace;
  *
  * @author alexmont
  */
-@SuppressWarnings("nls")
 public abstract class CtfTestTraces {
 
     /*
index 62208163719dc6fc9922d4aecdcea9c1eab9cccf..29887733958d2e255db531c25056d64a4785ec79 100644 (file)
@@ -41,19 +41,19 @@ public class CtfCorePluginTest {
     @Test
     public void testCtfCorePluginId() {
         assertEquals(
-                "Plugin ID", "org.eclipse.linuxtools.ctf", Activator.PLUGIN_ID); //$NON-NLS-1$ //$NON-NLS-2$
+                "Plugin ID", "org.eclipse.linuxtools.ctf", Activator.PLUGIN_ID);
     }
 
     @Test
     public void testGetDefault() {
         Activator plugin = Activator.getDefault();
-        assertEquals("getDefault()", plugin, fPlugin); //$NON-NLS-1$
+        assertEquals("getDefault()", plugin, fPlugin);
     }
 
     @Test
     public void testLog() {
         try {
-            Activator.getDefault().log("Some message"); //$NON-NLS-1$
+            Activator.getDefault().log("Some message");
         } catch (Exception e) {
             fail();
         }
index 917f8956a1c250870d019946a175730dabeeed13..40ee63ab3654c849b451ce9c32813dd9db625159 100644 (file)
@@ -25,7 +25,7 @@ public class CtfCoreTestPlugin extends Plugin {
     // ------------------------------------------------------------------------
 
     /** The plug-in ID */
-    public static final String PLUGIN_ID = "org.eclipse.linuxtools.ctf.core.tests"; //$NON-NLS-1$
+    public static final String PLUGIN_ID = "org.eclipse.linuxtools.ctf.core.tests";
 
     // The shared instance
     private static CtfCoreTestPlugin fPlugin;
index 37451940c3ddec2baadc31ba777bf02dc44fd561..d1aa37a4f5a7b788fd2822ce6a4f8739d4f7747d 100644 (file)
@@ -46,7 +46,6 @@ public class CTFCallsiteTest {
         // Add additional tear down code here
     }
 
-    @SuppressWarnings("nls")
     private static CTFCallsite GenerateCS(long ip){
         return new CTFCallsite("event name", "func name", ip, "file.java", 1);
     }
@@ -92,7 +91,7 @@ public class CTFCallsiteTest {
     @Test
     public void toStringTest(){
         CTFCallsite cs = GenerateCS(0x01);
-        assertEquals("file.java/func name:1", cs.toString()); //$NON-NLS-1$
+        assertEquals("file.java/func name:1", cs.toString());
     }
 
     /**
index 3d6e407f4a6be4ff69f918802d65559443dff1b8..66e7d5a95240ae33ed0b70c126d295936891e260 100644 (file)
@@ -45,7 +45,7 @@ import org.junit.Test;
 @SuppressWarnings("javadoc")
 public class CTFEventFieldTest {
 
-    private static final String fieldName = "id"; //$NON-NLS-1$
+    private static final String fieldName = "id";
 
 
     /**
@@ -83,7 +83,7 @@ public class CTFEventFieldTest {
         int len = 32;
         IntegerDeclaration id = new IntegerDeclaration(len, false, len,
                 ByteOrder.LITTLE_ENDIAN, Encoding.ASCII, null, 32);
-        String lengthName = "LengthName"; //$NON-NLS-1$
+        String lengthName = "LengthName";
         StructDeclaration structDec = new StructDeclaration(0);
         structDec.addField(lengthName, id);
         StructDefinition structDef = new StructDefinition(structDec, null,
@@ -91,7 +91,7 @@ public class CTFEventFieldTest {
 
         structDef.lookupInteger(lengthName).setValue(32);
         SequenceDeclaration sd = new SequenceDeclaration(lengthName, id);
-        Definition fieldDef = new SequenceDefinition(sd, structDef, "TestX"); //$NON-NLS-1$
+        Definition fieldDef = new SequenceDefinition(sd, structDef, "TestX");
         ByteBuffer byb = ByteBuffer.allocate(1024);
         for (int i = 0; i < 1024; i++) {
             byb.put((byte) i);
@@ -134,9 +134,9 @@ public class CTFEventFieldTest {
     public void testParseField_simple3() {
         StringDefinition fieldDef = new StringDefinition(
                 new StringDeclaration(), null, fieldName);
-        fieldDef.setString(new StringBuilder("Hello World")); //$NON-NLS-1$
+        fieldDef.setString(new StringBuilder("Hello World"));
 
-        String other = "\"Hello World\""; //$NON-NLS-1$
+        String other = "\"Hello World\"";
         assertNotNull(fieldDef);
         assertEquals(fieldDef.toString(), other);
     }
@@ -187,7 +187,7 @@ public class CTFEventFieldTest {
         ((IntegerDefinition) ((ArrayDefinition) fieldDef).getDefinitions()[11]).setValue(0);
 
         assertNotNull(fieldDef);
-        String other = "[ 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 0 ]"; //$NON-NLS-1$
+        String other = "[ 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 0 ]";
         assertEquals(other, fieldDef.toString());
     }
 }
\ No newline at end of file
index 9bb6d6478c6b30a1cd2eee8b1305fae33353c012..739218f9cd3154582f6f3351aef8280461217361 100644 (file)
@@ -30,7 +30,6 @@ public class ReadTrace {
     /**
      * @param args
      */
-    @SuppressWarnings("nls")
     public static void main(String[] args) {
         final String TRACE_PATH = "traces/kernel";
 
@@ -108,7 +107,7 @@ public class ReadTrace {
      */
     private static String formatDate(long timestamp) {
         Date d = new Date(timestamp / 1000000);
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss."); //$NON-NLS-1$
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
         String output = df.format(d) + (timestamp % 1000000000);
         return output;
     }
index 286fc28f8d40365852c6ddd6fcba159b57b46e0b..326566615101c8f6939cf205af7e6990bb260343 100644 (file)
@@ -113,8 +113,7 @@ public class BitBufferTest {
         ByteBuffer result = fixture.getByteBuffer();
 
         assertNotNull(result);
-        assertEquals(
-                "java.nio.HeapByteBuffer[pos=0 lim=0 cap=0]", result.toString()); //$NON-NLS-1$
+        assertEquals("java.nio.HeapByteBuffer[pos=0 lim=0 cap=0]", result.toString());
         assertEquals(false, result.isDirect());
         assertEquals(true, result.hasArray());
         assertEquals(0, result.arrayOffset());
@@ -134,7 +133,7 @@ public class BitBufferTest {
         ByteOrder result = fixture.getByteOrder();
 
         assertNotNull(result);
-        assertEquals("BIG_ENDIAN", result.toString()); //$NON-NLS-1$
+        assertEquals("BIG_ENDIAN", result.toString());
     }
 
     /**
@@ -145,7 +144,7 @@ public class BitBufferTest {
         ByteOrder result = fixture.getByteOrder();
 
         assertNotNull(result);
-        assertEquals("BIG_ENDIAN", result.toString()); //$NON-NLS-1$
+        assertEquals("BIG_ENDIAN", result.toString());
     }
 
     /**
index 51f6045cf243540b35929808ff38be440f72f241..c361ec26481ee7c80085d175d5efd0d61979f056 100644 (file)
@@ -34,14 +34,12 @@ public class CTFTraceCallsitePerformanceTest {
 
     private static final int NUMBER_OF_SEEKS = 100000;
 
-    @SuppressWarnings("nls")
     private final String[] callsites = { "Alligator", "Bunny", "Cat",
             "Dolphin", "Echidna", "Gazelle", "Heron", "Ibex", "Jackalope",
             "Koala", "Lynx", "Meerkat", "Narwhal", "Ocelot", "Pangolin",
             "Quetzal", "Ringtail", "Sandpiper", "Tiger", "Urchin", "Vulture",
             "Walrus", "X-Ray Tetra", "Zonkey" };
 
-    @SuppressWarnings("nls")
     private final String[] functions = { "sentence", "together", "children",
             "mountain", "chipmunk", "crashing", "drinking", "insisted",
             "insulted", "invented", "squinted", "standing", "swishing",
@@ -50,7 +48,6 @@ public class CTFTraceCallsitePerformanceTest {
             "birthday", "bluebird", "cheerful", "colorful", "daylight",
             "doghouse", "driveway", "everyone" };
 
-    @SuppressWarnings("nls")
     private final String[] files = { "Adult.java", "Aeroplane.java",
             "Air.java", "Airforce.java", "Airport.java", "Album.java",
             "Alphabet.java", "Apple.java", "Arm.java", "Army.java", "Babby.java" };
@@ -119,7 +116,7 @@ public class CTFTraceCallsitePerformanceTest {
     private void test(int callsiteSize) {
         addCallsites(callsiteSize);
         long ns = testMain();
-        System.out.println( "perf ( " + callsiteSize + ", " + ns + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        System.out.println( "perf ( " + callsiteSize + ", " + ns + ")");
     }
 
     private void perfTest() {
index c9ceb3fef96b64712a7d03f8603a6f4145ef898d..b236630679d1a86e9bbffcd9ee6c9d5380b93cb0 100644 (file)
@@ -91,7 +91,7 @@ public class CTFTraceReaderTest {
      */
     @Test(expected = org.eclipse.linuxtools.ctf.core.trace.CTFReaderException.class)
     public void testOpen_nonexisting() throws CTFReaderException {
-        CTFTrace trace = new CTFTrace("badfile.bad"); //$NON-NLS-1$
+        CTFTrace trace = new CTFTrace("badfile.bad");
 
         CTFTraceReader result = new CTFTraceReader(trace);
         assertNotNull(result);
@@ -105,7 +105,7 @@ public class CTFTraceReaderTest {
      */
     @Test(expected = org.eclipse.linuxtools.ctf.core.trace.CTFReaderException.class)
     public void testOpen_invalid() throws CTFReaderException {
-        CTFTrace trace = new CTFTrace(""); //$NON-NLS-1$
+        CTFTrace trace = new CTFTrace("");
 
         CTFTraceReader result = new CTFTraceReader(trace);
         assertNotNull(result);
index 0caf60fd31ca809b305a7c0af131f4467ad97163..3eb133da5cc2969f0a917671b20855456ed5aa8c 100644 (file)
@@ -41,7 +41,6 @@ import org.junit.Test;
  *
  * @author ematkho
  */
-@SuppressWarnings("nls")
 public class CTFTraceTest {
 
     private static final int TRACE_INDEX = 0;
index 6267df6da76945826d1ff9f433f49ab41ec1ec55..769a309765fd5248fe6a7f341f2345ef809ee547 100644 (file)
@@ -31,7 +31,6 @@ import org.junit.Test;
  *
  * @author Matthew Khouzam
  */
-@SuppressWarnings("nls")
 public class IOstructgenTest {
 
 
@@ -292,7 +291,7 @@ public class IOstructgenTest {
                 deltree(f);
             }
             f.mkdirs();
-            f = new File(tempTraceDir + "/metadata"); //$NON-NLS-1$
+            f = new File(tempTraceDir + "/metadata");
             FileWriter fw = new FileWriter(f);
             fw.write(metadata);
             fw.close();
@@ -307,7 +306,7 @@ public class IOstructgenTest {
             for (int i = 0; i < size; i++) {
                 data[i] = 0x00;
             }
-            f = new File(tempTraceDir + "/dummyChan"); //$NON-NLS-1$
+            f = new File(tempTraceDir + "/dummyChan");
             fw = new FileWriter(f);
             FileOutputStream fos = new FileOutputStream(f);
             fos.write(magicLE);
index ac9afbe1c5813e4effd9de3326d13d5de05eae63..f8d98958011cc1700824c3948d30859634f4f47e 100644 (file)
@@ -61,8 +61,8 @@ public class StreamInputPacketIndexEntryTest {
      */
     @Test
     public void testStreamInputPacketIndexEntry_1() {
-        String expectedResult = "StreamInputPacketIndexEntry [offsetBytes=1, " + //$NON-NLS-1$
-                "timestampBegin=0, timestampEnd=0]"; //$NON-NLS-1$
+        String expectedResult = "StreamInputPacketIndexEntry [offsetBytes=1, " +
+                "timestampBegin=0, timestampEnd=0]";
 
         assertNotNull(fixture);
         assertEquals(expectedResult, fixture.toString());
@@ -73,8 +73,8 @@ public class StreamInputPacketIndexEntryTest {
      */
     @Test
     public void testToString() {
-        String expectedResult = "StreamInputPacketIndexEntry [offsetBytes=1,"+ //$NON-NLS-1$
-                " timestampBegin=1, timestampEnd=1]"; //$NON-NLS-1$
+        String expectedResult = "StreamInputPacketIndexEntry [offsetBytes=1,"+
+                " timestampBegin=1, timestampEnd=1]";
 
 
         fixture.setContentSizeBits(1);
index 7d3fdecd5cf9a8a0afd6f311d401ad2c29cdcea5..dde9cbd577319ebbe721fef542e99207ceaee4f3 100644 (file)
@@ -88,7 +88,7 @@ public class StreamInputReaderTest {
              * For the tests, we'll use the stream input corresponding to the
              * CPU 0
              */
-            if (si.getFilename().endsWith("0_0")) { //$NON-NLS-1$
+            if (si.getFilename().endsWith("0_0")) {
                 retVal = new StreamInputReader(si);
                 break;
             }
@@ -114,7 +114,7 @@ public class StreamInputReaderTest {
     @Test(expected = CTFReaderException.class)
     public void testStreamInputReader_invalid() throws CTFReaderException {
         StreamInput streamInput = new StreamInput(
-                new Stream(new CTFTrace("")), (FileChannel) null, CtfTestTraces.getEmptyFile()); //$NON-NLS-1$
+                new Stream(new CTFTrace("")), (FileChannel) null, CtfTestTraces.getEmptyFile());
 
         StreamInputReader result = new StreamInputReader(streamInput);
         assertNotNull(result);
index 21373b2da80e9a49a3c0a5eff53864def3462e20..396e8892a6302c1475117aa0ce4b2d737bc574c1 100644 (file)
@@ -77,7 +77,7 @@ public class StreamInputTest {
     }
 
     private static File createFile() {
-        return new File("Tests/traces/trace20m/channel_0"); //$NON-NLS-1$
+        return new File("Tests/traces/trace20m/channel_0");
     }
 
     /**
@@ -143,7 +143,7 @@ public class StreamInputTest {
      */
     @Test
     public void testLookupDefinition() {
-        Definition result = fixture.lookupDefinition("id"); //$NON-NLS-1$
+        Definition result = fixture.lookupDefinition("id");
         assertNull(result);
     }
 
index abe1df5d455011dbb73d3da8ff904062c7f5e93b..8a015eb40c9c0085a4f0203ac18eb1c47daf6cad 100644 (file)
@@ -94,7 +94,7 @@ public class UtilsTest {
         assertNotNull(result);
         assertEquals(72339069014638592L, result.getLeastSignificantBits());
         assertEquals(72339069014638592L, result.getMostSignificantBits());
-        assertEquals("01010000-0000-0000-0101-000000000000", result.toString()); //$NON-NLS-1$
+        assertEquals("01010000-0000-0000-0101-000000000000", result.toString());
         assertEquals(0, result.variant());
         assertEquals(0, result.version());
     }
@@ -113,7 +113,7 @@ public class UtilsTest {
         assertNotNull(result);
         assertEquals(0L, result.getLeastSignificantBits());
         assertEquals(0L, result.getMostSignificantBits());
-        assertEquals("00000000-0000-0000-0000-000000000000", result.toString()); //$NON-NLS-1$
+        assertEquals("00000000-0000-0000-0000-000000000000", result.toString());
         assertEquals(0, result.variant());
         assertEquals(0, result.version());
     }
index f60158b0b661c2adb5f7f57563caa711c67c4a1b..62fa0f1834aef3339629ba5e2d474d3e6ab88480 100644 (file)
@@ -70,7 +70,7 @@ public class ArrayDeclarationTest {
         ArrayDeclaration result = new ArrayDeclaration(length, elemType);
 
         assertNotNull(result);
-        String left = "[declaration] array["; //$NON-NLS-1$
+        String left = "[declaration] array[";
         String right = result.toString().substring(0, left.length());
         assertEquals(left, right);
         assertEquals(1, result.getLength());
@@ -82,7 +82,7 @@ public class ArrayDeclarationTest {
      */
     @Test
     public void testCreateDefinition() {
-        String fieldName = ""; //$NON-NLS-1$
+        String fieldName = "";
         IDefinitionScope definitionScope = null;
         ArrayDefinition result;
         result = fixture.createDefinition(definitionScope, fieldName);
@@ -114,7 +114,7 @@ public class ArrayDeclarationTest {
     @Test
     public void testToString() {
         String result = fixture.toString();
-        String left = "[declaration] array["; //$NON-NLS-1$
+        String left = "[declaration] array[";
         String right = result.substring(0, left.length());
 
         assertEquals(left, right);
index 5dd0527b7f536e000e62caa252105d16d53fa2c0..f6f17bebba05cc3d67117afc9c4858e1a942893c 100644 (file)
@@ -72,14 +72,14 @@ public class ArrayDefinitionTest {
     }
 
     private ArrayDefinition createLongArray() {
-        IntegerDeclaration decl = new IntegerDeclaration(32, false, 10, ByteOrder.BIG_ENDIAN, Encoding.NONE, "none",8); //$NON-NLS-1$
+        IntegerDeclaration decl = new IntegerDeclaration(32, false, 10, ByteOrder.BIG_ENDIAN, Encoding.NONE, "none",8);
         IntegerDefinition[] defs = createIntDefs(10, 32);
         ArrayDefinition temp = setUpDeclaration(decl, defs);
         return temp;
     }
 
     private ArrayDefinition createCharArray() {
-        IntegerDeclaration decl = new IntegerDeclaration(8, false, 10, ByteOrder.BIG_ENDIAN, Encoding.UTF8, "none",8); //$NON-NLS-1$
+        IntegerDeclaration decl = new IntegerDeclaration(8, false, 10, ByteOrder.BIG_ENDIAN, Encoding.UTF8, "none",8);
         IntegerDefinition[] defs = createIntDefs(4,8);
         ArrayDefinition temp = setUpDeclaration(decl, defs);
         return temp;
@@ -103,7 +103,7 @@ public class ArrayDefinitionTest {
     private ArrayDefinition setUpDeclaration(IDeclaration decl,
             Definition[] defs) {
         ArrayDeclaration ad = new ArrayDeclaration(0, decl);
-        ArrayDefinition temp = new ArrayDefinition(ad , this.trace , "Testx"); //$NON-NLS-1$
+        ArrayDefinition temp = new ArrayDefinition(ad , this.trace , "Testx");
         temp.setDefinitions(defs);
         return temp;
     }
@@ -116,7 +116,7 @@ public class ArrayDefinitionTest {
         IntegerDefinition[] defs = new IntegerDefinition[size];
         for (int i = 0; i < size; i++) {
 
-            String content = "test" + i; //$NON-NLS-1$
+            String content = "test" + i;
             defs[i] = new IntegerDefinition(new IntegerDeclaration(bits, false,
                     16, ByteOrder.LITTLE_ENDIAN, Encoding.UTF8, content, 24), null, content);
             defs[i].setValue(i);
@@ -136,7 +136,7 @@ public class ArrayDefinitionTest {
         StringDefinition[] defs = new StringDefinition[size];
         for (int i = 0; i < size; i++) {
 
-            String content = "test" + i; //$NON-NLS-1$
+            String content = "test" + i;
             defs[i] = new StringDefinition(
                     new StringDeclaration(Encoding.UTF8), null, content);
             defs[i].setString(new StringBuilder(content));
@@ -151,11 +151,9 @@ public class ArrayDefinitionTest {
     @Test
     public void testArrayDefinition_baseDeclaration() {
         ArrayDeclaration declaration = charArrayFixture.getDeclaration();
-        String fieldName = ""; //$NON-NLS-1$
-
-        ArrayDefinition result = new ArrayDefinition(declaration, this.trace,
-                fieldName);
+        String fieldName = "";
 
+        ArrayDefinition result = new ArrayDefinition(declaration, this.trace, fieldName);
         assertNotNull(result);
     }
 
@@ -168,11 +166,9 @@ public class ArrayDefinitionTest {
         ArrayDeclaration declaration = new ArrayDeclaration(0,
                 new StringDeclaration());
         IDefinitionScope definitionScope = null;
-        String fieldName = ""; //$NON-NLS-1$
-
-        ArrayDefinition result = new ArrayDefinition(declaration,
-                definitionScope, fieldName);
+        String fieldName = "";
 
+        ArrayDefinition result = new ArrayDefinition(declaration, definitionScope, fieldName);
         assertNotNull(result);
     }
 
@@ -223,8 +219,6 @@ public class ArrayDefinitionTest {
         assertFalse(result);
     }
 
-
-
     /**
      * Run the boolean isString() method test.
      */
@@ -233,8 +227,7 @@ public class ArrayDefinitionTest {
         final IntegerDeclaration id = new IntegerDeclaration(8, false, 16,
                 ByteOrder.LITTLE_ENDIAN, Encoding.UTF8, null, 8);
         ArrayDeclaration ad = new ArrayDeclaration(0, id);
-        ArrayDefinition ownFixture = new ArrayDefinition(ad, this.trace,
-                "Testx"); //$NON-NLS-1$
+        ArrayDefinition ownFixture = new ArrayDefinition(ad, this.trace, "Testx");
 
         int size = 4;
         int bits = 8;
@@ -246,8 +239,6 @@ public class ArrayDefinitionTest {
         assertTrue(result);
     }
 
-
-
     /**
      * Run the boolean isString() method test.
      */
index 94b4bd418e215678fcd36f73758d963e24a92d43..b20c96574734fe9671d4976a07a62cc5334ea7c2 100644 (file)
@@ -82,7 +82,7 @@ public class DefinitionTest {
 
     @Test
     public void testToString() {
-        Definition fixture = new DefTest(null, "Hello"); //$NON-NLS-1$
+        Definition fixture = new DefTest(null, "Hello");
         String result = fixture.toString();
 
         assertNotNull(result);
index 5a8caa8a7294f6a3c5aee828760be5eb3e5a6258..03d8f08b6394c09bf6668c99679e3b839210b01b 100644 (file)
@@ -76,7 +76,7 @@ public class EnumDeclarationTest {
         EnumDeclaration result = new EnumDeclaration(containerType);
 
         assertNotNull(result);
-        String left = "[declaration] enum["; //$NON-NLS-1$
+        String left = "[declaration] enum[";
         assertEquals(left, result.toString().substring(0, left.length()));
     }
 
@@ -87,7 +87,7 @@ public class EnumDeclarationTest {
     public void testAdd() {
         long low = 1L;
         long high = 1L;
-        String label = ""; //$NON-NLS-1$
+        String label = "";
 
         boolean result = fixture.add(low, high, label);
 
@@ -101,7 +101,7 @@ public class EnumDeclarationTest {
     @Test
     public void testCreateDefinition() {
         IDefinitionScope definitionScope = null;
-        String fieldName = ""; //$NON-NLS-1$
+        String fieldName = "";
 
         EnumDefinition result = fixture.createDefinition(definitionScope,
                 fieldName);
@@ -127,7 +127,7 @@ public class EnumDeclarationTest {
     public void testToString() {
         String result = fixture.toString();
 
-        String left = "[declaration] enum["; //$NON-NLS-1$
+        String left = "[declaration] enum[";
         assertEquals(left, result.substring(0, left.length()));
     }
 }
index b8a95524073b44b3fe03a2e2e930a2aab5df585e..f66b6edd903201f74831381566df54a47803760b 100644 (file)
@@ -56,9 +56,9 @@ public class EnumDefinitionTest {
         EnumDeclaration declaration = new EnumDeclaration(
                 new IntegerDeclaration(1, true, 1, ByteOrder.BIG_ENDIAN,
                         Encoding.ASCII, null, 8));
-        declaration.add(0, 10, "a"); //$NON-NLS-1$
-        declaration.add(11, 20, "b"); //$NON-NLS-1$
-        String fieldName = ""; //$NON-NLS-1$
+        declaration.add(0, 10, "a");
+        declaration.add(11, 20, "b");
+        String fieldName = "";
 
         fixture = new EnumDefinition(declaration, null, fieldName);
     }
@@ -131,6 +131,6 @@ public class EnumDefinitionTest {
         fixture.setIntegerValue(16);
         String result = fixture.toString();
 
-        assertEquals("{ value = b, container = 16 }", result); //$NON-NLS-1$
+        assertEquals("{ value = b, container = 16 }", result);
     }
 }
\ No newline at end of file
index 9e561b626d17eb267d90c54482c026078d3a2289..7711cd0a858a1775b569f53c38525ffbacd66a2d 100644 (file)
@@ -67,7 +67,7 @@ public class EventDeclarationTest {
         fixture.setId(1L);
         fixture.setFields(new StructDeclaration(1L));
         fixture.setStream(new Stream(CtfTestTraces.getTestTrace(TRACE_INDEX)));
-        fixture.setName(""); //$NON-NLS-1$
+        fixture.setName("");
     }
 
     /**
@@ -119,7 +119,7 @@ public class EventDeclarationTest {
         obj.setId(1L);
         obj.setFields(new StructDeclaration(1L));
         obj.setStream(new Stream(CtfTestTraces.getTestTrace(TRACE_INDEX)));
-        obj.setName(""); //$NON-NLS-1$
+        obj.setName("");
 
         assertTrue(fixture.equals(fixture));
         boolean result = fixture.equals(obj);
@@ -196,7 +196,7 @@ public class EventDeclarationTest {
         obj.setContext(new StructDeclaration(1L));
         obj.setId(1L);
         obj.setFields(new StructDeclaration(1L));
-        obj.setName(""); //$NON-NLS-1$
+        obj.setName("");
 
         boolean result = fixture.equals(obj);
         assertFalse(result);
@@ -349,9 +349,9 @@ public class EventDeclarationTest {
         assertNotNull(ed.getCPU());
         assertNotNull(ed.getPacketContext());
         assertNotNull(ed.getStreamInputReader());
-        assertNull(ed.lookupDefinition("context")); //$NON-NLS-1$
-        assertNotNull(ed.lookupDefinition("fields")); //$NON-NLS-1$
-        assertNull(ed.lookupDefinition("other")); //$NON-NLS-1$
+        assertNull(ed.lookupDefinition("context"));
+        assertNotNull(ed.lookupDefinition("fields"));
+        assertNull(ed.lookupDefinition("other"));
         assertNotNull(ed.toString());
         ed.setContext( ed.getFields());
         assertNotNull(ed.toString());
index bb7ca8879d4506481ce5d08feb977e9a3975b2e5..c2950cb19843e1fad9e80a3cb1b0098f4ea57ac4 100644 (file)
@@ -45,6 +45,6 @@ public class FloatDeclarationTest {
     @Test
     public void toStringTest() {
         fixture = new FloatDeclaration(8, 24, ByteOrder.nativeOrder(), 0);
-        assertTrue(fixture.toString().contains("float")); //$NON-NLS-1$
+        assertTrue(fixture.toString().contains("float"));
     }
 }
index c7f79a42e4c80b1a5a08def8ce220c88dffc527e..babd2261b75fd58ce235e17b1a6de211e94fb723 100644 (file)
@@ -24,8 +24,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-
-
 /**
  * The class <code>IntegerDefinitionTest</code> contains tests for the class
  * <code>{@link IntegerDefinition}</code>.
@@ -35,11 +33,13 @@ import org.junit.Test;
  */
 @SuppressWarnings("javadoc")
 public class FloatDefinitionTest {
+
     private FloatDefinition fixture;
     private FloatDefinition singleFixture;
     private FloatDefinition doubleFixture; //all the way.
     private FloatDeclaration parent;
-    private static final String fieldName = "float"; //$NON-NLS-1$
+    private static final String fieldName = "float";
+
     /**
      * Launch the test.
      *
@@ -88,27 +88,25 @@ public class FloatDefinitionTest {
 
     @Test
     public void testFloat32Bit(){
-        for(int i = 1; i < 31 ; i++)
-        {
+        for(int i = 1; i < 31 ; i++) {
             parent = new FloatDeclaration(i, 32-i, ByteOrder.nativeOrder(), 0);
             fixture = parent.createDefinition(null, fieldName);
             assertNotNull(fixture);
             fixture.setValue(2.0);
-            assertTrue(fixture.toString().contains("2")); //$NON-NLS-1$
+            assertTrue(fixture.toString().contains("2"));
         }
     }
 
     @Test
     public void testFloat64Bit(){
-        for(int i = 1; i < 63 ; i++)
-        {
+        for(int i = 1; i < 63 ; i++) {
             parent = new FloatDeclaration(i, 64-i, ByteOrder.nativeOrder(), 0);
             fixture = parent.createDefinition(null, fieldName);
             assertNotNull(fixture);
             BitBuffer input = new BitBuffer(java.nio.ByteBuffer.allocateDirect(128));
             fixture.read(input);
             fixture.setValue(2.0);
-            assertTrue(fixture.toString().contains("2")); //$NON-NLS-1$
+            assertTrue(fixture.toString().contains("2"));
         }
     }
 
index 13cda0db6b3b5143e9e59c404426aabd81347dbd..71cd0111c2f3c152b9b7938bf1f083146c3dcd62 100644 (file)
@@ -78,7 +78,7 @@ public class IntegerDeclarationTest {
         assertNotNull(result);
         assertEquals(1, result.getBase());
         assertEquals(false, result.isCharacter());
-        String outputValue = "[declaration] integer["; //$NON-NLS-1$
+        String outputValue = "[declaration] integer[";
         assertEquals(outputValue,
                 result.toString().substring(0, outputValue.length()));
         assertEquals(1, result.getLength());
@@ -101,7 +101,7 @@ public class IntegerDeclarationTest {
     public void testGetByteOrder() {
         ByteOrder result = fixture.getByteOrder();
         assertNotNull(result);
-        assertEquals("BIG_ENDIAN", result.toString()); //$NON-NLS-1$
+        assertEquals("BIG_ENDIAN", result.toString());
     }
 
     /**
@@ -111,8 +111,8 @@ public class IntegerDeclarationTest {
     public void testGetEncoding() {
         Encoding result = fixture.getEncoding();
         assertNotNull(result);
-        assertEquals("ASCII", result.name()); //$NON-NLS-1$
-        assertEquals("ASCII", result.toString()); //$NON-NLS-1$
+        assertEquals("ASCII", result.name());
+        assertEquals("ASCII", result.toString());
         assertEquals(1, result.ordinal());
     }
 
@@ -175,6 +175,6 @@ public class IntegerDeclarationTest {
     public void testToString() {
         String result = fixture.toString();
         String trunc = result.substring(0, 22);
-        assertEquals("[declaration] integer[", trunc); //$NON-NLS-1$
+        assertEquals("[declaration] integer[", trunc);
     }
 }
\ No newline at end of file
index de81eba55ee5e41c523203ad3e48ff820407fac8..5863a0a177a19816bcda2e80b33850a689481581 100644 (file)
@@ -35,8 +35,9 @@ import org.junit.Test;
 public class IntegerDefinitionTest {
 
     private IntegerDefinition fixture;
-    String name = "testInt"; //$NON-NLS-1$
-    String clockName = "clock"; //$NON-NLS-1$
+    String name = "testInt";
+    String clockName = "clock";
+
     /**
      * Launch the test.
      *
@@ -77,7 +78,7 @@ public class IntegerDefinitionTest {
         IntegerDeclaration declaration = new IntegerDeclaration(1, true, 1,
                 ByteOrder.BIG_ENDIAN, Encoding.ASCII, null, 8);
         IDefinitionScope definitionScope = null;
-        String fieldName = ""; //$NON-NLS-1$
+        String fieldName = "";
 
         IntegerDefinition result = new IntegerDefinition(declaration,
                 definitionScope, fieldName);
index ffd66b2d0315e4d1606cbef3fdda1f7190c3c382..26923b67a3b0160b33b3106a01993deb08e4f866 100644 (file)
@@ -40,7 +40,7 @@ public class SequenceDeclarationTest {
 
     private SequenceDeclaration fixture;
 
-    static final String fieldName = "LengthName"; //$NON-NLS-1$
+    static final String fieldName = "LengthName";
     /**
      * Launch the test.
      *
@@ -66,13 +66,12 @@ public class SequenceDeclarationTest {
      */
     @Test
     public void testSequenceDeclaration() {
-        String lengthName = ""; //$NON-NLS-1$
+        String lengthName = "";
         IDeclaration elemType = new StringDeclaration();
 
-        SequenceDeclaration result = new SequenceDeclaration(lengthName,
-                elemType);
+        SequenceDeclaration result = new SequenceDeclaration(lengthName, elemType);
         assertNotNull(result);
-        String string = "[declaration] sequence["; //$NON-NLS-1$
+        String string = "[declaration] sequence[";
         assertEquals(string, result.toString().substring(0, string.length()));
     }
 
@@ -87,11 +86,10 @@ public class SequenceDeclarationTest {
 
         StructDeclaration structDec = new StructDeclaration(0);
         structDec.addField(fieldName, id);
-        StructDefinition structDef = new StructDefinition(structDec, null, "x"); //$NON-NLS-1$
+        StructDefinition structDef = new StructDefinition(structDec, null, "x");
         long seqLen = 10;
         structDef.lookupInteger(fieldName).setValue(seqLen);
-        SequenceDefinition result = this.fixture.createDefinition(structDef,
-                fieldName);
+        SequenceDefinition result = this.fixture.createDefinition(structDef, fieldName);
         assertNotNull(result);
     }
 
@@ -110,7 +108,7 @@ public class SequenceDeclarationTest {
     @Test
     public void testToString() {
         String result = fixture.toString();
-        String left = "[declaration] sequence["; //$NON-NLS-1$
+        String left = "[declaration] sequence[";
         assertEquals(left, result.substring(0, left.length()));
     }
 }
index 763a090970ecc1276aeadde799258b083d91c13f..d0045da7cbc8195f3cfce7b5914ed517da542f1e 100644 (file)
@@ -64,14 +64,14 @@ public class SequenceDefinitionTest {
 
         IntegerDeclaration id = new IntegerDeclaration(8, false, 8,
                 ByteOrder.LITTLE_ENDIAN, Encoding.UTF8, null, 8);
-        String lengthName = "LengthName"; //$NON-NLS-1$
+        String lengthName = "LengthName";
         structDec = new StructDeclaration(0);
         structDec.addField(lengthName, id);
-        structDef = new StructDefinition(structDec, null, "x"); //$NON-NLS-1$
+        structDef = new StructDefinition(structDec, null, "x");
 
         structDef.lookupInteger(lengthName).setValue(seqLen);
         SequenceDeclaration sd = new SequenceDeclaration(lengthName, id);
-        fixture = new SequenceDefinition(sd, structDef, "TestX"); //$NON-NLS-1$
+        fixture = new SequenceDefinition(sd, structDef, "TestX");
         BitBuffer input = new BitBuffer(
                 java.nio.ByteBuffer.allocateDirect(seqLen * 8));
         for (int i = 0; i < seqLen; i++) {
@@ -96,14 +96,14 @@ public class SequenceDefinitionTest {
         int len = 32;
         IntegerDeclaration id = new IntegerDeclaration(len, false, len,
                 ByteOrder.LITTLE_ENDIAN, Encoding.UTF8, null,8);
-        String lengthName = "LengthName"; //$NON-NLS-1$
+        String lengthName = "LengthName";
         structDec = new StructDeclaration(0);
         structDec.addField(lengthName, id);
-        structDef = new StructDefinition(structDec, null, "x"); //$NON-NLS-1$
+        structDef = new StructDefinition(structDec, null, "x");
 
         structDef.lookupInteger(lengthName).setValue(seqLen);
         SequenceDeclaration sd = new SequenceDeclaration(lengthName, id);
-        SequenceDefinition ret = new SequenceDefinition(sd, structDef, "TestX"); //$NON-NLS-1$
+        SequenceDefinition ret = new SequenceDefinition(sd, structDef, "TestX");
         BitBuffer input = new BitBuffer(
                 java.nio.ByteBuffer.allocateDirect(seqLen * len));
         for (int i = 0; i < seqLen; i++) {
index d03fe9311f7afe6eb14eea5d2fc5e8cb199ea7f5..41e0030735ac7fa9da66c3759d7a18e40ce98fcb 100644 (file)
@@ -67,7 +67,7 @@ public class StringDeclarationTest {
         StringDeclaration result = new StringDeclaration();
 
         assertNotNull(result);
-        String string = "[declaration] string["; //$NON-NLS-1$
+        String string = "[declaration] string[";
         assertEquals(string, result.toString().substring(0, string.length()));
     }
 
@@ -80,7 +80,7 @@ public class StringDeclarationTest {
         StringDeclaration result = new StringDeclaration(encoding);
 
         assertNotNull(result);
-        String string = "[declaration] string["; //$NON-NLS-1$
+        String string = "[declaration] string[";
         assertEquals(string, result.toString().substring(0, string.length()));
     }
 
@@ -91,7 +91,7 @@ public class StringDeclarationTest {
     @Test
     public void testCreateDefinition() {
         IDefinitionScope definitionScope = null;
-        String fieldName = "id"; //$NON-NLS-1$
+        String fieldName = "id";
         StringDefinition result = fixture.createDefinition(definitionScope,
                 fieldName);
 
@@ -106,8 +106,8 @@ public class StringDeclarationTest {
         Encoding result = fixture.getEncoding();
 
         assertNotNull(result);
-        assertEquals("ASCII", result.name()); //$NON-NLS-1$
-        assertEquals("ASCII", result.toString()); //$NON-NLS-1$
+        assertEquals("ASCII", result.name());
+        assertEquals("ASCII", result.toString());
         assertEquals(1, result.ordinal());
     }
 
@@ -126,7 +126,7 @@ public class StringDeclarationTest {
     @Test
     public void testToString() {
         String result = fixture.toString();
-        String left = "[declaration] string["; //$NON-NLS-1$
+        String left = "[declaration] string[";
         String right = result.substring(0, left.length());
 
         assertEquals(left, right);
index 79231779ae741e42108b3147c9431764fe67378b..065af26e3e8264c03ec706d4846f85d4ede16ad0 100644 (file)
@@ -47,7 +47,7 @@ public class StringDefinitionTest {
      */
     @Before
     public void setUp() {
-        String name = "testString"; //$NON-NLS-1$
+        String name = "testString";
         StringDeclaration stringDec = new StringDeclaration();
         fixture = stringDec.createDefinition(null, name);
     }
@@ -68,7 +68,7 @@ public class StringDefinitionTest {
     public void testStringDefinition() {
         StringDeclaration declaration = new StringDeclaration();
         IDefinitionScope definitionScope = null;
-        String fieldName = ""; //$NON-NLS-1$
+        String fieldName = "";
 
         StringDefinition result = new StringDefinition(declaration,
                 definitionScope, fieldName);
index 159bea3e36dc6ea28940babc61eca3d93132bd0c..7d8ab256a540351af51f2356689e7e554da05ac4 100644 (file)
@@ -71,7 +71,7 @@ public class StructDeclarationTest {
         assertNotNull(fixture);
         assertEquals(1L, fixture.getMaxAlign());
 
-        String regex = "^\\[declaration\\] struct\\[[0-9a-f]{1,8}\\]$"; //$NON-NLS-1$
+        String regex = "^\\[declaration\\] struct\\[[0-9a-f]{1,8}\\]$";
         assertTrue(fixture.toString().matches(regex));
     }
 
@@ -80,7 +80,7 @@ public class StructDeclarationTest {
      */
     @Test
     public void testAddField() {
-        String name = ""; //$NON-NLS-1$
+        String name = "";
         IDeclaration declaration = new StringDeclaration();
         fixture.addField(name, declaration);
     }
@@ -91,7 +91,7 @@ public class StructDeclarationTest {
      */
     @Test
     public void testCreateDefinition() {
-        String fieldName = ""; //$NON-NLS-1$
+        String fieldName = "";
         StructDefinition result = fixture.createDefinition(null, fieldName);
         assertNotNull(result);
     }
@@ -132,7 +132,7 @@ public class StructDeclarationTest {
      */
     @Test
     public void testHasField() {
-        String name = ""; //$NON-NLS-1$
+        String name = "";
         boolean result = fixture.hasField(name);
 
         assertEquals(false, result);
@@ -146,6 +146,6 @@ public class StructDeclarationTest {
         String result = fixture.toString();
         String trunc = result.substring(0, 21);
 
-        assertEquals("[declaration] struct[", trunc); //$NON-NLS-1$
+        assertEquals("[declaration] struct[", trunc);
     }
 }
index 6d3813e01e8c8e609bb9848292ed30773ed83376..b45a3b2f2157f47c476dbb7c0cf5edfc7d692b7e 100644 (file)
@@ -48,31 +48,20 @@ import org.junit.Test;
  */
 public class StructDefinitionTest {
 
-    private static final String TEST_STRUCT_ID = "testStruct"; //$NON-NLS-1$
-
-    private static final String ENUM_2 = "y"; //$NON-NLS-1$
-
-    private static final String ENUM_1 = "x"; //$NON-NLS-1$
-
-    private static final String TAG_ID = "Tag"; //$NON-NLS-1$
-
-    private static final String INT_ID = "_id"; //$NON-NLS-1$
-
-    private static final String STRING_ID = "_args"; //$NON-NLS-1$
-
-    private static final String ENUM_ID = "_enumArgs"; //$NON-NLS-1$
-
-    private static final String SEQUENCE_ID = "_seq"; //$NON-NLS-1$
-
-    private static final String LENGTH_SEQ = "_len"; //$NON-NLS-1$
+    private static final String TEST_STRUCT_ID = "testStruct";
+    private static final String ENUM_2 = "y";
+    private static final String ENUM_1 = "x";
+    private static final String TAG_ID = "Tag";
+    private static final String INT_ID = "_id";
+    private static final String STRING_ID = "_args";
+    private static final String ENUM_ID = "_enumArgs";
+    private static final String SEQUENCE_ID = "_seq";
+    private static final String LENGTH_SEQ = "_len";
 
     private StructDefinition fixture;
-
     private StructDefinition emptyStruct;
-
     private StructDefinition simpleStruct;
-
-    private static final String VAR_FIELD_NAME = "SomeVariant"; //$NON-NLS-1$
+    private static final String VAR_FIELD_NAME = "SomeVariant";
 
     /**
      * Launch the test.
@@ -168,7 +157,7 @@ public class StructDefinitionTest {
      */
     @Test
     public void testLookupDefinition() {
-        String lookupPath = "args"; //$NON-NLS-1$
+        String lookupPath = "args";
         Definition result = fixture.lookupDefinition(lookupPath);
 
         assertNotNull(result);
@@ -189,7 +178,7 @@ public class StructDefinitionTest {
      */
     @Test
     public void testLookupInteger_1() {
-        String name = "_id"; //$NON-NLS-1$
+        String name = "_id";
         IntegerDefinition result = fixture.lookupInteger(name);
         assertNotNull(result);
     }
@@ -268,9 +257,9 @@ public class StructDefinitionTest {
         assertNotNull(result);
 
         result = emptyStruct.toString();
-        assertEquals("{  }", result); //$NON-NLS-1$
+        assertEquals("{  }", result);
 
         result = simpleStruct.toString();
-        assertEquals("{ _id = 0, _args = \"\" }", result); //$NON-NLS-1$
+        assertEquals("{ _id = 0, _args = \"\" }", result);
     }
 }
\ No newline at end of file
index 790ce859d22f235d4584e61fe4d5330da1794c2c..2f683ed5297b8fcb80b8ce9e60e7e78e95f8db4e 100644 (file)
@@ -74,7 +74,7 @@ public class VariantDeclarationTest {
     public void testVariantDeclaration() {
         assertNotNull(fixture);
         assertEquals(false, fixture.isTagged());
-        String left = "[declaration] variant["; //$NON-NLS-1$
+        String left = "[declaration] variant[";
         assertEquals(left, fixture.toString().substring(0, left.length()));
     }
 
@@ -83,8 +83,8 @@ public class VariantDeclarationTest {
      */
     @Test
     public void testAddField() {
-        fixture.setTag(""); //$NON-NLS-1$
-        String tag = ""; //$NON-NLS-1$
+        fixture.setTag("");
+        String tag = "";
         IDeclaration declaration = new StringDeclaration();
         fixture.addField(tag, declaration);
     }
@@ -97,11 +97,10 @@ public class VariantDeclarationTest {
      */
     @Test
     public void testCreateDefinition() throws CTFReaderException {
-        fixture.setTag(""); //$NON-NLS-1$
+        fixture.setTag("");
         IDefinitionScope definitionScope = createDefinitionScope();
-        String fieldName = ""; //$NON-NLS-1$
-        VariantDefinition result = fixture.createDefinition(definitionScope,
-                fieldName);
+        String fieldName = "";
+        VariantDefinition result = fixture.createDefinition(definitionScope, fieldName);
 
         assertNotNull(result);
     }
@@ -109,14 +108,14 @@ public class VariantDeclarationTest {
     private static IDefinitionScope createDefinitionScope() throws CTFReaderException {
         assumeTrue(CtfTestTraces.tracesExist());
         VariantDeclaration declaration = new VariantDeclaration();
-        declaration.setTag(""); //$NON-NLS-1$
+        declaration.setTag("");
         VariantDeclaration variantDeclaration = new VariantDeclaration();
-        variantDeclaration.setTag(""); //$NON-NLS-1$
+        variantDeclaration.setTag("");
         VariantDefinition variantDefinition = new VariantDefinition(
-                variantDeclaration, CtfTestTraces.getTestTrace(TRACE_INDEX), ""); //$NON-NLS-1$
+                variantDeclaration, CtfTestTraces.getTestTrace(TRACE_INDEX), "");
         IDefinitionScope definitionScope = new StructDefinition(
-                new StructDeclaration(1L), variantDefinition, ""); //$NON-NLS-1$
-        String fieldName = ""; //$NON-NLS-1$
+                new StructDeclaration(1L), variantDefinition, "");
+        String fieldName = "";
 
         VariantDefinition result = new VariantDefinition(declaration,
                 definitionScope, fieldName);
@@ -128,8 +127,8 @@ public class VariantDeclarationTest {
      */
     @Test
     public void testHasField() {
-        fixture.setTag(""); //$NON-NLS-1$
-        String tag = ""; //$NON-NLS-1$
+        fixture.setTag("");
+        String tag = "";
         boolean result = fixture.hasField(tag);
 
         assertEquals(false, result);
@@ -140,7 +139,7 @@ public class VariantDeclarationTest {
      */
     @Test
     public void testIsTagged() {
-        fixture.setTag(""); //$NON-NLS-1$
+        fixture.setTag("");
         boolean result = fixture.isTagged();
 
         assertEquals(true, result);
@@ -162,8 +161,8 @@ public class VariantDeclarationTest {
      */
     @Test
     public void testSetTag() {
-        fixture.setTag(""); //$NON-NLS-1$
-        String tag = ""; //$NON-NLS-1$
+        fixture.setTag("");
+        String tag = "";
         fixture.setTag(tag);
     }
 
@@ -172,9 +171,9 @@ public class VariantDeclarationTest {
      */
     @Test
     public void testToString() {
-        fixture.setTag(""); //$NON-NLS-1$
+        fixture.setTag("");
         String result = fixture.toString();
-        String left = "[declaration] variant["; //$NON-NLS-1$
+        String left = "[declaration] variant[";
         String right = result.substring(0, left.length());
 
         assertEquals(left, right);
index 5bea59614461b2ca19efe9cfe98588210fc55481..fba1c899e863a729033b295d8ea1ea7ef122cbe6 100644 (file)
@@ -60,29 +60,27 @@ public class VariantDefinitionTest {
     public static void main(String[] args) {
         new org.junit.runner.JUnitCore().run(VariantDefinitionTest.class);
     }
+
     StructDefinition structDefinition;
-    private static final String TEST_STRUCT_ID = "testStruct"; //$NON-NLS-1$
-
-    private static final String ENUM_7 = "g"; //$NON-NLS-1$
-    private static final String ENUM_6 = "f"; //$NON-NLS-1$
-    private static final String ENUM_5 = "e"; //$NON-NLS-1$
-    private static final String ENUM_4 = "d"; //$NON-NLS-1$
-    private static final String ENUM_3 = "c"; //$NON-NLS-1$
-    private static final String ENUM_2 = "b"; //$NON-NLS-1$
-    private static final String ENUM_1 = "a"; //$NON-NLS-1$
-
-    private static final String TAG_ID = "a"; //$NON-NLS-1$
-
-//    private static final String INT_ID = "_id"; //$NON-NLS-1$
-//
-//    private static final String STRING_ID = "_args"; //$NON-NLS-1$
-//
-//    private static final String ENUM_ID = "_enumArgs"; //$NON-NLS-1$
-//
-//    private static final String SEQUENCE_ID = "_seq"; //$NON-NLS-1$
-
-    private static final String LENGTH_SEQ = "_len"; //$NON-NLS-1$
-    private static final String VAR_FIELD_NAME = "var"; //$NON-NLS-1$
+    private static final String TEST_STRUCT_ID = "testStruct";
+
+    private static final String ENUM_7 = "g";
+    private static final String ENUM_6 = "f";
+    private static final String ENUM_5 = "e";
+    private static final String ENUM_4 = "d";
+    private static final String ENUM_3 = "c";
+    private static final String ENUM_2 = "b";
+    private static final String ENUM_1 = "a";
+
+    private static final String TAG_ID = "a";
+
+//    private static final String INT_ID = "_id";
+//    private static final String STRING_ID = "_args";
+//    private static final String ENUM_ID = "_enumArgs";
+//    private static final String SEQUENCE_ID = "_seq";
+
+    private static final String LENGTH_SEQ = "_len";
+    private static final String VAR_FIELD_NAME = "var";
     private static final String ENUM_8 = null;
     /**
      * Perform pre-test initialization.
@@ -147,14 +145,14 @@ public class VariantDefinitionTest {
     @Test
     public void testVariantDefinition() {
         VariantDeclaration declaration = new VariantDeclaration();
-        declaration.setTag(""); //$NON-NLS-1$
+        declaration.setTag("");
         VariantDeclaration variantDeclaration = new VariantDeclaration();
-        variantDeclaration.setTag(""); //$NON-NLS-1$
+        variantDeclaration.setTag("");
         VariantDefinition variantDefinition = new VariantDefinition(
-                variantDeclaration, structDefinition, ""); //$NON-NLS-1$
+                variantDeclaration, structDefinition, "");
         IDefinitionScope definitionScope = new StructDefinition(
-                new StructDeclaration(1L), variantDefinition, ""); //$NON-NLS-1$
-        String fieldName = ""; //$NON-NLS-1$
+                new StructDeclaration(1L), variantDefinition, "");
+        String fieldName = "";
 
         VariantDefinition result = new VariantDefinition(declaration,
                 definitionScope, fieldName);
@@ -328,7 +326,7 @@ public class VariantDefinitionTest {
         VariantDefinition vDef;
         StructDefinition structDef;
         EnumDefinition tagDefinition;
-        String fName = ""; //$NON-NLS-1$
+        String fName = "";
 
         vDecl = new VariantDeclaration();
         vDecl.setTag(fName);
@@ -347,10 +345,10 @@ public class VariantDefinitionTest {
     @Test
     public void testToString() {
         String result = fixture.toString();
-        assertEquals("{ null = null }", result); //$NON-NLS-1$
+        assertEquals("{ null = null }", result);
 
         fixture.setCurrentField(ENUM_2);
         result = fixture.toString();
-        assertEquals("{ b = 0 }", result); //$NON-NLS-1$
+        assertEquals("{ b = 0 }", result);
     }
 }
This page took 0.083052 seconds and 5 git commands to generate.