From 9722e5d77b96ea1b312279325f1dd1387756f465 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 28 Oct 2014 17:12:42 -0400 Subject: [PATCH] tmf.ctf: Split the classes into proper packages Change-Id: Ice64f1c902bc75715f02516ee7dd82b1175c8a05 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/35616 Tested-by: Hudson CI Reviewed-by: Genevieve Bastien --- .../relayd/LttngRelaydConnectionManager.java | 2 +- .../ui/relayd/LttngRelaydConsumer.java | 4 +-- .../perf/analysis/AnalysisBenchmark.java | 2 +- .../matching/EventMatchingBenchmark.java | 2 +- .../TraceSynchronizationBenchmark.java | 2 +- .../analysis/LttngKernelAnalysisTest.java | 2 +- .../matchandsync/ExperimentSyncTest.java | 2 +- .../event/matchandsync/MatchAndSyncTest.java | 2 +- .../stateprovider/GenerateTestValues.java | 2 +- .../stateprovider/PartialStateSystemTest.java | 2 +- .../StateSystemFullHistoryTest.java | 2 +- .../StateSystemInMemoryTest.java | 2 +- .../plugin.xml | 2 +- .../core/event/matching/TcpEventMatching.java | 2 +- .../event/matching/TcpLttngEventMatching.java | 2 +- .../kernel/core/trace/LttngKernelTrace.java | 2 +- .../tests/ImportAndReadKernelSmokeTest.java | 4 +-- .../trace/callstack/AbstractProviderTest.java | 2 +- .../plugin.xml | 2 +- .../memoryusage/MemoryUsageStateProvider.java | 2 +- .../callstack/LttngUstCallStackProvider.java | 2 +- .../lttng2/ust/core/trace/LttngUstTrace.java | 2 +- .../StateProviderModuleTest.java | 2 +- .../META-INF/MANIFEST.MF | 8 ++--- .../perf/experiment/ExperimentBenchmark.java | 4 +-- .../plugin.xml | 2 +- .../core/tests/shared/CtfTmfTestTrace.java | 4 +-- .../tmf/ctf/core/tests/AllTests.java | 29 ++++++--------- .../tmf/ctf/core/tests/context/AllTests.java | 29 +++++++++++++++ .../{ => context}/CtfLocationDataTest.java | 4 +-- .../tests/{ => context}/CtfLocationTest.java | 6 ++-- .../{ => context}/CtfTmfContextTest.java | 8 ++--- .../tmf/ctf/core/tests/event/AllTests.java | 32 +++++++++++++++++ .../{ => event}/CtfTmfEventFieldTest.java | 4 +-- .../tests/{ => event}/CtfTmfEventTest.java | 10 +++--- .../{ => event}/CtfTmfEventTypeTest.java | 4 +-- .../CtfTmfLostEventStatisticsTest.java | 2 +- .../{ => event}/CtfTmfLostEventsTest.java | 8 ++--- .../tests/{ => event}/EventContextTest.java | 8 ++--- .../tmf/ctf/core/tests/iterator/AllTests.java | 27 ++++++++++++++ .../tests/{ => iterator}/CtfIteratorTest.java | 12 +++---- .../tests/{ => temp}/headless/Benchmark.java | 8 ++--- .../{ => temp}/headless/RequestBenchmark.java | 6 ++-- .../tests/{ => temp}/request/AllTests.java | 2 +- .../request/TmfSchedulerBenchmark.java | 4 +-- .../{ => temp}/request/TmfSchedulerTest.java | 6 ++-- .../tests/{ => temp}/statistics/AllTests.java | 2 +- .../statistics/TmfEventsStatisticsTest.java | 2 +- .../statistics/TmfStateStatisticsTest.java | 2 +- .../statistics/TmfStatisticsTest.java | 2 +- .../{ => temp}/tracemanager/AllTests.java | 2 +- .../tracemanager/TmfTraceManagerTest.java | 2 +- .../ctf/core/tests/timestamp/AllTests.java | 27 ++++++++++++++ .../{ => timestamp}/CtfTmfTimestampTest.java | 4 +-- .../tmf/ctf/core/tests/trace/AllTests.java | 28 +++++++++++++++ .../tests/{ => trace}/CtfTmfTraceTest.java | 12 +++---- .../tests/{ => trace}/FunkyTraceTest.java | 6 ++-- .../ctf/core/tests/stubs/CtfTmfTraceStub.java | 2 +- .../META-INF/MANIFEST.MF | 8 ++++- .../plugin.xml | 4 +-- .../ctf/core/{ => context}/CtfLocation.java | 3 +- .../core/{ => context}/CtfLocationInfo.java | 3 +- .../ctf/core/{ => context}/CtfTmfContext.java | 5 ++- .../tmf/ctf/core/{ => event}/CtfTmfEvent.java | 6 +++- .../core/{ => event}/CtfTmfEventFactory.java | 4 ++- .../core/{ => event}/CtfTmfEventField.java | 3 +- .../ctf/core/{ => event}/CtfTmfEventType.java | 2 +- .../ctf/core/{ => event}/CtfTmfLostEvent.java | 4 ++- .../tmf/ctf/core/event/Messages.java | 35 +++++++++++++++++++ .../{ => event/lookup}/CtfTmfCallsite.java | 8 ++--- .../tmf/ctf/core/event/messages.properties | 13 +++++++ .../core/{ => timestamp}/CtfTmfTimestamp.java | 2 +- .../tmf/ctf/core/{ => trace}/CtfTmfTrace.java | 18 ++++++++-- .../tmf/ctf/core/{ => trace}/Messages.java | 21 ++++------- .../{ => trace/iterator}/CtfIterator.java | 7 +++- .../iterator}/CtfIteratorManager.java | 6 +++- .../ctf/core/{ => trace}/messages.properties | 3 +- .../tests/AbstractImportAndReadSmokeTest.java | 4 +-- 78 files changed, 371 insertions(+), 156 deletions(-) create mode 100644 org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/AllTests.java rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => context}/CtfLocationDataTest.java (95%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => context}/CtfLocationTest.java (93%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => context}/CtfTmfContextTest.java (93%) create mode 100644 org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/AllTests.java rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => event}/CtfTmfEventFieldTest.java (98%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => event}/CtfTmfEventTest.java (95%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => event}/CtfTmfEventTypeTest.java (93%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => event}/CtfTmfLostEventStatisticsTest.java (98%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => event}/CtfTmfLostEventsTest.java (96%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => event}/EventContextTest.java (97%) create mode 100644 org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/iterator/AllTests.java rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => iterator}/CtfIteratorTest.java (94%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/headless/Benchmark.java (92%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/headless/RequestBenchmark.java (95%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/request/AllTests.java (88%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/request/TmfSchedulerBenchmark.java (99%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/request/TmfSchedulerTest.java (98%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/statistics/AllTests.java (91%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/statistics/TmfEventsStatisticsTest.java (93%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/statistics/TmfStateStatisticsTest.java (97%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/statistics/TmfStatisticsTest.java (99%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/tracemanager/AllTests.java (87%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => temp}/tracemanager/TmfTraceManagerTest.java (99%) create mode 100644 org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/timestamp/AllTests.java rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => timestamp}/CtfTmfTimestampTest.java (92%) create mode 100644 org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/AllTests.java rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => trace}/CtfTmfTraceTest.java (96%) rename org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/{ => trace}/FunkyTraceTest.java (97%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => context}/CtfLocation.java (98%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => context}/CtfLocationInfo.java (98%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => context}/CtfTmfContext.java (95%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => event}/CtfTmfEvent.java (96%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => event}/CtfTmfEventFactory.java (96%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => event}/CtfTmfEventField.java (99%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => event}/CtfTmfEventType.java (95%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => event}/CtfTmfLostEvent.java (93%) create mode 100644 org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/Messages.java rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => event/lookup}/CtfTmfCallsite.java (94%) create mode 100644 org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/messages.properties rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => timestamp}/CtfTmfTimestamp.java (95%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => trace}/CtfTmfTrace.java (95%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => trace}/Messages.java (74%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => trace/iterator}/CtfIterator.java (96%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => trace/iterator}/CtfIteratorManager.java (96%) rename org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/{ => trace}/messages.properties (88%) diff --git a/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/relayd/LttngRelaydConnectionManager.java b/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/relayd/LttngRelaydConnectionManager.java index 85cc083f69..f6a7f92a51 100644 --- a/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/relayd/LttngRelaydConnectionManager.java +++ b/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/relayd/LttngRelaydConnectionManager.java @@ -27,7 +27,7 @@ import org.eclipse.tracecompass.tmf.core.signal.TmfTraceClosedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.ctf.core.CtfConstants; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.eclipse.ui.PlatformUI; /** diff --git a/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/relayd/LttngRelaydConsumer.java b/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/relayd/LttngRelaydConsumer.java index 2aa1b66512..ce0e2e1ecd 100644 --- a/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/relayd/LttngRelaydConsumer.java +++ b/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/relayd/LttngRelaydConsumer.java @@ -38,8 +38,8 @@ import org.eclipse.tracecompass.internal.lttng2.control.core.relayd.lttngviewerC import org.eclipse.tracecompass.internal.lttng2.control.ui.Activator; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTimestamp; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * Consumer of the relay d. diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/analysis/AnalysisBenchmark.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/analysis/AnalysisBenchmark.java index 4461dc19fd..6a7a288817 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/analysis/AnalysisBenchmark.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/analysis/AnalysisBenchmark.java @@ -28,7 +28,7 @@ import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException; import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException; import org.eclipse.tracecompass.tmf.core.tests.shared.TmfTestHelper; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; import org.junit.Test; diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java index f3d5544c0e..4eb631dc5f 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/event/matching/EventMatchingBenchmark.java @@ -24,8 +24,8 @@ import org.eclipse.tracecompass.lttng2.kernel.core.event.matching.TcpLttngEventM import org.eclipse.tracecompass.tmf.core.event.matching.TmfEventMatching; import org.eclipse.tracecompass.tmf.core.event.matching.TmfNetworkEventMatching; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.BeforeClass; import org.junit.Test; diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java index 2b07d4690d..61e6bb7f5a 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/perf/org/eclipse/tracecompass/lttng2/kernel/core/tests/perf/event/matching/TraceSynchronizationBenchmark.java @@ -26,8 +26,8 @@ import org.eclipse.tracecompass.tmf.core.event.matching.TmfEventMatching; import org.eclipse.tracecompass.tmf.core.synchronization.SynchronizationAlgorithm; import org.eclipse.tracecompass.tmf.core.synchronization.SynchronizationManager; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.BeforeClass; import org.junit.Test; diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java index 457c2546ed..d0ef904d54 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/LttngKernelAnalysisTest.java @@ -31,8 +31,8 @@ import org.eclipse.tracecompass.tmf.core.analysis.TmfAnalysisRequirement; import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException; import org.eclipse.tracecompass.tmf.core.tests.shared.TmfTestHelper; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/event/matchandsync/ExperimentSyncTest.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/event/matchandsync/ExperimentSyncTest.java index 5e02fdc9e7..44d9c17e6d 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/event/matchandsync/ExperimentSyncTest.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/event/matchandsync/ExperimentSyncTest.java @@ -23,8 +23,8 @@ import org.eclipse.tracecompass.tmf.core.synchronization.SynchronizationAlgorith import org.eclipse.tracecompass.tmf.core.synchronization.TimestampTransformFactory; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfExperiment; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.BeforeClass; import org.junit.Test; diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/event/matchandsync/MatchAndSyncTest.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/event/matchandsync/MatchAndSyncTest.java index 64bb565a53..c6bdc822ac 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/event/matchandsync/MatchAndSyncTest.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/event/matchandsync/MatchAndSyncTest.java @@ -24,8 +24,8 @@ import org.eclipse.tracecompass.lttng2.kernel.core.event.matching.TcpLttngEventM import org.eclipse.tracecompass.tmf.core.event.matching.TmfEventMatching; import org.eclipse.tracecompass.tmf.core.event.matching.TmfNetworkEventMatching; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.Test; /** diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/GenerateTestValues.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/GenerateTestValues.java index 5559a1673c..d07a8a213d 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/GenerateTestValues.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/GenerateTestValues.java @@ -23,8 +23,8 @@ import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval; import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue; import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * Small program to regenerate the values used in "TestValues.java" from the diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/PartialStateSystemTest.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/PartialStateSystemTest.java index 4051d49ce6..8656bb4b74 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/PartialStateSystemTest.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/PartialStateSystemTest.java @@ -28,7 +28,7 @@ import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; import org.junit.Test; diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/StateSystemFullHistoryTest.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/StateSystemFullHistoryTest.java index 6f9d0204cc..8b42822df7 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/StateSystemFullHistoryTest.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/StateSystemFullHistoryTest.java @@ -30,7 +30,7 @@ import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; import org.junit.Test; diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/StateSystemInMemoryTest.java b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/StateSystemInMemoryTest.java index e1ebb88853..808519683c 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/StateSystemInMemoryTest.java +++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/stateprovider/StateSystemInMemoryTest.java @@ -22,7 +22,7 @@ import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException; import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; /** diff --git a/org.eclipse.tracecompass.lttng2.kernel.core/plugin.xml b/org.eclipse.tracecompass.lttng2.kernel.core/plugin.xml index b317468431..86ce5bb527 100644 --- a/org.eclipse.tracecompass.lttng2.kernel.core/plugin.xml +++ b/org.eclipse.tracecompass.lttng2.kernel.core/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.linuxtools.tmf.core.tracetype"> TestAll builds a suite that can be used to run all - * of the tests within its package as well as within any subpackages of its + * The class TestAll builds a suite that can be used to run all of + * the tests within its package as well as within any subpackages of its * package. * * @author ematkho */ @RunWith(DebugSuite.class) @DebugSuite.SuiteClasses({ - CtfIteratorTest.class, - CtfLocationDataTest.class, - CtfLocationTest.class, - CtfTmfContextTest.class, - CtfTmfEventFieldTest.class, - CtfTmfEventTest.class, - CtfTmfEventTypeTest.class, - CtfTmfLostEventsTest.class, - CtfTmfTimestampTest.class, - CtfTmfTraceTest.class, - EventContextTest.class, - FunkyTraceTest.class, + org.eclipse.tracecompass.tmf.ctf.core.tests.context.AllTests.class, + org.eclipse.tracecompass.tmf.ctf.core.tests.event.AllTests.class, + org.eclipse.tracecompass.tmf.ctf.core.tests.iterator.AllTests.class, + org.eclipse.tracecompass.tmf.ctf.core.tests.timestamp.AllTests.class, + org.eclipse.tracecompass.tmf.ctf.core.tests.trace.AllTests.class, - /* Tests in other packages (that are there because of CTF) */ - org.eclipse.tracecompass.tmf.ctf.core.tests.request.AllTests.class, - org.eclipse.tracecompass.tmf.ctf.core.tests.statistics.AllTests.class, - org.eclipse.tracecompass.tmf.ctf.core.tests.tracemanager.AllTests.class + /* Tests in other packages (that are there because of CTF) */ + org.eclipse.tracecompass.tmf.ctf.core.tests.temp.request.AllTests.class, + org.eclipse.tracecompass.tmf.ctf.core.tests.temp.statistics.AllTests.class, + org.eclipse.tracecompass.tmf.ctf.core.tests.temp.tracemanager.AllTests.class }) public class AllTests { diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/AllTests.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/AllTests.java new file mode 100644 index 0000000000..a837f59d2e --- /dev/null +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/AllTests.java @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alexandre Montplaisir - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ctf.core.tests.context; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * Test suite + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + CtfLocationDataTest.class, + CtfLocationTest.class, + CtfTmfContextTest.class +}) +public class AllTests { + +} \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfLocationDataTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfLocationDataTest.java similarity index 95% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfLocationDataTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfLocationDataTest.java index 44707c0fd4..039832a045 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfLocationDataTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfLocationDataTest.java @@ -10,13 +10,13 @@ * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.context; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.eclipse.tracecompass.tmf.ctf.core.CtfLocationInfo; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocationInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfLocationTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfLocationTest.java similarity index 93% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfLocationTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfLocationTest.java index 299cbe2acc..fd7067495f 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfLocationTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfLocationTest.java @@ -11,15 +11,15 @@ * Alexandre Montplaisir - Clean up, consolidate redundant tests *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.context; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.tracecompass.tmf.ctf.core.CtfLocation; -import org.eclipse.tracecompass.tmf.ctf.core.CtfLocationInfo; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocation; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocationInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfContextTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfTmfContextTest.java similarity index 93% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfContextTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfTmfContextTest.java index 2eb96bdda0..28e992314e 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfContextTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/context/CtfTmfContextTest.java @@ -12,7 +12,7 @@ * Patrick Tasse - Updated for removal of context clone *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.context; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; @@ -21,10 +21,10 @@ import java.util.ArrayList; import org.eclipse.core.resources.IResource; import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfContext; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfTmfContext; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/AllTests.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/AllTests.java new file mode 100644 index 0000000000..a01d370af5 --- /dev/null +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/AllTests.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alexandre Montplaisir - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ctf.core.tests.event; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * Test suite + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + CtfTmfEventFieldTest.class, + CtfTmfEventTest.class, + CtfTmfEventTypeTest.class, + CtfTmfLostEventStatisticsTest.class, + CtfTmfLostEventsTest.class, + EventContextTest.class +}) +public class AllTests { + +} \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventFieldTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventFieldTest.java similarity index 98% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventFieldTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventFieldTest.java index c81eef77ae..a188ced149 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventFieldTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventFieldTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Clean up, consolidate redundant tests *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.event; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -34,7 +34,7 @@ import org.eclipse.tracecompass.ctf.core.event.types.VariantDeclaration; import org.eclipse.tracecompass.ctf.core.trace.CTFReaderException; import org.eclipse.tracecompass.internal.ctf.core.event.types.ArrayDeclaration; import org.eclipse.tracecompass.internal.ctf.core.event.types.SequenceDeclaration; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEventField; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEventField; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventTest.java similarity index 95% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventTest.java index ef4ed64b40..e12ca5376d 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Clean up, consolidate redundant tests *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.event; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,11 +26,11 @@ import org.eclipse.tracecompass.ctf.core.trace.CTFReaderException; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.event.ITmfEventType; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; -import org.eclipse.tracecompass.tmf.ctf.core.CtfIterator; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEventFactory; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEventFactory; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.iterator.CtfIterator; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventTypeTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventTypeTest.java similarity index 93% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventTypeTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventTypeTest.java index fce78a763e..a3a054b4b0 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfEventTypeTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventTypeTest.java @@ -11,14 +11,14 @@ * Alexandre Montplaisir - Clean up, consolidate redundant tests *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.event; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.event.TmfEventField; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEventType; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEventType; import org.junit.Test; /** diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfLostEventStatisticsTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventStatisticsTest.java similarity index 98% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfLostEventStatisticsTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventStatisticsTest.java index 7e722d0859..b335e69b6f 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfLostEventStatisticsTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventStatisticsTest.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation ******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.event; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfLostEventsTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventsTest.java similarity index 96% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfLostEventsTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventsTest.java index de67ea5c31..01aed24b73 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfLostEventsTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfLostEventsTest.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.event; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,10 +24,10 @@ import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTimestamp; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/EventContextTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/EventContextTest.java similarity index 97% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/EventContextTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/EventContextTest.java index 2791fa663f..6ed7693f30 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/EventContextTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/EventContextTest.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.event; import static org.junit.Assert.assertEquals; import static org.junit.Assume.assumeTrue; @@ -22,10 +22,10 @@ import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTimestamp; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/iterator/AllTests.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/iterator/AllTests.java new file mode 100644 index 0000000000..7a76947636 --- /dev/null +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/iterator/AllTests.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alexandre Montplaisir - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ctf.core.tests.iterator; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * Test suite + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + CtfIteratorTest.class +}) +public class AllTests { + +} \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfIteratorTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/iterator/CtfIteratorTest.java similarity index 94% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfIteratorTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/iterator/CtfIteratorTest.java index 8f5af28198..3eb7e84239 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfIteratorTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/iterator/CtfIteratorTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Clean up, consolidate redundant tests *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.iterator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -20,12 +20,12 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; import org.eclipse.tracecompass.ctf.core.trace.CTFReaderException; -import org.eclipse.tracecompass.tmf.ctf.core.CtfIterator; -import org.eclipse.tracecompass.tmf.ctf.core.CtfLocation; -import org.eclipse.tracecompass.tmf.ctf.core.CtfLocationInfo; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocation; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocationInfo; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.iterator.CtfIterator; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/headless/Benchmark.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/headless/Benchmark.java similarity index 92% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/headless/Benchmark.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/headless/Benchmark.java index 5d9f31e4e9..f10d9ccf75 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/headless/Benchmark.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/headless/Benchmark.java @@ -10,14 +10,14 @@ * Matthew Khouzam - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.headless; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.headless; import java.util.Vector; import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfContext; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfTmfContext; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * Test and benchmark reading a CTF LTTng kernel trace. diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/headless/RequestBenchmark.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/headless/RequestBenchmark.java similarity index 95% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/headless/RequestBenchmark.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/headless/RequestBenchmark.java index ae1be87f5d..3446adae98 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/headless/RequestBenchmark.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/headless/RequestBenchmark.java @@ -11,7 +11,7 @@ * Matthew Khouzam - Update to CtfTmf trace and events *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.headless; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.headless; import java.util.Vector; @@ -20,8 +20,8 @@ import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfExperiment; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * Benchmark the event request subsystem of TMF. diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/AllTests.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/AllTests.java similarity index 88% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/AllTests.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/AllTests.java index 7708dbfd48..3528d8554f 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/AllTests.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/AllTests.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.request; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.request; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/TmfSchedulerBenchmark.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerBenchmark.java similarity index 99% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/TmfSchedulerBenchmark.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerBenchmark.java index 501feb5e9c..60d991a400 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/TmfSchedulerBenchmark.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerBenchmark.java @@ -10,7 +10,7 @@ * Simon Delisle - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.request; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.request; import java.io.PrintWriter; @@ -18,8 +18,8 @@ import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest; import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * Benchmark for the request scheduler diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/TmfSchedulerTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java similarity index 98% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/TmfSchedulerTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java index cf8afbf060..a55b043854 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/request/TmfSchedulerTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java @@ -10,7 +10,7 @@ * Simon Delisle - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.request; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.request; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -31,9 +31,9 @@ import org.eclipse.tracecompass.tmf.core.signal.TmfTimeSynchSignal; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/AllTests.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/AllTests.java similarity index 91% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/AllTests.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/AllTests.java index 264bddda60..43d938ec9d 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/AllTests.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/AllTests.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation ******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.statistics; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.statistics; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfEventsStatisticsTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfEventsStatisticsTest.java similarity index 93% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfEventsStatisticsTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfEventsStatisticsTest.java index b393fdbfb8..67415c6e3f 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfEventsStatisticsTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfEventsStatisticsTest.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation ******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.statistics; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.statistics; import static org.junit.Assume.assumeTrue; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfStateStatisticsTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStateStatisticsTest.java similarity index 97% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfStateStatisticsTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStateStatisticsTest.java index edb1ebc2ce..b3e161caa7 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfStateStatisticsTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStateStatisticsTest.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation ******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.statistics; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.statistics; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfStatisticsTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStatisticsTest.java similarity index 99% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfStatisticsTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStatisticsTest.java index 6ddf662f05..7a71c9fa3d 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/statistics/TmfStatisticsTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/statistics/TmfStatisticsTest.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation ******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.statistics; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.statistics; import static org.junit.Assert.assertEquals; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/tracemanager/AllTests.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/AllTests.java similarity index 87% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/tracemanager/AllTests.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/AllTests.java index 27c9e8963a..1c4b8719ec 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/tracemanager/AllTests.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/AllTests.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.tracemanager; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.tracemanager; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/tracemanager/TmfTraceManagerTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java similarity index 99% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/tracemanager/TmfTraceManagerTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java index 9cabdc3a72..03b47bc2fe 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/tracemanager/TmfTraceManagerTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java @@ -11,7 +11,7 @@ * Patrick Tasse - Support selection range *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests.tracemanager; +package org.eclipse.tracecompass.tmf.ctf.core.tests.temp.tracemanager; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/timestamp/AllTests.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/timestamp/AllTests.java new file mode 100644 index 0000000000..8c1dc2bc36 --- /dev/null +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/timestamp/AllTests.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alexandre Montplaisir - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ctf.core.tests.timestamp; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * Test suite + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + CtfTmfTimestampTest.class +}) +public class AllTests { + +} \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfTimestampTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/timestamp/CtfTmfTimestampTest.java similarity index 92% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfTimestampTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/timestamp/CtfTmfTimestampTest.java index 1c1d06cb8e..733bf3200e 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfTimestampTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/timestamp/CtfTmfTimestampTest.java @@ -12,7 +12,7 @@ * Patrick Tasse - Fix for local time zone *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.timestamp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,7 +21,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; import org.junit.Test; /** diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/AllTests.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/AllTests.java new file mode 100644 index 0000000000..6a60a2a780 --- /dev/null +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/AllTests.java @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alexandre Montplaisir - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ctf.core.tests.trace; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * Test suite + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + CtfTmfTraceTest.class, + FunkyTraceTest.class +}) +public class AllTests { + +} \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfTraceTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/CtfTmfTraceTest.java similarity index 96% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfTraceTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/CtfTmfTraceTest.java index fafda209e5..653f679fed 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/CtfTmfTraceTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/CtfTmfTraceTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Clean up, consolidate redundant tests *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.trace; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,12 +36,12 @@ import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; import org.eclipse.tracecompass.tmf.core.trace.TmfEventTypeCollectionHelper; -import org.eclipse.tracecompass.tmf.ctf.core.CtfLocation; -import org.eclipse.tracecompass.tmf.ctf.core.CtfLocationInfo; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTimestamp; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocation; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocationInfo; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/FunkyTraceTest.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java similarity index 97% rename from org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/FunkyTraceTest.java rename to org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java index f86236f064..a5f4ed3b5b 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/FunkyTraceTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core.tests; +package org.eclipse.tracecompass.tmf.ctf.core.tests.trace; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -21,9 +21,9 @@ import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.ctf.core.CtfEnumPair; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/org.eclipse.tracecompass.tmf.ctf.core.tests/stubs/org/eclipse/tracecompass/tmf/ctf/core/tests/stubs/CtfTmfTraceStub.java b/org.eclipse.tracecompass.tmf.ctf.core.tests/stubs/org/eclipse/tracecompass/tmf/ctf/core/tests/stubs/CtfTmfTraceStub.java index 0e968f182b..c97dc3171f 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core.tests/stubs/org/eclipse/tracecompass/tmf/ctf/core/tests/stubs/CtfTmfTraceStub.java +++ b/org.eclipse.tracecompass.tmf.ctf.core.tests/stubs/org/eclipse/tracecompass/tmf/ctf/core/tests/stubs/CtfTmfTraceStub.java @@ -15,7 +15,7 @@ package org.eclipse.tracecompass.tmf.ctf.core.tests.stubs; import org.eclipse.tracecompass.tmf.core.signal.TmfSignalManager; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceSelectedSignal; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * Dummy test ctf trace diff --git a/org.eclipse.tracecompass.tmf.ctf.core/META-INF/MANIFEST.MF b/org.eclipse.tracecompass.tmf.ctf.core/META-INF/MANIFEST.MF index db5c2f7f64..abd9c29e98 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/META-INF/MANIFEST.MF +++ b/org.eclipse.tracecompass.tmf.ctf.core/META-INF/MANIFEST.MF @@ -13,6 +13,12 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.ctf.core;bundle-version="3.1.0", org.eclipse.tracecompass.tmf.core;bundle-version="3.1.0" Export-Package: org.eclipse.tracecompass.internal.tmf.ctf.core;x-internal:=true, - org.eclipse.tracecompass.tmf.ctf.core + org.eclipse.tracecompass.tmf.ctf.core, + org.eclipse.tracecompass.tmf.ctf.core.context, + org.eclipse.tracecompass.tmf.ctf.core.event, + org.eclipse.tracecompass.tmf.ctf.core.event.lookup, + org.eclipse.tracecompass.tmf.ctf.core.timestamp, + org.eclipse.tracecompass.tmf.ctf.core.trace, + org.eclipse.tracecompass.tmf.ctf.core.trace.iterator Import-Package: com.google.common.collect, org.eclipse.emf.common.util diff --git a/org.eclipse.tracecompass.tmf.ctf.core/plugin.xml b/org.eclipse.tracecompass.tmf.ctf.core/plugin.xml index a126f9aa8c..1fdb2d6c12 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/plugin.xml +++ b/org.eclipse.tracecompass.tmf.ctf.core/plugin.xml @@ -9,11 +9,11 @@ + trace_type="org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace"> diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfLocation.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfLocation.java similarity index 98% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfLocation.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfLocation.java index d36983defc..cfbd3e70d0 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfLocation.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfLocation.java @@ -10,7 +10,8 @@ * Matthew Khouzam - Initial API and implementation * Alexandre Montplaisir - Extends TmfLocation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; + +package org.eclipse.tracecompass.tmf.ctf.core.context; import java.nio.ByteBuffer; diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfLocationInfo.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfLocationInfo.java similarity index 98% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfLocationInfo.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfLocationInfo.java index 0e2c7db7dc..a07aa66d57 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfLocationInfo.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfLocationInfo.java @@ -8,7 +8,8 @@ * * Contributors: Matthew Khouzam - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; + +package org.eclipse.tracecompass.tmf.ctf.core.context; import java.nio.ByteBuffer; diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfContext.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfTmfContext.java similarity index 95% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfContext.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfTmfContext.java index 369fd18acd..eb34381682 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfContext.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/context/CtfTmfContext.java @@ -11,10 +11,13 @@ * Simon Delisle - Remove the iterator in dispose() *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.context; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; import org.eclipse.tracecompass.tmf.core.trace.location.ITmfLocation; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.iterator.CtfIterator; /** * Lightweight Context for CtfTmf traces. Should only use 3 references, 1 ref to diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEvent.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java similarity index 96% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEvent.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java index 1cabcd2c6d..a2349be550 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEvent.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Updated for source and model lookup interfaces *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.event; import java.util.ArrayList; import java.util.HashSet; @@ -33,6 +33,10 @@ import org.eclipse.tracecompass.tmf.core.event.TmfEventField; import org.eclipse.tracecompass.tmf.core.event.lookup.ITmfModelLookup; import org.eclipse.tracecompass.tmf.core.event.lookup.ITmfSourceLookup; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; +import org.eclipse.tracecompass.tmf.ctf.core.CtfConstants; +import org.eclipse.tracecompass.tmf.ctf.core.event.lookup.CtfTmfCallsite; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * A wrapper class around CTF's Event Definition/Declaration that maps all types diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventFactory.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventFactory.java similarity index 96% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventFactory.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventFactory.java index 07e3b3a7d8..eb2d0bc0b2 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventFactory.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventFactory.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.event; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.tracecompass.ctf.core.CTFStrings; @@ -20,6 +20,8 @@ import org.eclipse.tracecompass.ctf.core.event.types.IDefinition; import org.eclipse.tracecompass.ctf.core.event.types.IntegerDefinition; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * Factory for CtfTmfEvent's. diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventField.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventField.java similarity index 99% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventField.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventField.java index f1d3a1ccb1..10d37863a3 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventField.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventField.java @@ -15,7 +15,7 @@ * François Doray - Add generic array field type *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.event; import java.util.ArrayList; import java.util.Arrays; @@ -37,6 +37,7 @@ import org.eclipse.tracecompass.internal.ctf.core.event.types.ArrayDefinition; import org.eclipse.tracecompass.internal.ctf.core.event.types.ByteArrayDefinition; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.event.TmfEventField; +import org.eclipse.tracecompass.tmf.ctf.core.CtfEnumPair; /** * The CTF implementation of the TMF event field model diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventType.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventType.java similarity index 95% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventType.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventType.java index 0f8462c9c2..4db811b509 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfEventType.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventType.java @@ -9,7 +9,7 @@ * Contributors: Matthew Khouzam - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.event; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.event.TmfEventType; diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfLostEvent.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfLostEvent.java similarity index 93% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfLostEvent.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfLostEvent.java index 2e394cbb44..07249954fe 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfLostEvent.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfLostEvent.java @@ -10,13 +10,15 @@ * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.event; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.tracecompass.ctf.core.event.EventDefinition; import org.eclipse.tracecompass.ctf.core.event.IEventDeclaration; import org.eclipse.tracecompass.tmf.core.event.ITmfLostEvent; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * An implementation of {@link ITmfLostEvent} for use in the CTF adaptor. diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/Messages.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/Messages.java new file mode 100644 index 0000000000..8a7b129760 --- /dev/null +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/Messages.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Matthew Khouzam - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ctf.core.event; + +import org.eclipse.osgi.util.NLS; + +/** + * Message bundle for tmf.ctf.core.event + * + * @author Matthew Khouzam + */ +public class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.eclipse.tracecompass.tmf.ctf.core.event.messages"; //$NON-NLS-1$ + + /** Unsupported field type */ + public static String CtfTmfEventField_UnsupportedType; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfCallsite.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/lookup/CtfTmfCallsite.java similarity index 94% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfCallsite.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/lookup/CtfTmfCallsite.java index 949f47eef3..a01ace5e10 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfCallsite.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/lookup/CtfTmfCallsite.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Updated for new parent class *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.event.lookup; import org.eclipse.tracecompass.ctf.core.event.CTFCallsite; import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite; @@ -29,10 +29,10 @@ public class CtfTmfCallsite extends TmfCallsite { // ------------------------------------------------------------------------ /** The event name. */ - final private String fEventName; + private final String fEventName; /** The instruction pointer. */ - final private long fInstructionPointer; + private final long fInstructionPointer; // ------------------------------------------------------------------------ // Constructors @@ -44,7 +44,7 @@ public class CtfTmfCallsite extends TmfCallsite { * @param callsite * - a CTF call site */ - CtfTmfCallsite(CTFCallsite callsite) { + public CtfTmfCallsite(CTFCallsite callsite) { super(callsite.getFileName(), callsite.getFunctionName(), callsite.getLineNumber()); fEventName = callsite.getEventName(); fInstructionPointer = callsite.getIp(); diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/messages.properties b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/messages.properties new file mode 100644 index 0000000000..5792cefbf7 --- /dev/null +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/messages.properties @@ -0,0 +1,13 @@ +############################################################################### +# Copyright (c) 2014 Ericsson +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Ericsson - Initial API and implementation +############################################################################### + +CtfTmfEventField_UnsupportedType=Unsupported field type: \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfTimestamp.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/timestamp/CtfTmfTimestamp.java similarity index 95% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfTimestamp.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/timestamp/CtfTmfTimestamp.java index 767103489a..fff3a4efb0 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfTimestamp.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/timestamp/CtfTmfTimestamp.java @@ -10,7 +10,7 @@ * Matthew Khouzam - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.timestamp; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfTrace.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java similarity index 95% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfTrace.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java index bfc3f54fb0..f1d142d231 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfTmfTrace.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java @@ -12,7 +12,7 @@ * Geneviève Bastien - Added the createTimestamp function *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.trace; import java.nio.BufferOverflowException; import java.nio.ByteBuffer; @@ -52,6 +52,15 @@ import org.eclipse.tracecompass.tmf.core.trace.indexer.TmfBTreeTraceIndexer; import org.eclipse.tracecompass.tmf.core.trace.indexer.checkpoint.ITmfCheckpoint; import org.eclipse.tracecompass.tmf.core.trace.indexer.checkpoint.TmfCheckpoint; import org.eclipse.tracecompass.tmf.core.trace.location.ITmfLocation; +import org.eclipse.tracecompass.tmf.ctf.core.CtfConstants; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocation; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocationInfo; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfTmfContext; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEventType; +import org.eclipse.tracecompass.tmf.ctf.core.timestamp.CtfTmfTimestamp; +import org.eclipse.tracecompass.tmf.ctf.core.trace.iterator.CtfIterator; +import org.eclipse.tracecompass.tmf.ctf.core.trace.iterator.CtfIteratorManager; import com.google.common.collect.ImmutableSet; @@ -409,11 +418,14 @@ public class CtfTmfTrace extends TmfTrace /** * Register an event type to this trace. * - * Package-visible so that {@link CtfTmfEvent#getType} can call it. + * Public visibility so that {@link CtfTmfEvent#getType} can call it. * * FIXME This could probably be made cleaner? + * + * @param eventType + * The event type to register */ - void registerEventType(CtfTmfEventType eventType) { + public void registerEventType(CtfTmfEventType eventType) { fContainedEventTypes.put(eventType.getName(), eventType); } diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/Messages.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/Messages.java similarity index 74% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/Messages.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/Messages.java index c34bac7bf8..77b8600499 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/Messages.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Ericsson. + * Copyright (c) 2014 Ericsson. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -9,29 +9,23 @@ * Matthew Khouzam - Initial API and implementation *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.trace; import org.eclipse.osgi.util.NLS; /** - * Message bundle for tmf.core.ctfadaptor + * Message bundle for tmf.ctf.core.trace * * @author Matthew Khouzam - * @since 2.0 */ public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.tracecompass.tmf.ctf.core.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.tracecompass.tmf.ctf.core.trace.messages"; //$NON-NLS-1$ - /** Buffer overflow detected - * @since 2.1*/ + /** Buffer overflow detected */ public static String CtfTmfTrace_BufferOverflowErrorMessage; - /** - * Text for host ID - * - * @since 3.1 - */ + /** Text for host ID */ public static String CtfTmfTrace_HostID; /** Major version number not set */ @@ -43,9 +37,6 @@ public class Messages extends NLS { /** No event */ public static String CtfTmfTrace_NoEvent; - /** Unsupported field type */ - public static String CtfTmfEventField_UnsupportedType; - static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfIterator.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/iterator/CtfIterator.java similarity index 96% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfIterator.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/iterator/CtfIterator.java index 909e34aa0a..6786c57d8f 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfIterator.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/iterator/CtfIterator.java @@ -11,7 +11,7 @@ * Florian Wininger - Performance improvements *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.trace.iterator; import org.eclipse.tracecompass.ctf.core.trace.CTFReaderException; import org.eclipse.tracecompass.ctf.core.trace.CTFStreamInputReader; @@ -19,6 +19,11 @@ import org.eclipse.tracecompass.ctf.core.trace.CTFTraceReader; import org.eclipse.tracecompass.internal.tmf.ctf.core.Activator; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; import org.eclipse.tracecompass.tmf.core.trace.location.ITmfLocation; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocation; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocationInfo; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEventFactory; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; /** * The CTF trace reader iterator. diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfIteratorManager.java b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/iterator/CtfIteratorManager.java similarity index 96% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfIteratorManager.java rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/iterator/CtfIteratorManager.java index 4fb9f14838..a3b3685b9b 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/CtfIteratorManager.java +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/iterator/CtfIteratorManager.java @@ -10,7 +10,7 @@ * Alexandre Montplaisir - Renamed/extracted from CtfTraceManager *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ctf.core; +package org.eclipse.tracecompass.tmf.ctf.core.trace.iterator; import java.util.ArrayList; import java.util.HashMap; @@ -18,6 +18,10 @@ import java.util.Random; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfLocationInfo; +import org.eclipse.tracecompass.tmf.ctf.core.context.CtfTmfContext; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; + /** * A CTF trace iterator manager. * diff --git a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/messages.properties b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/messages.properties similarity index 88% rename from org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/messages.properties rename to org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/messages.properties index 14d393b2db..46565eaeaa 100644 --- a/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/messages.properties +++ b/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/messages.properties @@ -14,5 +14,4 @@ CtfTmfTrace_BufferOverflowErrorMessage=Buffer overflow exception, trace is malfo CtfTmfTrace_HostID=host ID CtfTmfTrace_MajorNotSet=Major version number not set CtfTmfTrace_ReadingError=Reading error -CtfTmfTrace_NoEvent=Trace has no events -CtfTmfEventField_UnsupportedType=Unsupported field type: \ No newline at end of file +CtfTmfTrace_NoEvent=Trace has no events \ No newline at end of file diff --git a/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java b/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java index 465304f059..82280eda86 100644 --- a/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java +++ b/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java @@ -39,9 +39,9 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.tracecompass.tmf.core.signal.TmfTimeSynchSignal; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfEvent; -import org.eclipse.tracecompass.tmf.ctf.core.CtfTmfTrace; +import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace; +import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ui.editors.TmfEventsEditor; import org.eclipse.tracecompass.tmf.ui.project.model.TmfTracesFolder; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.SWTBotUtil; -- 2.34.1