X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2Fcnsn%2Fto%2Fxml%2Ftest%2FCnSnToXmlWithDataFromSeveralModulesTest.java;h=1e366dcaec88dd5171a191581a6877409afc696a;hp=f8d04c157f2e9d1678da36c6636bd872e05e4cc7;hb=c222e37f2a0f0f3f6266242fbea2d3b018f4e6e3;hpb=2e29ba0089e109c71af6fae1a6811255f9845049 diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlWithDataFromSeveralModulesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlWithDataFromSeveralModulesTest.java index f8d04c157f..1e366dcaec 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlWithDataFromSeveralModulesTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/xml/test/CnSnToXmlWithDataFromSeveralModulesTest.java @@ -14,9 +14,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.ws.rs.WebApplicationException; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.controller.sal.rest.impl.StructuredDataToXmlProvider; @@ -31,7 +29,7 @@ public class CnSnToXmlWithDataFromSeveralModulesTest extends YangAndXmlAndDataSc @BeforeClass public static void initialize() { - dataLoad("/xml-to-cnsn/data-of-several-modules/yang",2,"module1","cont_m1"); + dataLoad("/xml-to-cnsn/data-of-several-modules/yang", 2, "module1", "cont_m1"); } @Test @@ -40,19 +38,19 @@ public class CnSnToXmlWithDataFromSeveralModulesTest extends YangAndXmlAndDataSc String output = TestUtils.writeCompNodeWithSchemaContextToOutput(prepareCnSn(), modules, schemaContext, StructuredDataToXmlProvider.INSTANCE); -// String output = -// String.format("" + -// "\n" + -// "\n\t" + -// "\n\t\tlf1 m1 value" + -// "\n\t" + -// "\n" + -// "\n" + -// "\n\t" + -// "\n\t\tlf1 m2 value" + -// "\n\t" + -// "\n" + -// "\n"); + // String output = + // String.format("" + + // "\n" + + // "\n\t" + + // "\n\t\tlf1 m1 value" + + // "\n\t" + + // "\n" + + // "\n" + + // "\n\t" + + // "\n\t\tlf1 m2 value" + + // "\n\t" + + // "\n" + + // "\n"); StringBuilder regex = new StringBuilder(); regex.append("^"); @@ -61,7 +59,6 @@ public class CnSnToXmlWithDataFromSeveralModulesTest extends YangAndXmlAndDataSc regex.append(".*xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\""); regex.append(".*>"); - regex.append(".*"); regex.append(".*xmlns=\"module:one\""); regex.append(".*>");