diff options
author | Dan Timoney <dtimoney@att.com> | 2021-01-29 17:42:42 +0000 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2021-01-29 17:42:42 +0000 |
commit | 0e4e58bf061df695341ac250beb97a978cefdaf7 (patch) | |
tree | 06539b81ae2f3bbeddd3f7f30199cdd200a8480c /plugins/restconf-client/provider/src/test | |
parent | ce4e5f9a00d2677495240ad367b9bfc4b74752d0 (diff) |
Revert "migrate sli to alu-SR1"
This reverts commit ce4e5f9a00d2677495240ad367b9bfc4b74752d0.
Reason for revert: ODL upgrade changes need to be backed out until issues in ccsdk/features are resolved.
Change-Id: I168e2519e37f3eee61609d0da890c14db49ec49e
Diffstat (limited to 'plugins/restconf-client/provider/src/test')
-rw-r--r-- | plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java index 2bcd45e2b..c3a6b4ea8 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java @@ -19,9 +19,6 @@ */ package org.onap.ccsdk.sli.plugins.yangserializers.pnserializer; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FileNotFoundException; import java.util.ArrayList; @@ -30,16 +27,21 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; + import org.junit.Before; import org.junit.Test; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; import org.opendaylight.restconf.nb.rfc8040.utils.parser.ParserIdentifier; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertTrue; + public final class PropertiesSerializerTest { - private EffectiveModelContext context; + private SchemaContext context; @Before public void initialization() throws FileNotFoundException { @@ -1123,7 +1125,7 @@ public final class PropertiesSerializerTest { assertThat(l.valueNs().moduleNs().toString(), is("identity:list:second:ns:test:json:ser")); } - public static EffectiveModelContext compileYangFile() throws FileNotFoundException { + public static SchemaContext compileYangFile() throws FileNotFoundException { String path = PropertiesSerializerTest.class.getResource("/yang").getPath(); File dir = new File(path); String[] fileList = dir.list(); |