BUG-7464: use yangtools.triemap

[controller.git] / opendaylight / md-sal / sal-binding-it / src / main / java / org / opendaylight / controller / test / sal / binding / it / TestHelper.java

diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
index cb9d6c3fa38466ca5bed7acaba301a95e94f3288..5d9576112823e5ffd31697c513c241a7d385c0b2 100644 (file)
--- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
+++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
@@ -16,23 +16,28 @@ import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.options.DefaultCompositeOption;
 import org.ops4j.pax.exam.util.PathUtils;
 
+/**
+ * @deprecated Use config-it and/or mdsal-it instead.
+ */
+@Deprecated
 public class TestHelper {
 
     public static final String CONTROLLER = "org.opendaylight.controller";
+    public static final String MDSAL = "org.opendaylight.mdsal";
     public static final String YANGTOOLS = "org.opendaylight.yangtools";
 
     public static final String CONTROLLER_MODELS = "org.opendaylight.controller.model";
-    public static final String YANGTOOLS_MODELS = "org.opendaylight.yangtools.model";
+    public static final String MDSAL_MODELS = "org.opendaylight.mdsal.model";
 
     public static Option mdSalCoreBundles() {
         return new DefaultCompositeOption( //
                 mavenBundle(YANGTOOLS, "concepts").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "util").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS, "yang-binding").versionAsInProject(), // //
+                mavenBundle(MDSAL, "yang-binding").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // //
-                mavenBundle(CONTROLLER, "sal-common").versionAsInProject(), // //
+                mavenBundle(YANGTOOLS, "triemap").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // //
 
@@ -81,17 +86,12 @@ public class TestHelper {
                 mavenBundle(YANGTOOLS, "yang-model-api").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "yang-model-util").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "yang-parser-api").versionAsInProject(), //
-                mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(),
-                mavenBundle(YANGTOOLS, "binding-generator-spi").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS, "binding-model-api").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS, "binding-generator-util").versionAsInProject(), //
                 mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(), //
-                mavenBundle(YANGTOOLS, "binding-type-provider").versionAsInProject(), //
-                mavenBundle(YANGTOOLS, "binding-generator-api").versionAsInProject(), mavenBundle(YANGTOOLS,
-                        "binding-generator-spi").versionAsInProject(), //
-                mavenBundle(YANGTOOLS, "binding-generator-impl").versionAsInProject(),
-                mavenBundle(YANGTOOLS, "binding-data-codec").versionAsInProject(),
-                mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // //
+                mavenBundle(MDSAL, "mdsal-binding-generator-api").versionAsInProject(), //
+                mavenBundle(MDSAL, "mdsal-binding-generator-util").versionAsInProject(), //
+                mavenBundle(MDSAL, "mdsal-binding-generator-impl").versionAsInProject(),
+                mavenBundle(MDSAL, "mdsal-binding-dom-codec").versionAsInProject(),
+                mavenBundle("org.antlr", "antlr4-runtime").versionAsInProject(), // //
 
                 mavenBundle(CONTROLLER, "sal-binding-util").versionAsInProject(), //
                 mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject(), // //
@@ -162,10 +162,11 @@ public class TestHelper {
 
     public static Option baseModelBundles() {
         return new DefaultCompositeOption( //
-                mavenBundle(YANGTOOLS_MODELS, "yang-ext").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS_MODELS, "ietf-inet-types").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS_MODELS, "ietf-yang-types").versionAsInProject(), // //
-                mavenBundle(YANGTOOLS_MODELS, "opendaylight-l2-types").versionAsInProject() // //
+                mavenBundle(MDSAL+".model", "yang-ext").versionAsInProject(),
+                mavenBundle(MDSAL_MODELS, "ietf-type-util").versionAsInProject(),
+                mavenBundle(MDSAL_MODELS, "ietf-inet-types").versionAsInProject(),
+                mavenBundle(MDSAL_MODELS, "ietf-yang-types").versionAsInProject(),
+                mavenBundle(MDSAL_MODELS, "opendaylight-l2-types").versionAsInProject()
                 );
     }
 
@@ -173,7 +174,9 @@ public class TestHelper {
         return new DefaultCompositeOption(
         // Repository required to load harmcrest (OSGi-fied version).
         // Mockito
-                mavenBundle("org.mockito", "mockito-all", "1.9.5"), junitBundles(),
+                mavenBundle("org.mockito", "mockito-core", "1.10.19"),
+                mavenBundle("org.objenesis", "objenesis", "2.2"),
+                junitBundles(),
 
                 /*
                  * Felix has implicit boot delegation enabled by default. It