Merge "BUG-584: moved yangtools-it under integration-test and renamed to bundle-test"

diff --git a/yangtools-it/pom.xml b/integration-test/bundle-test/pom.xml
similarity index 97%
rename from yangtools-it/pom.xml
rename to integration-test/bundle-test/pom.xml
index 789582a08756965d8a4bc378794b12fba204f04e..5ebad81abc60bdbdd08585ec8fe28456110d2502 100644 (file)
--- a/yangtools-it/pom.xml
+++ b/integration-test/bundle-test/pom.xml
@@ -8,13 +8,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>yangtools</artifactId>
         <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>integration-tests</artifactId>
         <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>yangtools-it</artifactId>
+    <artifactId>bundle-test</artifactId>
 
     <properties>
         <exam.version>3.0.0</exam.version>
@@ -75,7 +75,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-util</artifactId>
-            <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/yangtools-it/src/test/java/BundleStartTest.java b/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
similarity index 94%
rename from yangtools-it/src/test/java/BundleStartTest.java
rename to integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
index f005f35526ae1c22218bb1f228d304ddcd5bffbe..d72ec7f2df4db51b2da8e056c808a27af674c1d2 100644 (file)
--- a/yangtools-it/src/test/java/BundleStartTest.java
+++ b/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
@@ -5,16 +5,16 @@
  * 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.yangtools.bundle.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.*;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.inject.Inject;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -38,6 +38,7 @@ public class BundleStartTest {
         options.add(mavenBundle("ch.qos.logback", "logback-core").versionAsInProject());
         options.add(mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject());
         options.add(mavenBundle("com.google.guava", "guava").versionAsInProject());
+        options.add(mavenBundle("commons-io", "commons-io").versionAsInProject());
         options.add(mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject());
         options.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "antlr4-runtime-osgi-nohead")
                 .versionAsInProject());
@@ -47,6 +48,7 @@ public class BundleStartTest {
         options.add(mavenBundle("org.javassist", "javassist").versionAsInProject());
 
         options.add(mavenBundle(GROUP, "concepts").versionAsInProject());
+        options.add(mavenBundle(GROUP, "util").versionAsInProject());
         options.add(mavenBundle(GROUP, "yang-binding").versionAsInProject());
         options.add(mavenBundle(GROUP, "yang-common").versionAsInProject());
         options.add(mavenBundle(GROUP, "yang-data-api").versionAsInProject());

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 6e71866664ad6f6acc250414b6b7f32c678370d6..9f10996bf2df8fcb18a537f379acaff4957772e2 100644 (file)
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -19,6 +19,7 @@
 
     <modules>
         <module>bug527-test-model</module>
+        <module>bundle-test</module>
         <module>regression-test-model</module>
         <module>yang-runtime-tests</module>
     </modules>