Use YANG binding from YANG Tools

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / mdsal / binding / dom / adapter / ContextExtractorTest.java

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ContextExtractorTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ContextExtractorTest.java
index 204b60ba80ed989aa9e565b36d7f227e8d3b13c2..1a1645ca66a97b8290f2232ea37c676ce02dbd54 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ContextExtractorTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ContextExtractorTest.java
@@ -22,26 +22,21 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.rpc.routing.rev140701.RoutedSimpleRouteInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.rpc.routing.rev140701.RoutedSimpleRouteInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
+import org.opendaylight.yangtools.binding.DataObject;
+import org.opendaylight.yangtools.binding.DataObjectIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public final class ContextExtractorTest {
 
-    public interface Transitive extends EncapsulatedRouteInGrouping {
-
-    }
-
-    private static final InstanceIdentifier<?> TEST_ROUTE = InstanceIdentifier.create(Top.class);
-    private static final Transitive TEST_GROUPING = new Transitive() {
+    public interface Transitive extends DataObject, EncapsulatedRouteInGrouping {
         @Override
-        public Class<? extends Transitive> implementedInterface() {
+        default Class<Transitive> implementedInterface() {
             return Transitive.class;
         }
+    }
 
-        @Override
-        public EncapsulatedRoute getRoute() {
-            return new EncapsulatedRoute(TEST_ROUTE);
-        }
-    };
+    private static final DataObjectIdentifier<?> TEST_ROUTE = InstanceIdentifier.create(Top.class).toIdentifier();
+    private static final Transitive TEST_GROUPING = () -> new EncapsulatedRoute(TEST_ROUTE);
 
     @Test
     public void testNonRoutedExtraction() {