X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fmaven-yang-plugin-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang2sources%2Fplugin%2Fit%2FYangToSourcesPluginTestIT.java;h=bbece72fd32ce54b69bba5c757c00e5aeb31e285;hb=8fc279ab14ec5139777e4a0a76ef72bc4d8429cd;hp=0ea82f8fb8586fa52b0692316491c526241b688f;hpb=37ff82351675cc5c279dfe88c6daf10cbbf9f48b;p=controller.git diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java index 0ea82f8fb8..bbece72fd3 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/java/org/opendaylight/controller/yang2sources/plugin/it/YangToSourcesPluginTestIT.java @@ -48,8 +48,11 @@ public class YangToSourcesPluginTestIT { Verifier v = setUp("AdditionalConfig/", false); v.verifyTextInLog("[DEBUG] yang-to-sources: Additional configuration picked up for : org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl: {nm1=abcd=a.b.c.d, nm2=abcd2=a.b.c.d.2}"); v.verifyTextInLog("[DEBUG] yang-to-sources: Additional configuration picked up for : org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl: {c1=config}"); - v.verifyTextInLog("../files marked as resources: META-INF/yang"); - v.verifyTextInLog("target/generated-resources marked as resources for generator: org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl"); + v.verifyTextInLog(File.separator + + "files marked as resources: META-INF/yang"); + v.verifyTextInLog("target" + + File.separator + + "generated-resources marked as resources for generator: org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl"); } @Test @@ -105,9 +108,8 @@ public class YangToSourcesPluginTestIT { static Verifier setUp(String project, boolean ignoreF) throws VerificationException { - final URL path = YangToSourcesPluginTestIT - .class.getResource("/" + project - + "pom.xml"); + final URL path = YangToSourcesPluginTestIT.class.getResource("/" + + project + "pom.xml"); File parent = new File(path.getPath()); Verifier verifier = new Verifier(parent.getParent()); if (ignoreF) @@ -125,9 +127,8 @@ public class YangToSourcesPluginTestIT { @Test public void testFindResourceOnCp() throws VerificationException { - Verifier v1 = new Verifier( - new File(getClass().getResource("/GenerateTest1/pom.xml") - .getPath()).getParent()); + Verifier v1 = new Verifier(new File(getClass().getResource( + "/GenerateTest1/pom.xml").getPath()).getParent()); v1.executeGoal("clean"); v1.executeGoal("package"); v1.assertFilePresent("target/classes/META-INF/yang/testfile1.yang");