Fix various warnings

[netconf.git] / restconf / sal-rest-connector / src / test / java / org / opendaylight / restconf / parser / builder / YangInstanceIdentifierDeserializerTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializerTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializerTest.java
index 43b9b218a9d15565320eb60702ff22357e9d6bae..e13a4cd478a9e26a417bdcba50e6a12856e4a46e 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializerTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/parser/builder/YangInstanceIdentifierDeserializerTest.java
@@ -18,7 +18,6 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -29,9 +28,10 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 /**
- * Unit tests for {@link YangInstanceIdentifierDeserializer}
+ * Unit tests for {@link YangInstanceIdentifierDeserializer}.
  */
 public class YangInstanceIdentifierDeserializerTest {
 
@@ -43,17 +43,18 @@ public class YangInstanceIdentifierDeserializerTest {
 
     @Before
     public void init() throws Exception {
-        schemaContext = TestRestconfUtils.loadSchemaContext("/restconf/parser/deserializer");
+        this.schemaContext =
+                YangParserTestUtils.parseYangSources(TestRestconfUtils.loadFiles("/restconf/parser/deserializer"));
     }
 
     /**
      * Test of deserialization <code>String</code> URI with container to
-     * <code>Iterable<YangInstanceIdentifier.PathArgument></code>.
+     * {@code Iterable<YangInstanceIdentifier.PathArgument>}.
      */
     @Test
     public void deserializeContainerTest() {
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer
-                .create(schemaContext, "deserializer-test:contA");
+                .create(this.schemaContext, "deserializer-test:contA");
 
         assertEquals("Result does not contains expected number of path arguments", 1, Iterables.size(result));
         assertEquals("Not expected path argument",
@@ -63,12 +64,12 @@ public class YangInstanceIdentifierDeserializerTest {
 
     /**
      * Test of deserialization <code>String</code> URI with container containing leaf to
-     * <code>Iterable<YangInstanceIdentifier.PathArgument></code>.
+     * {@code Iterable<YangInstanceIdentifier.PathArgument>}.
      */
     @Test
     public void deserializeContainerWithLeafTest() {
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer
-                .create(schemaContext, "deserializer-test:contA/leaf-A");
+                .create(this.schemaContext, "deserializer-test:contA/leaf-A");
 
         assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result));
 
@@ -83,12 +84,12 @@ public class YangInstanceIdentifierDeserializerTest {
 
     /**
      * Test of deserialization <code>String</code> URI with container containing list with leaf list to
-     * <code>Iterable<YangInstanceIdentifier.PathArgument></code>.
+     * {@code Iterable<YangInstanceIdentifier.PathArgument>}.
      */
     @Test
     public void deserializeContainerWithListWithLeafListTest() {
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer
-                .create(schemaContext, "deserializer-test:contA/list-A=100/leaf-list-AA=instance");
+                .create(this.schemaContext, "deserializer-test:contA/list-A=100/leaf-list-AA=instance");
 
         assertEquals("Result does not contains expected number of path arguments", 5, Iterables.size(result));
 
@@ -115,18 +116,18 @@ public class YangInstanceIdentifierDeserializerTest {
                 YangInstanceIdentifier.NodeIdentifier.create(leafList),
                 iterator.next());
         assertEquals("Not expected path argument",
-                new YangInstanceIdentifier.NodeWithValue(leafList, "instance"),
+                new YangInstanceIdentifier.NodeWithValue<>(leafList, "instance"),
                 iterator.next());
     }
 
     /**
      * Test of deserialization <code>String</code> URI containing list with no keys to
-     * <code>Iterable<YangInstanceIdentifier.PathArgument></code>.
+     * {@code Iterable<YangInstanceIdentifier.PathArgument>}.
      */
     @Test
     public void deserializeListWithNoKeysTest() {
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer
-                .create(schemaContext, "deserializer-test:list-no-key");
+                .create(this.schemaContext, "deserializer-test:list-no-key");
 
         assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result));
 
@@ -143,12 +144,12 @@ public class YangInstanceIdentifierDeserializerTest {
 
     /**
      * Test of deserialization <code>String</code> URI containing list with one key to
-     * <code>Iterable<YangInstanceIdentifier.PathArgument></code>.
+     * {@code Iterable<YangInstanceIdentifier.PathArgument>}.
      */
     @Test
     public void deserializeListWithOneKeyTest() {
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer
-                .create(schemaContext, "deserializer-test:list-one-key=value");
+                .create(this.schemaContext, "deserializer-test:list-one-key=value");
 
         assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result));
 
@@ -165,7 +166,7 @@ public class YangInstanceIdentifierDeserializerTest {
 
     /**
      * Test of deserialization <code>String</code> URI containing list with multiple keys to
-     * <code>Iterable<YangInstanceIdentifier.PathArgument></code>.
+     * {@code Iterable<YangInstanceIdentifier.PathArgument>}.
      */
     @Test
     public void deserializeListWithMultipleKeysTest() {
@@ -176,7 +177,7 @@ public class YangInstanceIdentifierDeserializerTest {
         values.put(QName.create(list, "enabled"), false);
 
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer
-                .create(schemaContext, "deserializer-test:list-multiple-keys=value,100,false");
+                .create(this.schemaContext, "deserializer-test:list-multiple-keys=value,100,false");
 
         assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result));
 
@@ -192,12 +193,12 @@ public class YangInstanceIdentifierDeserializerTest {
 
     /**
      * Test of deserialization <code>String</code> URI containing leaf list to
-     * <code>Iterable<YangInstanceIdentifier.PathArgument></code>.
+     * {@code Iterable<YangInstanceIdentifier.PathArgument>}.
      */
     @Test
     public void deserializeLeafListTest() {
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer
-                .create(schemaContext, "deserializer-test:leaf-list-0=true");
+                .create(this.schemaContext, "deserializer-test:leaf-list-0=true");
 
         assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result));
 
@@ -208,7 +209,7 @@ public class YangInstanceIdentifierDeserializerTest {
                 new YangInstanceIdentifier.NodeIdentifier(leafList),
                 iterator.next());
         assertEquals("Not expected path argument",
-                new YangInstanceIdentifier.NodeWithValue(leafList, true).toString(),
+                new YangInstanceIdentifier.NodeWithValue<>(leafList, true).toString(),
                 iterator.next().toString());
     }
 
@@ -217,7 +218,7 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void deserializeEmptyDataTest() {
-        final Iterable<PathArgument> result = YangInstanceIdentifierDeserializer.create(schemaContext, "");
+        final Iterable<PathArgument> result = YangInstanceIdentifierDeserializer.create(this.schemaContext, "");
         assertTrue("Empty result expected", Iterables.isEmpty(result));
     }
 
@@ -227,7 +228,7 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void deserializeNullSchemaContextNegativeTest() {
-        thrown.expect(NullPointerException.class);
+        this.thrown.expect(NullPointerException.class);
         YangInstanceIdentifierDeserializer.create(null, "deserializer-test:contA");
     }
 
@@ -237,8 +238,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void nullDataNegativeNegativeTest() {
-        thrown.expect(NullPointerException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, null);
+        this.thrown.expect(NullPointerException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, null);
     }
 
     /**
@@ -247,8 +248,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void deserializeBadCharMissingSlashOrEqualNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:cont*leaf-A");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:cont*leaf-A");
     }
 
     /**
@@ -257,8 +258,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void validArgIdentifierContainerEndsWithSlashNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:contA/");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:contA/");
     }
 
     /**
@@ -267,8 +268,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void validArgIdentifierListEndsWithSlashLNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:list-one-key=value/");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:list-one-key=value/");
     }
 
     /**
@@ -277,8 +278,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void prepareQnameEmptyIdentifierNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "/");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "/");
     }
 
     /**
@@ -287,8 +288,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void prepareQnameTwoSlashesNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:contA//leaf-A");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:contA//leaf-A");
     }
 
     /**
@@ -297,8 +298,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void prepareQnameBuildPathNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test*contA");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test*contA");
     }
 
     /**
@@ -307,8 +308,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void prepareQnameNotExistingPrefixNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "not-existing:contA");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "not-existing:contA");
     }
 
     /**
@@ -317,8 +318,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void prepareQnameNotValidPrefixAndLocalNameNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:*not-parsable-identifier");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:*not-parsable-identifier");
     }
 
     /**
@@ -327,8 +328,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void prepareQnameErrorParsingNegativeTest() {
-        thrown.expect(StringIndexOutOfBoundsException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:");
+        this.thrown.expect(StringIndexOutOfBoundsException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:");
     }
 
     /**
@@ -339,7 +340,7 @@ public class YangInstanceIdentifierDeserializerTest {
     @Test
     public void prepareQnameNotValidContainerNameNegativeTest() {
         try {
-            YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:contA/leafB");
+            YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:contA/leafB");
             fail("Test should fail due to unknown child node in container");
         } catch (final RestconfDocumentedException e) {
             assertEquals("Not expected error type",
@@ -359,7 +360,8 @@ public class YangInstanceIdentifierDeserializerTest {
     @Test
     public void prepareQnameNotValidListNameNegativeTest() {
         try {
-            YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:list-no-key/disabled=false");
+            YangInstanceIdentifierDeserializer
+                    .create(this.schemaContext, "deserializer-test:list-no-key/disabled=false");
             fail("Test should fail due to unknown child node in list");
         } catch (final RestconfDocumentedException e) {
             assertEquals("Not expected error type",
@@ -377,8 +379,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void prepareIdentifierNotKeyedEntryNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:list-one-key");
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:list-one-key");
     }
 
     /**
@@ -387,8 +389,8 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void deserializeKeysEndsWithComaNegativeTest() {
-        thrown.expect(IllegalArgumentException.class);
-        YangInstanceIdentifierDeserializer.create( schemaContext,
+        this.thrown.expect(IllegalArgumentException.class);
+        YangInstanceIdentifierDeserializer.create(this.schemaContext,
                 "deserializer-test:list-multiple-keys=value,100,false,");
     }
 
@@ -405,7 +407,7 @@ public class YangInstanceIdentifierDeserializerTest {
         values.put(QName.create(list, "enabled"), "");
 
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer.create(
-                schemaContext, "deserializer-test:list-multiple-keys=%3Afoo,,/string-value");
+                this.schemaContext, "deserializer-test:list-multiple-keys=%3Afoo,,/string-value");
 
         assertEquals("Result does not contains expected number of path arguments", 3, Iterables.size(result));
 
@@ -435,7 +437,7 @@ public class YangInstanceIdentifierDeserializerTest {
     public void notAllListKeysEncodedNegativeTest() {
         try {
             YangInstanceIdentifierDeserializer.create(
-                    schemaContext, "deserializer-test:list-multiple-keys=%3Afoo/string-value");
+                    this.schemaContext, "deserializer-test:list-multiple-keys=%3Afoo/string-value");
             fail("Test should fail due to missing list key values");
         } catch (final RestconfDocumentedException e) {
             assertEquals("Not expected error type",
@@ -453,16 +455,16 @@ public class YangInstanceIdentifierDeserializerTest {
      */
     @Test
     public void percentEncodedKeyEndsWithNoPercentEncodedChars() {
-        final String URI = "deserializer-test:list-multiple-keys=%3Afoo,bar%3A,foo%3Abar";
+        final String URI = "deserializer-test:list-multiple-keys=%3Afoo,1,true";
         final YangInstanceIdentifier result = YangInstanceIdentifier.create(
-                YangInstanceIdentifierDeserializer.create(schemaContext, URI));
+                YangInstanceIdentifierDeserializer.create(this.schemaContext, URI));
 
         final Iterator<Map.Entry<QName, Object>> resultListKeys = ((YangInstanceIdentifier.NodeIdentifierWithPredicates)
                 result.getLastPathArgument()).getKeyValues().entrySet().iterator();
 
         assertEquals(":foo", resultListKeys.next().getValue());
-        assertEquals("bar:", resultListKeys.next().getValue());
-        assertEquals("foo:bar", resultListKeys.next().getValue());
+        assertEquals(new Short("1"), resultListKeys.next().getValue());
+        assertEquals(true, resultListKeys.next().getValue());
     }
 
     /**
@@ -477,7 +479,7 @@ public class YangInstanceIdentifierDeserializerTest {
         values.put(QName.create(list, "enabled"), "");
 
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer
-                .create(schemaContext, "deserializer-test:list-multiple-keys=,,");
+                .create(this.schemaContext, "deserializer-test:list-multiple-keys=,,");
 
         assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result));
 
@@ -499,7 +501,7 @@ public class YangInstanceIdentifierDeserializerTest {
     @Test
     public void leafListMissingKeyNegativeTest() {
         try {
-            YangInstanceIdentifierDeserializer.create(schemaContext, "deserializer-test:leaf-list-0=");
+            YangInstanceIdentifierDeserializer.create(this.schemaContext, "deserializer-test:leaf-list-0=");
             fail("Test should fail due to missing instance value");
         } catch (final RestconfDocumentedException e) {
             assertEquals("Not expected error type",
@@ -517,7 +519,7 @@ public class YangInstanceIdentifierDeserializerTest {
     @Test
     public void deserializePartInOtherModuleTest() {
         final Iterable<YangInstanceIdentifier.PathArgument> result = YangInstanceIdentifierDeserializer.create(
-                schemaContext, "deserializer-test-included:augmented-list=100/augmented-leaf");
+                this.schemaContext, "deserializer-test-included:augmented-list=100/augmented-leaf");
 
         assertEquals("Result does not contains expected number of path arguments", 4, Iterables.size(result));