Fix IT test instantiation 34/49434/1 stable/beryllium
authorRobert Varga <rovarga@cisco.com>
Wed, 23 Nov 2016 16:54:39 +0000 (17:54 +0100)
committerRobert Varga <rovarga@cisco.com>
Thu, 15 Dec 2016 14:07:48 +0000 (15:07 +0100)
We should be passing maven options for all tests, fix
the two omissions.

Change-Id: I43b5a001997547dc9935f390f046a5d8d839cd9f
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 5e6134e6824f2663516d51a1b5195883d35589a2)
(cherry picked from commit 42475e5eb7c4f57542837f1521efe221c1bb928a)

yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java

index 0ed29b771888f3b4c63f7d34f5c2985c5dcca1d2..5015100ca26817fe33e1cf6a79a2be7b58d504e6 100644 (file)
@@ -150,8 +150,7 @@ public class YangToSourcesPluginTestIT {
 
     @Test
     public void testFindResourceOnCp() throws Exception {
-        Verifier v1 = new Verifier(new File(getClass().getResource(
-                "/test-parent/GenerateTest1/pom.xml").toURI()).getParent());
+        Verifier v1 = setUp("test-parent/GenerateTest1/", false);
         v1.executeGoal("clean");
         v1.executeGoal("package");
 
@@ -165,8 +164,7 @@ public class YangToSourcesPluginTestIT {
         v1.assertFilePresent(buildDir + "/classes/META-INF/yang/testfile2.yang");
         v1.assertFilePresent(buildDir + "/classes/META-INF/yang/testfile3.yang");
 
-        Verifier v2 = new Verifier(new File(getClass().getResource(
-                "/test-parent/GenerateTest2/pom.xml").toURI()).getParent());
+        Verifier v2 = setUp("test-parent/GenerateTest2/", false);
         v2.executeGoal("clean");
         v2.executeGoal("package");