Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
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}");
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" + File.separator
+ + "yang");
+ v.verifyTextInLog("target"
+ + File.separator
+ + "generated-resources marked as resources for generator: org.opendaylight.controller.yang2sources.spi.CodeGeneratorTestImpl");
static Verifier setUp(String project, boolean ignoreF)
throws VerificationException {
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)
File parent = new File(path.getPath());
Verifier verifier = new Verifier(parent.getParent());
if (ignoreF)
@Test
public void testFindResourceOnCp() throws VerificationException {
@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");
v1.executeGoal("clean");
v1.executeGoal("package");
v1.assertFilePresent("target/classes/META-INF/yang/testfile1.yang");
String entryName = entry.getName();
if (entryName
String entryName = entry.getName();
if (entryName
- .startsWith(YangToSourcesProcessor.META_INF_YANG_STRING)) {
+ .startsWith(YangToSourcesProcessor.META_INF_YANG_STRING_JAR)) {
if (entry.isDirectory() == false
&& entryName.endsWith(".yang")) {
foundFilesForReporting.add(entryName);
if (entry.isDirectory() == false
&& entryName.endsWith(".yang")) {
foundFilesForReporting.add(entryName);
static final String LOG_PREFIX = "yang-to-sources:";
static final String META_INF_YANG_STRING = "META-INF" + File.separator
+ "yang";
static final String LOG_PREFIX = "yang-to-sources:";
static final String META_INF_YANG_STRING = "META-INF" + File.separator
+ "yang";
+ static final String META_INF_YANG_STRING_JAR = "META-INF" + "/" + "yang";
static final File META_INF_YANG_DIR = new File(META_INF_YANG_STRING);
private final Log log;
static final File META_INF_YANG_DIR = new File(META_INF_YANG_STRING);
private final Log log;