Cleanup Bug6887Test

Rather than using ImmutableList, use variadic arguments and their
array to construct the SchemaPath.

Change-Id: Ia3446e17e87981d2ad896d209a7b1f6ebf3f3b26
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java
index 9d5fed32b2ebaefdb1b738ccb0755e0575346f46..232f5065ff8f23e5a058b07516d2434d4ab1e8cd 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java
@@ -13,9 +13,9 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
@@ -178,34 +178,31 @@ public class Bug6887Test {
 
         List<Bit> bits = bitsType.getBits();
         assertEquals(2, bits.size());
-        Bit bitB = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-bits-leaf",
-                "my-derived-bits-type", "bit-b")), 2);
-        Bit bitC = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-bits-leaf",
-                "my-derived-bits-type", "bit-c")), 3);
+        Bit bitB = createBit(createSchemaPath(true, bar.getQNameModule(), "my-bits-leaf", "my-derived-bits-type",
+            "bit-b"), 2);
+        Bit bitC = createBit(createSchemaPath(true, bar.getQNameModule(), "my-bits-leaf", "my-derived-bits-type",
+            "bit-c"), 3);
         assertContainsBits(bits, bitB, bitC);
 
         bitsType = bitsType.getBaseType();
         bits = bitsType.getBits();
         assertEquals(3, bits.size());
-        bitB = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-derived-bits-type",
-                "my-base-bits-type", "bit-b")), 2);
-        bitC = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-derived-bits-type",
-                "my-base-bits-type", "bit-c")), 3);
-        Bit bitD = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-derived-bits-type",
-                "my-base-bits-type", "bit-d")), 4);
+        bitB = createBit(createSchemaPath(true, bar.getQNameModule(), "my-derived-bits-type", "my-base-bits-type",
+            "bit-b"), 2);
+        bitC = createBit(createSchemaPath(true, bar.getQNameModule(), "my-derived-bits-type", "my-base-bits-type",
+            "bit-c"), 3);
+        Bit bitD = createBit(createSchemaPath(true, bar.getQNameModule(), "my-derived-bits-type", "my-base-bits-type",
+            "bit-d"), 4);
         assertContainsBits(bits, bitB, bitC, bitD);
 
         bitsType = bitsType.getBaseType();
         bits = bitsType.getBits();
         assertEquals(4, bits.size());
-        final Bit bitA = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-base-bits-type",
-                "bits", "bit-a")), 1);
-        bitB = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-base-bits-type",
-                "bits", "bit-b")), 2);
-        bitC = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-base-bits-type",
-                "bits", "bit-c")), 3);
-        bitD = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-base-bits-type",
-                "bits", "bit-d")), 4);
+        final Bit bitA = createBit(createSchemaPath(true, bar.getQNameModule(), "my-base-bits-type", "bits", "bit-a"),
+            1);
+        bitB = createBit(createSchemaPath(true, bar.getQNameModule(), "my-base-bits-type", "bits", "bit-b"), 2);
+        bitC = createBit(createSchemaPath(true, bar.getQNameModule(), "my-base-bits-type", "bits", "bit-c"), 3);
+        bitD = createBit(createSchemaPath(true, bar.getQNameModule(), "my-base-bits-type", "bits", "bit-d"), 4);
         assertContainsBits(bits, bitA, bitB, bitC, bitD);
 
         final LeafSchemaNode myBitsLeaf2 = (LeafSchemaNode) bar.getDataChildByName(
@@ -215,12 +212,12 @@ public class Bug6887Test {
         bitsType = (BitsTypeDefinition) myBitsLeaf2.getType();
         bits = bitsType.getBits();
         assertEquals(3, bits.size());
-        bitB = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-derived-bits-type",
-                "my-base-bits-type", "bit-b")), 2);
-        bitC = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-derived-bits-type",
-                "my-base-bits-type", "bit-c")), 3);
-        bitD = createBit(createSchemaPath(true, bar.getQNameModule(), ImmutableList.of("my-derived-bits-type",
-                "my-base-bits-type", "bit-d")), 4);
+        bitB = createBit(createSchemaPath(true, bar.getQNameModule(), "my-derived-bits-type", "my-base-bits-type",
+            "bit-b"), 2);
+        bitC = createBit(createSchemaPath(true, bar.getQNameModule(), "my-derived-bits-type", "my-base-bits-type",
+            "bit-c"), 3);
+        bitD = createBit(createSchemaPath(true, bar.getQNameModule(), "my-derived-bits-type", "my-base-bits-type",
+            "bit-d"), 4);
         assertContainsBits(bits, bitB, bitC, bitD);
     }
 
@@ -327,8 +324,8 @@ public class Bug6887Test {
     }
 
     private static SchemaPath createSchemaPath(final boolean absolute, final QNameModule qnameModule,
-            final Iterable<String> localNames) {
-        return SchemaPath.create(Iterables.transform(localNames,
-            localName -> QName.create(qnameModule, localName)), true);
+            final String... localNames) {
+        return SchemaPath.create(Arrays.stream(localNames).map(localName -> QName.create(qnameModule, localName))
+            .collect(Collectors.toList()), true);
     }
 }