X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2FActionLookupTest.java;h=97840294c6eb599ebf1c901a4675f51d572cb178;hb=7496691fabeb9d3b1276476740045d17fe473641;hp=e9ebd1d0f3ac3c85766f95d42f2249a571a444a6;hpb=4b7982d37ecb3a0f4afe3bc74de8524542a3e44d;p=mdsal.git

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ActionLookupTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ActionLookupTest.java
index e9ebd1d0f3..97840294c6 100644
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ActionLookupTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ActionLookupTest.java
@@ -8,44 +8,43 @@
 package org.opendaylight.mdsal.binding.dom.adapter;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
-import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
+import org.opendaylight.mdsal.binding.api.ActionSpec;
+import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext;
+import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers;
 import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.Cont;
 import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.Grpcont;
+import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.Grplst;
+import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.Lstio;
+import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.Nestedcont;
 import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.Othercont;
 import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.cont.Foo;
 import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.grpcont.Bar;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.lstio.Fooio;
+import org.opendaylight.yang.gen.v1.urn.odl.actions.norev.nested.Baz;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
 public class ActionLookupTest {
-    private static BindingToNormalizedNodeCodec CODEC;
-
-    @BeforeClass
-    public static void beforeClass() {
-        final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create();
-        ctx.addModuleInfos(BindingReflections.loadModuleInfos());
-
-        final BindingNormalizedNodeCodecRegistry registry = mock(BindingNormalizedNodeCodecRegistry.class);
-        CODEC = new BindingToNormalizedNodeCodec(ctx, registry);
-        CODEC.onGlobalContextUpdated(ctx.tryToCreateSchemaContext().get());
-    }
-
-    @AfterClass
-    public static void afterClass() {
-        CODEC = null;
-    }
-
     @Test
-    public void testActionSchemaPath() {
-        assertEquals(SchemaPath.create(true, Cont.QNAME, Foo.QNAME), CODEC.getActionPath(Foo.class));
-        assertEquals(SchemaPath.create(true, Grpcont.QNAME, Bar.QNAME), CODEC.getActionPath(Bar.class));
-        assertEquals(SchemaPath.create(true, Othercont.QNAME, Bar.QNAME),
-            CODEC.getActionPath(org.opendaylight.yang.gen.v1.urn.odl.actions.norev.othercont.Bar.class));
+    public void testActionPath() {
+        CurrentAdapterSerializer codec = new CurrentAdapterSerializer(new BindingCodecContext(
+            BindingRuntimeHelpers.createRuntimeContext()));
+
+        assertEquals(Absolute.of(Cont.QNAME, Foo.QNAME), codec.getActionPath(
+            ActionSpec.builder(Cont.class).build(Foo.class)));
+        assertEquals(Absolute.of(Grpcont.QNAME, Bar.QNAME), codec.getActionPath(
+            ActionSpec.builder(Grpcont.class).build(Bar.class)));
+        assertEquals(Absolute.of(Othercont.QNAME, Bar.QNAME), codec.getActionPath(
+            ActionSpec.builder(Othercont.class).build(
+                org.opendaylight.yang.gen.v1.urn.odl.actions.norev.othercont.Bar.class)));
+        assertEquals(Absolute.of(Nestedcont.QNAME, Baz.QNAME, Bar.QNAME), codec.getActionPath(
+            ActionSpec.builder(Nestedcont.class).withPathChild(Baz.class).build(
+                org.opendaylight.yang.gen.v1.urn.odl.actions.norev.nested.baz.Bar.class)));
+        assertEquals(Absolute.of(Lstio.QNAME, Fooio.QNAME), codec.getActionPath(
+            ActionSpec.builder(Lstio.class).build(Fooio.class)));
+        assertEquals(Absolute.of(Grplst.QNAME, Bar.QNAME), codec.getActionPath(
+            ActionSpec.builder(Grplst.class).build(
+                org.opendaylight.yang.gen.v1.urn.odl.actions.norev.grplst.Bar.class)));
     }
 }