From d291a71561486ca4dab1909c6573a75d0a0750fd Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Fri, 26 Jun 2015 00:54:04 -0400 Subject: [PATCH] Use o.e.test and jdt.annotation from Eclipse 4.5 Also fix use of deprecated junit constructor. This is because o.e.test *includes* org.junit and the Eclipse 4.5 repo only has junit 4.12 which introduced the deprecation. Change-Id: Id17e904674509a3a551f253f8b6927f023ba935c Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/50905 Reviewed-by: Hudson CI Reviewed-by: Alexandre Montplaisir Tested-by: Alexandre Montplaisir --- .../core/tests/collect/BufferedBlockingQueueTest.java | 2 +- .../ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java | 3 ++- .../ctf/core/tests/trace/TraceReadAllTracesTest.java | 3 ++- .../core/tests/event/CtfTmfLostEventStatisticsTest.java | 3 ++- .../ctf/core/tests/temp/request/TmfSchedulerTest.java | 3 ++- .../core/tests/temp/statistics/TmfStatisticsTest.java | 3 ++- .../tmf/ctf/core/tests/trace/FunkyTraceTest.java | 4 +++- .../analysis/kernel/statesystem/StateSystemTest.java | 3 ++- .../ust/core/tests/callstack/AbstractProviderTest.java | 3 ++- .../tracecompass-e4.5.target | 9 +++------ .../tracecompass-eStaging.target | 6 +++--- .../statesystem/ExperimentStateSystemModuleTest.java | 4 +++- .../tests/statesystem/StateSystemAnalysisModuleTest.java | 4 +++- .../tmf/core/tests/synchronization/TimeOffsetTest.java | 3 ++- .../tracecompass/tmf/core/tests/trace/TmfTraceTest.java | 3 ++- 15 files changed, 34 insertions(+), 22 deletions(-) diff --git a/common/org.eclipse.tracecompass.common.core.tests/src/org/eclipse/tracecompass/common/core/tests/collect/BufferedBlockingQueueTest.java b/common/org.eclipse.tracecompass.common.core.tests/src/org/eclipse/tracecompass/common/core/tests/collect/BufferedBlockingQueueTest.java index 8a27e93f3c..0b3891bfa2 100644 --- a/common/org.eclipse.tracecompass.common.core.tests/src/org/eclipse/tracecompass/common/core/tests/collect/BufferedBlockingQueueTest.java +++ b/common/org.eclipse.tracecompass.common.core.tests/src/org/eclipse/tracecompass/common/core/tests/collect/BufferedBlockingQueueTest.java @@ -54,7 +54,7 @@ public class BufferedBlockingQueueTest { /** Timeout the tests after 2 minutes */ @Rule - public TestRule timeoutRule = new Timeout(120000); + public TestRule timeoutRule = new Timeout(2, TimeUnit.MINUTES); private static final String testString = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz" + "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz" + diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java index d485917ec1..8362c924b7 100644 --- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java +++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.LinkedList; import java.util.List; +import java.util.concurrent.TimeUnit; import org.eclipse.tracecompass.ctf.core.CTFException; import org.eclipse.tracecompass.ctf.core.trace.CTFTrace; @@ -46,7 +47,7 @@ public class CtfTestSuiteTests { /** Time-out tests after 10 seconds. */ @Rule - public TestRule globalTimeout = new Timeout(10000); + public TestRule globalTimeout = new Timeout(10, TimeUnit.SECONDS); private static final Path BASE_PATH = Paths.get("traces", "ctf-testsuite", "tests", "1.8"); diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/TraceReadAllTracesTest.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/TraceReadAllTracesTest.java index fccfecb85c..e1f9d2b867 100644 --- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/TraceReadAllTracesTest.java +++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/TraceReadAllTracesTest.java @@ -18,6 +18,7 @@ import static org.junit.Assume.assumeTrue; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; import org.eclipse.tracecompass.ctf.core.CTFException; import org.eclipse.tracecompass.ctf.core.CTFStrings; @@ -45,7 +46,7 @@ public class TraceReadAllTracesTest { /** Time-out tests after 20 seconds. */ @Rule - public TestRule globalTimeout = new Timeout(20000); + public TestRule globalTimeout = new Timeout(20, TimeUnit.SECONDS); /** * Get the list of traces diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventStatisticsTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventStatisticsTest.java index ad31fa9b3c..f08c91d40d 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventStatisticsTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventStatisticsTest.java @@ -19,6 +19,7 @@ import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; import java.util.Map; +import java.util.concurrent.TimeUnit; import org.eclipse.tracecompass.ctf.core.CTFStrings; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; @@ -46,7 +47,7 @@ public class CtfTmfLostEventStatisticsTest { /** Time-out tests after 30 seconds */ @Rule - public TestRule globalTimeout= new Timeout(30000); + public TestRule globalTimeout= new Timeout(30, TimeUnit.SECONDS); /**Test trace with lost events */ private static final CtfTmfTestTrace lostEventsTrace = CtfTmfTestTrace.HELLO_LOST; diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java index 386c48c6dd..f310a2a99f 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java @@ -21,6 +21,7 @@ import static org.junit.Assume.assumeTrue; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import java.util.concurrent.TimeUnit; import org.eclipse.core.resources.IResource; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; @@ -49,7 +50,7 @@ public class TmfSchedulerTest { /** Time-out tests after 60 seconds */ @Rule - public TestRule globalTimeout= new Timeout(60000); + public TestRule globalTimeout= new Timeout(1, TimeUnit.MINUTES); // ------------------------------------------------------------------------ // Constants diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStatisticsTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStatisticsTest.java index 7a71c9fa3d..371d05b384 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStatisticsTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStatisticsTest.java @@ -16,6 +16,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import org.eclipse.tracecompass.tmf.core.statistics.ITmfStatistics; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; @@ -33,7 +34,7 @@ import org.junit.rules.Timeout; public abstract class TmfStatisticsTest { /** Time-out tests after 30 seconds */ - @Rule public TestRule globalTimeout= new Timeout(30000); + @Rule public TestRule globalTimeout= new Timeout(30, TimeUnit.SECONDS); /** Test trace used for these tests */ protected static final CtfTmfTestTrace testTrace = CtfTmfTestTrace.KERNEL; diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java index a5f4ed3b5b..58abcdb357 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java @@ -16,6 +16,8 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assume.assumeTrue; +import java.util.concurrent.TimeUnit; + import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; @@ -42,7 +44,7 @@ public class FunkyTraceTest { /** Time-out tests after 20 seconds */ @Rule - public TestRule globalTimeout= new Timeout(20000); + public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); // ------------------------------------------------------------------------ // Attributes diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemTest.java index a66b2a0494..752bdec3cd 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; import java.util.List; +import java.util.concurrent.TimeUnit; import org.eclipse.tracecompass.analysis.os.linux.core.kernelanalysis.Attributes; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; @@ -46,7 +47,7 @@ public abstract class StateSystemTest { /** Timeout the tests after 2 minutes */ @Rule - public TestRule timeoutRule = new Timeout(120000); + public TestRule timeoutRule = new Timeout(2, TimeUnit.MINUTES); /** Test trace used for these tests */ protected static final CtfTmfTestTrace testTrace = CtfTmfTestTrace.TRACE2; diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java index d5b979b5cf..29a4821cd7 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.fail; import java.io.File; import java.util.List; +import java.util.concurrent.TimeUnit; import org.eclipse.tracecompass.internal.lttng2.ust.core.callstack.LttngUstCallStackProvider; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; @@ -51,7 +52,7 @@ import org.junit.rules.Timeout; public abstract class AbstractProviderTest { /** Time-out tests after 20 seconds */ - @Rule public TestRule globalTimeout= new Timeout(20000); + @Rule public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); // ------------------------------------------------------------------------ // Attributes diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target index 45623f93cf..b9f2d0c0cf 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.5.target @@ -1,5 +1,5 @@ - + @@ -38,12 +38,9 @@ - - - - - + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target index e7f9c8c6b7..b0a1b2be22 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target @@ -1,5 +1,5 @@ - + @@ -36,8 +36,8 @@ - - + + diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/ExperimentStateSystemModuleTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/ExperimentStateSystemModuleTest.java index ff2540c0c2..141293a7bc 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/ExperimentStateSystemModuleTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/ExperimentStateSystemModuleTest.java @@ -17,6 +17,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import java.util.concurrent.TimeUnit; + import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException; import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException; @@ -45,7 +47,7 @@ public class ExperimentStateSystemModuleTest { /** Time-out tests after some time */ @Rule - public TestRule globalTimeout = new Timeout(60000); + public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES); /** ID of the test state system analysis module */ public static final String MODULE_SS = "org.eclipse.linuxtools.tmf.core.tests.experiment"; diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/StateSystemAnalysisModuleTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/StateSystemAnalysisModuleTest.java index be90c6a5f6..dd212311ea 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/StateSystemAnalysisModuleTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/StateSystemAnalysisModuleTest.java @@ -16,6 +16,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import java.util.concurrent.TimeUnit; + import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.tmf.core.signal.TmfSignalManager; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; @@ -38,7 +40,7 @@ public class StateSystemAnalysisModuleTest { /** Time-out tests after 20 seconds */ @Rule - public TestRule globalTimeout= new Timeout(20000); + public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); /** ID of the test state system analysis module */ public static final String MODULE_SS = "org.eclipse.linuxtools.tmf.core.tests.analysis.sstest"; diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/synchronization/TimeOffsetTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/synchronization/TimeOffsetTest.java index b2ff1b2ea7..289ca8799d 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/synchronization/TimeOffsetTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/synchronization/TimeOffsetTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; import java.net.URL; +import java.util.concurrent.TimeUnit; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -52,7 +53,7 @@ public class TimeOffsetTest { /** Time-out tests after 20 seconds */ @Rule - public TestRule globalTimeout= new Timeout(20000); + public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); // ------------------------------------------------------------------------ // Variables diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java index 74e7a6c502..840893f357 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.Vector; +import java.util.concurrent.TimeUnit; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; @@ -66,7 +67,7 @@ public class TmfTraceTest { /** Time-out tests after 20 seconds */ @Rule - public TestRule globalTimeout= new Timeout(20000); + public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); // ------------------------------------------------------------------------ // Variables -- 2.34.1