From a34d8eee7eb28c1df39d0ab8346bb7d781025f70 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Fri, 15 Mar 2013 18:00:16 -0400 Subject: [PATCH] ctf: Clean up unit tests Remove all remaining artifacts from CodePro. Change-Id: Id313c48e4b00be694340d7cfeb66f40d74c489c2 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/11215 Tested-by: Hudson CI Reviewed-by: Bernd Hufmann IP-Clean: Bernd Hufmann --- .../ctf/core/tests/event/CTFCallsiteTest.java | 27 -------------- .../core/tests/event/CTFEventFieldTest.java | 29 --------------- .../ctf/core/tests/io/BitBufferIntTest.java | 19 ---------- .../ctf/core/tests/io/BitBufferTest.java | 19 ---------- .../core/tests/trace/CTFTraceReaderTest.java | 19 ---------- .../ctf/core/tests/trace/MetadataTest.java | 19 ---------- .../StreamInputPacketIndexEntryTest.java | 19 ---------- .../trace/StreamInputPacketIndexTest.java | 19 ---------- .../StreamInputReaderComparatorTest.java | 19 ---------- .../tests/trace/StreamInputReaderTest.java | 19 ---------- ...eamInputReaderTimestampComparatorTest.java | 19 ---------- .../ctf/core/tests/trace/StreamInputTest.java | 19 ---------- .../ctf/core/tests/trace/StreamTest.java | 19 ---------- .../ctf/core/tests/trace/UtilsTest.java | 28 --------------- .../tests/types/ArrayDeclarationTest.java | 19 ---------- .../core/tests/types/ArrayDefinitionTest.java | 35 ++----------------- .../ctf/core/tests/types/DefinitionTest.java | 28 --------------- .../core/tests/types/EnumDeclarationTest.java | 19 ---------- .../core/tests/types/EnumDefinitionTest.java | 19 ---------- .../tests/types/EventDeclarationTest.java | 19 ---------- .../core/tests/types/FloatDefinitionTest.java | 27 ++------------ .../tests/types/IntegerDeclarationTest.java | 19 ---------- .../tests/types/IntegerDefinitionTest.java | 25 +------------ .../tests/types/SequenceDeclarationTest.java | 15 -------- .../tests/types/SequenceDefinitionTest.java | 19 ---------- .../tests/types/StringDeclarationTest.java | 19 ---------- .../tests/types/StringDefinitionTest.java | 19 ---------- .../tests/types/StructDeclarationTest.java | 19 ---------- .../tests/types/StructDefinitionTest.java | 20 ----------- .../tests/types/VariantDeclarationTest.java | 19 ---------- .../tests/types/VariantDefinitionTest.java | 27 +------------- 31 files changed, 8 insertions(+), 652 deletions(-) diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFCallsiteTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFCallsiteTest.java index d1aa37a4f5..b7fbc3501b 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFCallsiteTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFCallsiteTest.java @@ -17,8 +17,6 @@ import static org.junit.Assert.assertNotNull; import java.util.Arrays; import org.eclipse.linuxtools.ctf.core.event.CTFCallsite; -import org.junit.After; -import org.junit.Before; import org.junit.Test; /** @@ -30,21 +28,6 @@ import org.junit.Test; */ public class CTFCallsiteTest { - /** - * Perform pre-test initialization. - */ - @Before - public void setUp() { - // add additional set up code here - } - - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } private static CTFCallsite GenerateCS(long ip){ return new CTFCallsite("event name", "func name", ip, "file.java", 1); @@ -93,14 +76,4 @@ public class CTFCallsiteTest { CTFCallsite cs = GenerateCS(0x01); assertEquals("file.java/func name:1", cs.toString()); } - - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(CTFCallsiteTest.class); - } } diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFEventFieldTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFEventFieldTest.java index 66e7d5a952..c0843380fe 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFEventFieldTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/event/CTFEventFieldTest.java @@ -31,8 +31,6 @@ 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.trace.CTFReaderException; -import org.junit.After; -import org.junit.Before; import org.junit.Test; /** @@ -47,33 +45,6 @@ public class CTFEventFieldTest { private static final String fieldName = "id"; - - /** - * Perform pre-test initialization. - */ - @Before - public void setUp() { - // add additional set up code here - } - - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(CTFEventFieldTest.class); - } - /** * Run the CTFEventField parseField(Definition,String) method test. * @throws CTFReaderException diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferIntTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferIntTest.java index 23c43f6576..2bf4399cf3 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferIntTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferIntTest.java @@ -17,7 +17,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.eclipse.linuxtools.ctf.core.event.io.BitBuffer; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -31,16 +30,6 @@ public class BitBufferIntTest { private BitBuffer fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(BitBufferTest.class); - } - /** * Perform pre-test initialization. */ @@ -51,14 +40,6 @@ public class BitBufferIntTest { createBuffer(fixture); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - private static void createBuffer(BitBuffer fixture) { createBuffer(fixture, 16); } diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferTest.java index 3265666151..b13dfd1136 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/io/BitBufferTest.java @@ -18,7 +18,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.eclipse.linuxtools.ctf.core.event.io.BitBuffer; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -33,16 +32,6 @@ public class BitBufferTest { private BitBuffer fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(BitBufferTest.class); - } - /** * Perform pre-test initialization. */ @@ -54,14 +43,6 @@ public class BitBufferTest { fixture.position(1); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the BitBuffer() constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/CTFTraceReaderTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/CTFTraceReaderTest.java index b236630679..4b6b9cd298 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/CTFTraceReaderTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/CTFTraceReaderTest.java @@ -22,7 +22,6 @@ import org.eclipse.linuxtools.ctf.core.tests.shared.CtfTestTraces; import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException; import org.eclipse.linuxtools.ctf.core.trace.CTFTrace; import org.eclipse.linuxtools.ctf.core.trace.CTFTraceReader; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,16 +39,6 @@ public class CTFTraceReaderTest { private CTFTraceReader fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(CTFTraceReaderTest.class); - } - /** * Perform pre-test initialization. * @@ -61,14 +50,6 @@ public class CTFTraceReaderTest { fixture = new CTFTraceReader(CtfTestTraces.getTestTrace(TRACE_INDEX)); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the CTFTraceReader(CTFTrace) constructor test. Open a known good * trace. diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/MetadataTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/MetadataTest.java index fec3ef3a5b..87b9702535 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/MetadataTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/MetadataTest.java @@ -20,7 +20,6 @@ import java.nio.ByteOrder; import org.eclipse.linuxtools.ctf.core.tests.shared.CtfTestTraces; import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException; import org.eclipse.linuxtools.ctf.core.trace.Metadata; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -38,16 +37,6 @@ public class MetadataTest { private Metadata fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(MetadataTest.class); - } - /** * Perform pre-test initialization. * @@ -59,14 +48,6 @@ public class MetadataTest { fixture = new Metadata(CtfTestTraces.getTestTrace(TRACE_INDEX)); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the Metadata(CTFTrace) constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java index f8d9895801..07a1b44018 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java @@ -15,7 +15,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputPacketIndexEntry; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -30,16 +29,6 @@ public class StreamInputPacketIndexEntryTest { private StreamInputPacketIndexEntry fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StreamInputPacketIndexEntryTest.class); - } - /** * Perform pre-test initialization. */ @@ -48,14 +37,6 @@ public class StreamInputPacketIndexEntryTest { fixture = new StreamInputPacketIndexEntry(1L); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the StreamInputPacketIndexEntry(long) constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexTest.java index 0e4f01fa68..c603811cba 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexTest.java @@ -20,7 +20,6 @@ import java.util.ListIterator; import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException; import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputPacketIndex; import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputPacketIndexEntry; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -37,16 +36,6 @@ public class StreamInputPacketIndexTest { private StreamInputPacketIndex fixture; private StreamInputPacketIndexEntry entry; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StreamInputPacketIndexTest.class); - } - /** * Perform pre-test initialization. * @@ -59,14 +48,6 @@ public class StreamInputPacketIndexTest { entry = new StreamInputPacketIndexEntry(1L); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the StreamInputPacketIndex() constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderComparatorTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderComparatorTest.java index 3e514779be..c27f1f7d55 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderComparatorTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderComparatorTest.java @@ -14,7 +14,6 @@ package org.eclipse.linuxtools.ctf.core.tests.trace; import static org.junit.Assert.assertNotNull; import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputReaderComparator; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -29,16 +28,6 @@ public class StreamInputReaderComparatorTest { private StreamInputReaderComparator fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StreamInputReaderComparatorTest.class); - } - /** * Perform pre-test initialization. */ @@ -47,14 +36,6 @@ public class StreamInputReaderComparatorTest { fixture = new StreamInputReaderComparator(); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the StreamInputReaderComparator() constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java index dde9cbd577..e9f0823d57 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTest.java @@ -28,7 +28,6 @@ import org.eclipse.linuxtools.ctf.core.trace.Stream; import org.eclipse.linuxtools.ctf.core.trace.StreamInput; import org.eclipse.linuxtools.ctf.core.trace.StreamInputReader; import org.eclipse.linuxtools.internal.ctf.core.event.EventDeclaration; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -46,16 +45,6 @@ public class StreamInputReaderTest { private StreamInputReader fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StreamInputReaderTest.class); - } - /** * Perform pre-test initialization. * @@ -69,14 +58,6 @@ public class StreamInputReaderTest { getStreamInputReader())); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - private static StreamInputReader getStreamInputReader() throws CTFReaderException { assumeTrue(CtfTestTraces.tracesExist()); CTFTrace trace = CtfTestTraces.getTestTrace(TRACE_INDEX); diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTimestampComparatorTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTimestampComparatorTest.java index 1b8758ee4f..04f7ab9bdb 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTimestampComparatorTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputReaderTimestampComparatorTest.java @@ -14,7 +14,6 @@ package org.eclipse.linuxtools.ctf.core.tests.trace; import static org.junit.Assert.assertNotNull; import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputReaderTimestampComparator; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -29,16 +28,6 @@ public class StreamInputReaderTimestampComparatorTest { private StreamInputReaderTimestampComparator fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StreamInputReaderTimestampComparatorTest.class); - } - /** * Perform pre-test initialization. */ @@ -47,14 +36,6 @@ public class StreamInputReaderTimestampComparatorTest { fixture = new StreamInputReaderTimestampComparator(); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the StreamInputReaderTimestampComparator() constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputTest.java index 396e8892a6..532eb2a791 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputTest.java @@ -27,7 +27,6 @@ import org.eclipse.linuxtools.ctf.core.tests.shared.CtfTestTraces; import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException; import org.eclipse.linuxtools.ctf.core.trace.Stream; import org.eclipse.linuxtools.ctf.core.trace.StreamInput; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -45,16 +44,6 @@ public class StreamInputTest { private StreamInput fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StreamInputTest.class); - } - /** * Perform pre-test initialization. * @@ -68,14 +57,6 @@ public class StreamInputTest { fixture.setTimestampEnd(1L); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - private static File createFile() { return new File("Tests/traces/trace20m/channel_0"); } diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamTest.java index bb967f3633..568262d23b 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamTest.java @@ -28,7 +28,6 @@ import org.eclipse.linuxtools.ctf.core.trace.Stream; import org.eclipse.linuxtools.ctf.core.trace.StreamInput; import org.eclipse.linuxtools.internal.ctf.core.event.EventDeclaration; import org.eclipse.linuxtools.internal.ctf.core.event.metadata.exceptions.ParseException; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -46,16 +45,6 @@ public class StreamTest { private Stream fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StreamTest.class); - } - /** * Perform pre-test initialization. * @@ -73,14 +62,6 @@ public class StreamTest { (FileChannel) null, CtfTestTraces.getEmptyFile())); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the Stream(CTFTrace) constructor test. * diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/UtilsTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/UtilsTest.java index 8a015eb40c..784478786b 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/UtilsTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/UtilsTest.java @@ -17,8 +17,6 @@ import static org.junit.Assert.assertNotNull; import java.util.UUID; import org.eclipse.linuxtools.ctf.core.trace.Utils; -import org.junit.After; -import org.junit.Before; import org.junit.Test; /** @@ -30,32 +28,6 @@ import org.junit.Test; */ public class UtilsTest { - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(UtilsTest.class); - } - - /** - * Perform pre-test initialization. - */ - @Before - public void setUp() { - // add additional set up code here - } - - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the Utils() constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDeclarationTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDeclarationTest.java index 62fa0f1834..8d1a30167a 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDeclarationTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDeclarationTest.java @@ -19,7 +19,6 @@ import org.eclipse.linuxtools.ctf.core.event.types.ArrayDefinition; import org.eclipse.linuxtools.ctf.core.event.types.IDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.IDefinitionScope; import org.eclipse.linuxtools.ctf.core.event.types.StringDeclaration; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -34,16 +33,6 @@ public class ArrayDeclarationTest { private ArrayDeclaration fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(ArrayDeclarationTest.class); - } - /** * Perform pre-test initialization. */ @@ -52,14 +41,6 @@ public class ArrayDeclarationTest { fixture = new ArrayDeclaration(1, new StringDeclaration()); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the ArrayDeclaration(int,Declaration) constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDefinitionTest.java index f6f17bebba..a5493cad33 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/ArrayDefinitionTest.java @@ -30,7 +30,6 @@ import org.eclipse.linuxtools.ctf.core.event.types.IntegerDefinition; import org.eclipse.linuxtools.ctf.core.event.types.StringDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StringDefinition; import org.eclipse.linuxtools.ctf.core.trace.CTFTrace; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -48,16 +47,6 @@ public class ArrayDefinitionTest { private ArrayDefinition stringArrayFixture; private ArrayDefinition longArrayFixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(ArrayDefinitionTest.class); - } - /** * Perform pre-test initialization. * @@ -85,21 +74,13 @@ public class ArrayDefinitionTest { return temp; } - - /** - * @return - */ private ArrayDefinition createStringArray() { StringDeclaration strDecl = new StringDeclaration(); StringDefinition[] defs = createDefs(); ArrayDefinition temp = setUpDeclaration(strDecl, defs); return temp; } - /** - * @param decl - * @param defs - * @return - */ + private ArrayDefinition setUpDeclaration(IDeclaration decl, Definition[] defs) { ArrayDeclaration ad = new ArrayDeclaration(0, decl); @@ -107,11 +88,8 @@ public class ArrayDefinitionTest { temp.setDefinitions(defs); return temp; } - /** - * @param size - * @param bits - * @return - */ + + private static IntegerDefinition[] createIntDefs(int size, int bits) { IntegerDefinition[] defs = new IntegerDefinition[size]; for (int i = 0; i < size; i++) { @@ -123,13 +101,6 @@ public class ArrayDefinitionTest { } return defs; } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } private static StringDefinition[] createDefs() { int size = 4; diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/DefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/DefinitionTest.java index b20c965747..6c67c52d29 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/DefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/DefinitionTest.java @@ -17,8 +17,6 @@ import org.eclipse.linuxtools.ctf.core.event.io.BitBuffer; import org.eclipse.linuxtools.ctf.core.event.types.Definition; import org.eclipse.linuxtools.ctf.core.event.types.IDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.IDefinitionScope; -import org.junit.After; -import org.junit.Before; import org.junit.Test; /** @@ -31,32 +29,6 @@ import org.junit.Test; @SuppressWarnings("javadoc") public class DefinitionTest { - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(DefinitionTest.class); - } - - /** - * Perform pre-test initialization. - */ - @Before - public void setUp() { - // add additional set up code here - } - - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Since Definition is abstract, we'll minimally extend it here to * instantiate it. diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDeclarationTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDeclarationTest.java index 03d8f08b63..e43eda8e6c 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDeclarationTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDeclarationTest.java @@ -23,7 +23,6 @@ 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.IDefinitionScope; import org.eclipse.linuxtools.ctf.core.event.types.IntegerDeclaration; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -38,16 +37,6 @@ public class EnumDeclarationTest { private EnumDeclaration fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(EnumDeclarationTest.class); - } - /** * Perform pre-test initialization. */ @@ -57,14 +46,6 @@ public class EnumDeclarationTest { ByteOrder.BIG_ENDIAN, Encoding.ASCII, null, 8)); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the EnumDeclaration(IntegerDeclaration) constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDefinitionTest.java index f66b6edd90..7dbbc7c696 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EnumDefinitionTest.java @@ -23,7 +23,6 @@ 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.IntegerDeclaration; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -38,16 +37,6 @@ public class EnumDefinitionTest { private EnumDefinition fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(EnumDefinitionTest.class); - } - /** * Perform pre-test initialization. */ @@ -63,14 +52,6 @@ public class EnumDefinitionTest { fixture = new EnumDefinition(declaration, null, fieldName); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the EnumDefinition(EnumDeclaration,DefinitionScope,String) * constructor test. diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EventDeclarationTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EventDeclarationTest.java index 7711cd0a85..df5aed5fd8 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EventDeclarationTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/EventDeclarationTest.java @@ -26,7 +26,6 @@ import org.eclipse.linuxtools.ctf.core.trace.CTFTrace; import org.eclipse.linuxtools.ctf.core.trace.CTFTraceReader; import org.eclipse.linuxtools.ctf.core.trace.Stream; import org.eclipse.linuxtools.internal.ctf.core.event.EventDeclaration; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,16 +43,6 @@ public class EventDeclarationTest { private EventDeclaration fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(EventDeclarationTest.class); - } - /** * Perform pre-test initialization. * @@ -70,14 +59,6 @@ public class EventDeclarationTest { fixture.setName(""); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the EventDeclaration() constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/FloatDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/FloatDefinitionTest.java index babd2261b7..47c374124c 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/FloatDefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/FloatDefinitionTest.java @@ -20,7 +20,7 @@ import java.nio.ByteOrder; import org.eclipse.linuxtools.ctf.core.event.io.BitBuffer; import org.eclipse.linuxtools.ctf.core.event.types.FloatDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.FloatDefinition; -import org.junit.After; +import org.eclipse.linuxtools.ctf.core.event.types.IntegerDefinition; import org.junit.Before; import org.junit.Test; @@ -41,20 +41,7 @@ public class FloatDefinitionTest { private static final String fieldName = "float"; /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(IntegerDefinitionTest.class); - } - - /** - * Perform pre-test initialization. We know the structDef won't be null (or - * else the tests will fail), so we can safely suppress the warning. - * - * @throws CTFReaderException + * Perform pre-test initialization. */ @Before public void setUp(){ @@ -62,14 +49,6 @@ public class FloatDefinitionTest { testFloat5311(); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - @Test public void testFloat248() { parent = new FloatDeclaration(8, 24, ByteOrder.nativeOrder(), 0); @@ -120,6 +99,7 @@ public class FloatDefinitionTest { assertEquals(Double.NaN ,fixture.getValue(),0.1); } + /** * Run the IntegerDeclaration getDeclaration() method test. */ @@ -148,7 +128,6 @@ public class FloatDefinitionTest { singleFixture.setValue(2.0); BitBuffer input = new BitBuffer(java.nio.ByteBuffer.allocateDirect(128)); singleFixture.read(input); - } /** diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDeclarationTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDeclarationTest.java index 71cd0111c2..9c2a47184f 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDeclarationTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDeclarationTest.java @@ -18,7 +18,6 @@ import java.nio.ByteOrder; import org.eclipse.linuxtools.ctf.core.event.types.Encoding; import org.eclipse.linuxtools.ctf.core.event.types.IntegerDeclaration; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -33,16 +32,6 @@ public class IntegerDeclarationTest { private IntegerDeclaration fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(IntegerDeclarationTest.class); - } - /** * Perform pre-test initialization. */ @@ -52,14 +41,6 @@ public class IntegerDeclarationTest { Encoding.ASCII, null, 32); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the IntegerDeclaration(int,boolean,int,ByteOrder,Encoding) * constructor test. diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDefinitionTest.java index 5863a0a177..07f02d1459 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/IntegerDefinitionTest.java @@ -21,7 +21,6 @@ import org.eclipse.linuxtools.ctf.core.event.types.Encoding; import org.eclipse.linuxtools.ctf.core.event.types.IDefinitionScope; import org.eclipse.linuxtools.ctf.core.event.types.IntegerDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.IntegerDefinition; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -39,36 +38,14 @@ public class IntegerDefinitionTest { String clockName = "clock"; /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(IntegerDefinitionTest.class); - } - - /** - * Perform pre-test initialization. We know the structDef won't be null (or - * else the tests will fail), so we can safely suppress the warning. + * Perform pre-test initialization. */ @Before public void setUp() { - -// StructDefinition structDef = null; -// boolean found = false; IntegerDeclaration id = new IntegerDeclaration( 1, true, 1, ByteOrder.BIG_ENDIAN, Encoding.NONE, clockName, 8); fixture = id.createDefinition(null, name); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the IntegerDefinition(IntegerDeclaration,DefinitionScope,String) * constructor test. diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDeclarationTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDeclarationTest.java index 26923b67a3..f732ffd3bc 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDeclarationTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDeclarationTest.java @@ -24,7 +24,6 @@ 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.StructDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StructDefinition; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -41,26 +40,12 @@ public class SequenceDeclarationTest { private SequenceDeclaration fixture; static final String fieldName = "LengthName"; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(SequenceDeclarationTest.class); - } @Before public void setUp() { fixture = new SequenceDeclaration(fieldName, new StringDeclaration()); } - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the SequenceDeclaration(String,Declaration) constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDefinitionTest.java index d0045da7cb..8f875f5ca1 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/SequenceDefinitionTest.java @@ -26,7 +26,6 @@ import org.eclipse.linuxtools.ctf.core.event.types.SequenceDefinition; import org.eclipse.linuxtools.ctf.core.event.types.StructDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StructDefinition; import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -43,16 +42,6 @@ public class SequenceDefinitionTest { private SequenceDefinition fixture; private final static int seqLen = 15; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(SequenceDefinitionTest.class); - } - /** * Perform pre-test initialization. * @throws CTFReaderException @@ -81,14 +70,6 @@ public class SequenceDefinitionTest { assert (fixture != null); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - private static SequenceDefinition initNonString() throws CTFReaderException { StructDeclaration structDec; StructDefinition structDef; diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDeclarationTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDeclarationTest.java index 41e0030735..856bf49f23 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDeclarationTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDeclarationTest.java @@ -18,7 +18,6 @@ import org.eclipse.linuxtools.ctf.core.event.types.Encoding; import org.eclipse.linuxtools.ctf.core.event.types.IDefinitionScope; import org.eclipse.linuxtools.ctf.core.event.types.StringDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StringDefinition; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -33,16 +32,6 @@ public class StringDeclarationTest { private StringDeclaration fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StringDeclarationTest.class); - } - /** * Perform pre-test initialization. */ @@ -51,14 +40,6 @@ public class StringDeclarationTest { fixture = new StringDeclaration(Encoding.ASCII); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the StringDeclaration() constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDefinitionTest.java index 065af26e3e..a0fa11f280 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StringDefinitionTest.java @@ -17,7 +17,6 @@ import org.eclipse.linuxtools.ctf.core.event.io.BitBuffer; import org.eclipse.linuxtools.ctf.core.event.types.IDefinitionScope; import org.eclipse.linuxtools.ctf.core.event.types.StringDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StringDefinition; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -32,16 +31,6 @@ public class StringDefinitionTest { private StringDefinition fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StringDefinitionTest.class); - } - /** * Perform pre-test initialization. */ @@ -52,14 +41,6 @@ public class StringDefinitionTest { fixture = stringDec.createDefinition(null, name); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the StringDefinition(StringDeclaration,DefinitionScope,String) * constructor test. diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDeclarationTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDeclarationTest.java index 7d8ab256a5..c6627b4543 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDeclarationTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDeclarationTest.java @@ -22,7 +22,6 @@ import org.eclipse.linuxtools.ctf.core.event.types.IDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StringDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StructDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StructDefinition; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -37,16 +36,6 @@ public class StructDeclarationTest { private StructDeclaration fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StructDeclarationTest.class); - } - /** * Perform pre-test initialization. */ @@ -55,14 +44,6 @@ public class StructDeclarationTest { fixture = new StructDeclaration(1L); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the StructDeclaration(long) constructor test. */ diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDefinitionTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDefinitionTest.java index b45a3b2f21..b595d45b19 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDefinitionTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/StructDefinitionTest.java @@ -35,7 +35,6 @@ 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.junit.After; import org.junit.Before; import org.junit.Test; @@ -63,16 +62,6 @@ public class StructDefinitionTest { private StructDefinition simpleStruct; private static final String VAR_FIELD_NAME = "SomeVariant"; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(StructDefinitionTest.class); - } - /** * Perform pre-test initialization. */ @@ -112,15 +101,6 @@ public class StructDefinitionTest { ssDec.addField(INT_ID, id); ssDec.addField(STRING_ID, sd); simpleStruct = ssDec.createDefinition(null, TEST_STRUCT_ID); - - } - - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here } /** diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDeclarationTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDeclarationTest.java index 2f683ed529..eee99b3dd2 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDeclarationTest.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/types/VariantDeclarationTest.java @@ -24,7 +24,6 @@ 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.shared.CtfTestTraces; import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException; -import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -41,16 +40,6 @@ public class VariantDeclarationTest { private VariantDeclaration fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(VariantDeclarationTest.class); - } - /** * Perform pre-test initialization. */ @@ -59,14 +48,6 @@ public class VariantDeclarationTest { fixture = new VariantDeclaration(); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the VariantDeclaration() constructor test. */ 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 fba1c899e8..3e289d7590 100644 --- 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 @@ -35,7 +35,6 @@ 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.junit.After; import org.junit.Before; import org.junit.Test; @@ -46,21 +45,10 @@ import org.junit.Test; * @author ematkho * @version $Revision: 1.0 $ */ -@SuppressWarnings("javadoc") public class VariantDefinitionTest { private VariantDefinition fixture; - /** - * Launch the test. - * - * @param args - * the command line arguments - */ - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(VariantDefinitionTest.class); - } - StructDefinition structDefinition; private static final String TEST_STRUCT_ID = "testStruct"; @@ -82,12 +70,11 @@ public class VariantDefinitionTest { 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. * * Not sure it needs to be that complicated, oh well... - * - * @throws CTFReaderException */ @Before public void setUp() { @@ -129,18 +116,8 @@ public class VariantDefinitionTest { fixture = (VariantDefinition) structDefinition.getDefinitions().get(VAR_FIELD_NAME); } - /** - * Perform post-test clean-up. - */ - @After - public void tearDown() { - // Add additional tear down code here - } - /** * Run the VariantDefinition(VariantDeclaration,DefinitionScope,String) - * - * @throws CTFReaderException */ @Test public void testVariantDefinition() { @@ -317,8 +294,6 @@ public class VariantDefinitionTest { /** * Run the void setTagDefinition(EnumDefinition) method test. - * - * @throws CTFReaderException */ @Test public void testSetTagDefinition(){ -- 2.34.1