Deprecate features-test

features-test is no longer used, as it is superseded by the maven
plugin. Deprecate it for removal.

JIRA: ODLPARENT-262
Change-Id: Ia4d1b2e6d3c0a73cf29be887338a9976ef71bcbd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Constants.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Constants.java
index f3ad1041e4928dc981c7d35969b63efb89eb9c20..47fdeb3ce07bd1f7a9ce062f3a5ab4495bf2dbcb 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Constants.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Constants.java
@@ -5,15 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.odlparent.featuretest;
 
+@Deprecated(since = "13.1.0", forRemoval = true)
 public final class Constants {
-
-    private Constants() {
-        // Noop constructor
-    }
-
     /*
      * Named of System Properties we need to set in PerFeatureRunner and read in SingleFeatureTest
      */
@@ -22,4 +17,8 @@ public final class Constants {
             "org.opendaylight.featuretest.featurename";
     public static final String ORG_OPENDAYLIGHT_FEATURETEST_FEATUREVERSION_PROP =
             "org.opendaylight.featuretest.featureversion";
+
+    private Constants() {
+        // Noop constructor
+    }
 }

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/DependencyUtil.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/DependencyUtil.java
index fc01dacbd24b3f5ee57a2a49b74a9c6d853294a1..254d62066f38aecb4e68dbfd46caf9f3b3acab86 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/DependencyUtil.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/DependencyUtil.java
@@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory;
  * Utility class responsible for maven dependencies processing. Functionality relays on dependencies list populated
  * by {@code maven-dependency-plugin} on execution prior to SFT's {@code test} phase.
  */
+@Deprecated(since = "13.1.0", forRemoval = true)
 final class DependencyUtil {
-
     private static final Logger LOG = LoggerFactory.getLogger(DependencyUtil.class);
     private static final String TEST_DEPENDENCIES_LIST_PROP = "featureTest.dependencies.list";
     private static final String FEATURES = "features";

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/KarafConstants.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/KarafConstants.java
index 54b80aa38119eb5254fcf8e47479cc480294d7bd..71e7536bd77151425f8d2f2e2ace9f249c379de8 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/KarafConstants.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/KarafConstants.java
@@ -16,6 +16,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Deprecated(since = "13.1.0", forRemoval = true)
 final class KarafConstants {
     private static final Logger LOG = LoggerFactory.getLogger(KarafConstants.class);
 

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunNotifier.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunNotifier.java
index 4000882f6b27fbff38387dc8e11713f1982fcb3b..d63fdc18e03c61ac29c80443912b646ef24dd908 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunNotifier.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunNotifier.java
@@ -16,8 +16,8 @@ import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 import org.junit.runner.notification.RunNotifier;
 
+@Deprecated(since = "13.1.0", forRemoval = true)
 public class PerFeatureRunNotifier extends RunNotifier {
-
     private final RunNotifier delegate;
     private final URL repoUrl;
     private final String featureName;
@@ -31,8 +31,8 @@ public class PerFeatureRunNotifier extends RunNotifier {
      * @param featureVersion The feature version.
      * @param delegate The notification delegate.
      */
-    public PerFeatureRunNotifier(
-            final URL repoUrl, final String featureName, final String featureVersion, final RunNotifier delegate) {
+    public PerFeatureRunNotifier(final URL repoUrl, final String featureName, final String featureVersion,
+            final RunNotifier delegate) {
         this.repoUrl = Objects.requireNonNull(repoUrl);
         this.featureName = Objects.requireNonNull(featureName);
         this.featureVersion = Objects.requireNonNull(featureVersion);

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunner.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunner.java
index ef5157e9463f9c80785d27182c0eb7955c13b2b9..b01819705b1681203d1d398c84188fa540108ba5 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunner.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunner.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.odlparent.featuretest;
 
 import static org.opendaylight.odlparent.featuretest.Constants.ORG_OPENDAYLIGHT_FEATURETEST_FEATURENAME_PROP;
@@ -27,8 +26,8 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Deprecated(since = "13.1.0", forRemoval = true)
 public class PerFeatureRunner extends Runner implements Filterable, Sortable {
-
     private static final Logger LOG = LoggerFactory.getLogger(PerFeatureRunner.class);
 
     private final String featureVersion;
@@ -55,7 +54,7 @@ public class PerFeatureRunner extends Runner implements Filterable, Sortable {
         System.setProperty(ORG_OPENDAYLIGHT_FEATURETEST_URI_PROP, repoUrl.toString());
         System.setProperty(ORG_OPENDAYLIGHT_FEATURETEST_FEATURENAME_PROP, featureName);
         System.setProperty(ORG_OPENDAYLIGHT_FEATURETEST_FEATUREVERSION_PROP, featureVersion);
-        this.delegate = new PaxExam(Objects.requireNonNull(testClass));
+        delegate = new PaxExam(Objects.requireNonNull(testClass));
     }
 
     @Override

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java
index d44563dcafb878fd543bf44276ce778e687190a4..d5f10646c0929ab82c18a6ace2e23e46cec3a8ca 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.odlparent.featuretest;
 
 import java.io.IOException;
@@ -24,8 +23,8 @@ import org.opendaylight.odlparent.karafutil.CustomBundleUrlStreamHandlerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Deprecated(since = "13.1.0", forRemoval = true)
 public class PerRepoTestRunner extends ParentRunner<PerFeatureRunner> {
-
     private static final Logger LOG = LoggerFactory.getLogger(PerRepoTestRunner.class);
 
     private static final String REPO_RECURSE = "repo.recurse";

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/ReflectionUtil.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/ReflectionUtil.java
index 03fbde69eb2e3b81075b76955bb5845a897af428..05ad92cfcd44b880b3d77165830276a59491bdaf 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/ReflectionUtil.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/ReflectionUtil.java
@@ -20,10 +20,10 @@ import org.ops4j.pax.exam.TestProbeBuilder;
  *
  * @author Michael Vorburger.ch
  */
+@Deprecated(since = "13.1.0", forRemoval = true)
 public final class ReflectionUtil {
-
     private ReflectionUtil() {
-
+        // Hidden on purpose
     }
 
     public static void addAllClassesInSameAndSubPackageOfClass(TestProbeBuilder probe, Class<?> clazz) {

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
index dedb9ae436b9b6f18d35a34dfc85de925932c674..1c87b0e75e79f19197ab0fee0830ae07c880e900 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
@@ -56,6 +56,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @RunWith(PerRepoTestRunner.class)
+@Deprecated(since = "13.1.0", forRemoval = true)
 public class SingleFeatureTest {
 
     private static final String MAVEN_REPO_LOCAL = "maven.repo.local";

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java
index 5adca92bd6063e6a6d3104d483aa36b5134142fa..ccee399528618cadcb8c6edcb9db6d37f58c6bca 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java
@@ -12,9 +12,10 @@ import java.net.URL;
 import java.util.Collection;
 import org.junit.runner.Description;
 
+@Deprecated(since = "13.1.0", forRemoval = true)
 public final class Util {
     private Util() {
-
+        // Hidden on purpose
     }
 
     /**

diff --git a/features-test/src/test/java/org/opendaylight/odlparent/featuretest/DependencyUtilTest.java b/features-test/src/test/java/org/opendaylight/odlparent/featuretest/DependencyUtilTest.java
index bf9f680e3a3d2d0b4452cafd1a010fafbe1018fb..62c936d9dd15dea28b61a16839f34f4859a4a079 100644 (file)
--- a/features-test/src/test/java/org/opendaylight/odlparent/featuretest/DependencyUtilTest.java
+++ b/features-test/src/test/java/org/opendaylight/odlparent/featuretest/DependencyUtilTest.java
@@ -22,6 +22,7 @@ import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.karaf.options.KarafFeaturesOption;
 import org.ops4j.pax.exam.options.OptionalCompositeOption;
 
+@Deprecated(since = "13.1.0", forRemoval = true)
 class DependencyUtilTest {
 
     @TempDir

diff --git a/features-test/src/test/java/org/opendaylight/odlparent/featuretest/KarafConstantsTest.java b/features-test/src/test/java/org/opendaylight/odlparent/featuretest/KarafConstantsTest.java
index 93568d3947b6450d32064f6c759494130f1a2631..669b5107084b0e4970217aa331f215d80d32b624 100644 (file)
--- a/features-test/src/test/java/org/opendaylight/odlparent/featuretest/KarafConstantsTest.java
+++ b/features-test/src/test/java/org/opendaylight/odlparent/featuretest/KarafConstantsTest.java
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
+@Deprecated(since = "13.1.0", forRemoval = true)
 public class KarafConstantsTest {
     @Test
     public void testKarafVersions() {

diff --git a/features-test/src/test/java/org/opendaylight/odlparent/featuretest/ReflectionUtilTest.java b/features-test/src/test/java/org/opendaylight/odlparent/featuretest/ReflectionUtilTest.java
index e59467149b91317a6a3288bf3ba4df80d8aecd78..3a35d7167432333eb54905b169de92723a9cf992 100644 (file)
--- a/features-test/src/test/java/org/opendaylight/odlparent/featuretest/ReflectionUtilTest.java
+++ b/features-test/src/test/java/org/opendaylight/odlparent/featuretest/ReflectionUtilTest.java
@@ -19,6 +19,7 @@ import org.junit.Test;
  *
  * @author Michael Vorburger.ch
  */
+@Deprecated(since = "13.1.0", forRemoval = true)
 public class ReflectionUtilTest {
     @Test
     public void testGetClasses() {