statesystem: Make o.e.tc.datastore.core.tests a non-fragment plug-in

This change is required for upgrade to Tycho 4.0.9. Signed-off-by: Patrick Tasse <[email protected]>
bhufmann · Oct 23, 2024 · e12b98a · e12b98a
1 parent ad280a8
commit e12b98a
Show file tree

Hide file tree

Showing 40 changed files with 174 additions and 103 deletions.
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/META-INF/MANIFEST.MF b/statesystem/org.eclipse.tracecompass.datastore.core.tests/META-INF/MANIFEST.MF
@@ -5,17 +5,19 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 1.0.9.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.datastore.core.tests;singleton:=true
-Fragment-Host: org.eclipse.tracecompass.datastore.core
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.0.0",
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
-Export-Package: org.eclipse.tracecompass.datastore.core.encoding,
- org.eclipse.tracecompass.internal.datastore.core.condition;x-internal:=true,
- org.eclipse.tracecompass.internal.datastore.core.historytree;x-internal:=true,
- org.eclipse.tracecompass.internal.datastore.core.serialization;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.condition;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;x-friends:="org.eclipse.tracecompass.segmentstore.core.tests",
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;x-friends:="org.eclipse.tracecompass.segmentstore.core.tests"
+ org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ org.eclipse.tracecompass.datastore.core
+Export-Package: org.eclipse.tracecompass.datastore.core.tests.condition,
+ org.eclipse.tracecompass.datastore.core.tests.encoding,
+ org.eclipse.tracecompass.datastore.core.tests.historytree,
+ org.eclipse.tracecompass.datastore.core.tests.historytree.classic,
+ org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping,
+ org.eclipse.tracecompass.datastore.core.tests.serialization,
+ org.eclipse.tracecompass.datastore.core.tests.stubs.historytree,
+ org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic,
+ org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping
 Import-Package: com.google.common.collect
 Automatic-Module-Name: org.eclipse.tracecompass.datastore.core.tests
diff --git a/...ion/ContinuousTimeRangeConditionTest.java → ...ion/ContinuousTimeRangeConditionTest.java b/...ion/ContinuousTimeRangeConditionTest.java → ...ion/ContinuousTimeRangeConditionTest.java
@@ -9,14 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.condition;
+package org.eclipse.tracecompass.datastore.core.tests.condition;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.eclipse.tracecompass.internal.datastore.core.condition.ContinuousTimeRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.TimeRangeCondition;
 import org.junit.Test;
 

diff --git a/...on/DiscreteIntegerRangeConditionTest.java → ...on/DiscreteIntegerRangeConditionTest.java b/...on/DiscreteIntegerRangeConditionTest.java → ...on/DiscreteIntegerRangeConditionTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.condition;
+package org.eclipse.tracecompass.datastore.core.tests.condition;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -22,6 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.tracecompass.internal.datastore.core.condition.ArrayIntegerRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.IntegerRangeCondition;
 import org.junit.Test;
 

diff --git a/...ition/DiscreteTimeRangeConditionTest.java → ...ition/DiscreteTimeRangeConditionTest.java b/...ition/DiscreteTimeRangeConditionTest.java → ...ition/DiscreteTimeRangeConditionTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.condition;
+package org.eclipse.tracecompass.datastore.core.tests.condition;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.datastore.core.condition.ArrayTimeRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.TimeRangeCondition;
 import org.junit.Test;
 

diff --git a/...tion/SingletonTimeRangeConditionTest.java → ...tion/SingletonTimeRangeConditionTest.java b/...tion/SingletonTimeRangeConditionTest.java → ...tion/SingletonTimeRangeConditionTest.java
@@ -9,14 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.condition;
+package org.eclipse.tracecompass.datastore.core.tests.condition;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.eclipse.tracecompass.internal.datastore.core.condition.SingletonTimeRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.TimeRangeCondition;
 import org.junit.Test;
 

diff --git a/...datastore/core/encoding/HTVarIntTest.java → ...ore/core/tests/encoding/HTVarIntTest.java b/...datastore/core/encoding/HTVarIntTest.java → ...ore/core/tests/encoding/HTVarIntTest.java
@@ -8,14 +8,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.tracecompass.datastore.core.encoding;
+package org.eclipse.tracecompass.datastore.core.tests.encoding;
 
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 import java.util.PrimitiveIterator.OfLong;
 import java.util.Random;
 
