X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-codec%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fcodec%2Fimpl%2FAugmentationClassDiscoveredAfterCodecTest.java;h=a96b7e038ac09175c3be1665efd352b6b9a71293;hb=refs%2Fchanges%2F28%2F87828%2F25;hp=bd95da644ec65f8dfc3e7fc3da2b73b5d538d238;hpb=77fb9f72a894d84ca3ba16fb79411b59d9b9507b;p=mdsal.git diff --git a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentationClassDiscoveredAfterCodecTest.java b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentationClassDiscoveredAfterCodecTest.java index bd95da644e..a96b7e038a 100644 --- a/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentationClassDiscoveredAfterCodecTest.java +++ b/binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentationClassDiscoveredAfterCodecTest.java @@ -16,9 +16,10 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; import org.opendaylight.mdsal.binding.dom.codec.api.MissingClassInLoadingStrategyException; +import org.opendaylight.mdsal.binding.generator.api.BindingRuntimeContext; +import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingRuntimeGenerator; import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy; import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeLeafOnlyAugment; @@ -30,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** * This sets of tests are designed in way, that schema context contains models for all augmentations, but backing class @@ -41,7 +42,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; */ public class AugmentationClassDiscoveredAfterCodecTest { - private SchemaContext schemaContext; + private EffectiveModelContext schemaContext; private BindingRuntimeContext runtimeContext; private ClassExcludingClassLoadingStrategy mockedContext; private BindingNormalizedNodeCodecRegistry registry; @@ -51,8 +52,9 @@ public class AugmentationClassDiscoveredAfterCodecTest { final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); ctx.addModuleInfos(BindingReflections.loadModuleInfos()); mockedContext = new ClassExcludingClassLoadingStrategy(ctx); - schemaContext = ctx.tryToCreateSchemaContext().get(); - runtimeContext = BindingRuntimeContext.create(mockedContext, schemaContext); + schemaContext = ctx.tryToCreateModelContext().get(); + runtimeContext = BindingRuntimeContext.create( + new DefaultBindingRuntimeGenerator().generateTypeMapping(schemaContext), mockedContext); registry = new BindingNormalizedNodeCodecRegistry(runtimeContext); }