Generate implementedInterface

[mdsal.git] / binding / mdsal-binding-generator-impl / src / test / java / org / opendaylight / mdsal / binding / generator / impl / Mdsal320Test.java

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java
index 5414514695b320417d24624cf9dbcc5eed202b48..25ecff9393204f9cccdcb7dbc374528725381296 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/Mdsal320Test.java
@@ -8,10 +8,11 @@
 package org.opendaylight.mdsal.binding.generator.impl;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.common.collect.Iterables;
+import java.util.Iterator;
 import java.util.List;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.model.api.GeneratedProperty;
@@ -33,7 +34,7 @@ public class Mdsal320Test {
         assertEquals(4, generateTypes.size());
 
         final Type fooType = generateTypes.stream().filter(type -> type.getFullyQualifiedName()
-            .equals("org.opendaylight.yang.gen.v1.urn.odl.mdsal320.norev.Foo")).findFirst().get();
+            .equals("org.opendaylight.yang.gen.v1.urn.odl.yt320.norev.Foo")).findFirst().get();
         assertTrue(fooType instanceof GeneratedType);
         final GeneratedType foo = (GeneratedType) fooType;
 
@@ -45,7 +46,7 @@ public class Mdsal320Test {
                     assertTrue(enc instanceof GeneratedTransferObject);
                     bar = (GeneratedTransferObject) enc;
                     break;
-                case "Bar1":
+                case "Bar$1":
                     assertTrue(enc instanceof GeneratedTransferObject);
                     bar1 = (GeneratedTransferObject) enc;
                     break;
@@ -58,14 +59,22 @@ public class Mdsal320Test {
         assertNotNull(bar1);
         assertTrue(bar1.isUnionType());
 
-        final MethodSignature getBar = Iterables.getOnlyElement(foo.getMethodDefinitions());
+        final Iterator<MethodSignature> it = foo.getMethodDefinitions().iterator();
+        assertTrue(it.hasNext());
+        final MethodSignature getImplIface = it.next();
+        assertEquals("implementedInterface", getImplIface.getName());
+        assertTrue(getImplIface.isDefault());
+        assertTrue(it.hasNext());
+
+        final MethodSignature getBar = it.next();
+        assertFalse(it.hasNext());
         final Type getBarType = getBar.getReturnType();
         assertTrue(getBarType instanceof GeneratedTransferObject);
         final GeneratedTransferObject getBarTO = (GeneratedTransferObject) getBarType;
         assertTrue(getBarTO.isUnionType());
         assertEquals(bar, getBarTO);
 
-        final GeneratedProperty bar1Prop = bar.getProperties().stream().filter(prop -> "bar1".equals(prop.getName()))
+        final GeneratedProperty bar1Prop = bar.getProperties().stream().filter(prop -> "bar$1".equals(prop.getName()))
                 .findFirst().get();
         final Type bar1PropRet = bar1Prop.getReturnType();
         assertEquals(bar1, bar1PropRet);