+import org.eclipse.tracecompass.datastore.core.encoding.HTVarInt;
 import org.junit.Test;
 
 /**

diff --git a/...torytree/AbstractHistoryTreeTestBase.java → ...torytree/AbstractHistoryTreeTestBase.java b/...torytree/AbstractHistoryTreeTestBase.java → ...torytree/AbstractHistoryTreeTestBase.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,6 +26,8 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...tore/core/historytree/HTCoreNodeTest.java → ...ore/tests/historytree/HTCoreNodeTest.java b/...tore/core/historytree/HTCoreNodeTest.java → ...ore/tests/historytree/HTCoreNodeTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -20,10 +20,12 @@
 
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.HistoryTreeStub;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic.ClassicHistoryTreeStub;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree.IHTNodeFactory;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode.NodeType;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicHistoryTreeStub;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

diff --git a/...atastore/core/historytree/HTNodeTest.java → ...re/core/tests/historytree/HTNodeTest.java b/...atastore/core/historytree/HTNodeTest.java → ...re/core/tests/historytree/HTNodeTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,11 +23,14 @@
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.HistoryTreeStub;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic.ClassicHistoryTreeStub;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.eclipse.tracecompass.internal.datastore.core.historytree.HtIo;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree.IHTNodeFactory;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode.NodeType;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicHistoryTreeStub;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/...core/historytree/HistoryTreeStubTest.java → ...ests/historytree/HistoryTreeStubTest.java b/...core/historytree/HistoryTreeStubTest.java → ...ests/historytree/HistoryTreeStubTest.java
@@ -9,12 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.HistoryTreeStub;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 
 /**
  * Test the default abstract implementation of the tree, with a concrete stub.

diff --git a/.../datastore/core/historytree/HtIoTest.java → ...tore/core/tests/historytree/HtIoTest.java b/.../datastore/core/historytree/HtIoTest.java → ...tore/core/tests/historytree/HtIoTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,9 +23,9 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.HistoryTreeStub;
+import org.eclipse.tracecompass.internal.datastore.core.historytree.HtIo;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HistoryTreeStub;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HtTestUtils;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode.NodeType;
 import org.junit.After;
 import org.junit.Before;

diff --git a/...tastore/core/historytree/HtTestUtils.java → ...e/core/tests/historytree/HtTestUtils.java b/...tastore/core/historytree/HtTestUtils.java → ...e/core/tests/historytree/HtTestUtils.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -21,6 +21,8 @@
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode.NodeType;
 
 /**

diff --git a/...ytree/classic/ClassicHistoryTreeTest.java → ...ytree/classic/ClassicHistoryTreeTest.java b/...ytree/classic/ClassicHistoryTreeTest.java → ...ytree/classic/ClassicHistoryTreeTest.java
@@ -9,14 +9,16 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.classic;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.AbstractHistoryTreeTestBase;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic.ClassicHistoryTreeStub;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTreeTestBase;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicNode;
 
 /**
  * Test the classic history tree

diff --git a/...astore/core/historytree/package-info.java → ...sts/historytree/classic/package-info.java b/...astore/core/historytree/package-info.java → ...sts/historytree/classic/package-info.java
@@ -10,4 +10,4 @@
  *******************************************************************************/
 
 @org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.classic;
diff --git a/...stractOverlappingHistoryTreeTestBase.java → ...stractOverlappingHistoryTreeTestBase.java b/...stractOverlappingHistoryTreeTestBase.java → ...stractOverlappingHistoryTreeTestBase.java
@@ -9,16 +9,18 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTreeTestBase;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HtTestUtils;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.AbstractHistoryTreeTestBase;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.HtTestUtils;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.AbstractOverlappingHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingNode;
 import org.junit.Test;
 
 /**

diff --git a/...erlapping/OverlappingHistoryTreeTest.java → ...erlapping/OverlappingHistoryTreeTest.java b/...erlapping/OverlappingHistoryTreeTest.java → ...erlapping/OverlappingHistoryTreeTest.java
@@ -9,19 +9,21 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.AbstractHistoryTreeTestBase;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.HtTestUtils;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTreeTestBase;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HtTestUtils;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingNode;
 import org.junit.Test;
 
 /**
@@ -49,8 +51,7 @@ protected OverlappingHistoryTreeStub createHistoryTree(File stateHistoryFile,
     }
 
     @Override
-    protected OverlappingHistoryTreeStub createHistoryTree(@NonNull File existingStateFile,
-            int expectedProviderVersion) throws IOException {
+    protected OverlappingHistoryTreeStub createHistoryTree(File existingStateFile, int expectedProviderVersion) throws IOException {
         return new OverlappingHistoryTreeStub(existingStateFile, expectedProviderVersion);
     }
 

diff --git a/...ore/historytree/classic/package-info.java → ...historytree/overlapping/package-info.java b/...ore/historytree/classic/package-info.java → ...historytree/overlapping/package-info.java
@@ -10,4 +10,4 @@
  *******************************************************************************/
 
 @org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping;
diff --git a/...historytree/overlapping/package-info.java → .../core/tests/historytree/package-info.java b/...historytree/overlapping/package-info.java → .../core/tests/historytree/package-info.java
@@ -10,4 +10,4 @@
  *******************************************************************************/
 
 @org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
diff --git a/...ialization/SafeByteBufferWrapperTest.java → ...ialization/SafeByteBufferWrapperTest.java b/...ialization/SafeByteBufferWrapperTest.java → ...ialization/SafeByteBufferWrapperTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.serialization;
+package org.eclipse.tracecompass.datastore.core.tests.serialization;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -21,6 +21,7 @@
 import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
 import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
 import org.eclipse.tracecompass.datastore.core.serialization.SafeByteBufferFactory;
+import org.eclipse.tracecompass.internal.datastore.core.serialization.SafeByteBufferWrapper;
 import org.junit.Test;
 
 /**

diff --git a/...ore/core/historytree/HistoryTreeStub.java → ...ts/stubs/historytree/HistoryTreeStub.java b/...ore/core/historytree/HistoryTreeStub.java → ...ts/stubs/historytree/HistoryTreeStub.java
@@ -9,13 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 
 /**
  * A stub history tree for the base abstract history tree

diff --git a/...ytree/classic/ClassicHistoryTreeStub.java → ...ytree/classic/ClassicHistoryTreeStub.java b/...ytree/classic/ClassicHistoryTreeStub.java → ...ytree/classic/ClassicHistoryTreeStub.java
@@ -9,12 +9,14 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicNode;
 
 /**
  * A stub for the classic history tree. Limits type "E" to {@link HTInterval}.

diff --git a/...org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/classic/package-info.java b/...org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/classic/package-info.java
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2017 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0 which
+ * accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+@org.eclipse.jdt.annotation.NonNullByDefault
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic;