Bug 8351: Enforce check-style rules for restconf - sal-rest-connector

[netconf.git] / restconf / sal-rest-connector / src / test / java / org / opendaylight / controller / sal / restconf / impl / nn / to / xml / test / NnToXmlTest.java

diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
index 1c77de09b86186e0df039f88940a6c93aa6ca962..ed9f73cb9b553edbe6160f6bab45119da649bef2 100644 (file)
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
@@ -60,7 +60,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
     @BeforeClass
     public static void initialization() {
         schemaContext = schemaContextLoader("/nn-to-xml/yang", schemaContext);
-        controllerContext.setSchemas(schemaContext);
+        CONTROLLER_CONTEXT.setSchemas(schemaContext);
     }
 
     @Test
@@ -193,10 +193,10 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
     public void nnAsYangBitsToXmlTest() throws Exception {
         final BitsTypeDefinition.Bit mockBit1 = Mockito.mock(BitsTypeDefinition.Bit.class);
         Mockito.when(mockBit1.getName()).thenReturn("one");
-        Mockito.when(mockBit1.getPosition()).thenReturn(1l);
+        Mockito.when(mockBit1.getPosition()).thenReturn(1L);
         final BitsTypeDefinition.Bit mockBit2 = Mockito.mock(BitsTypeDefinition.Bit.class);
         Mockito.when(mockBit2.getName()).thenReturn("two");
-        Mockito.when(mockBit2.getPosition()).thenReturn(2l);
+        Mockito.when(mockBit2.getPosition()).thenReturn(2L);
         final BitsTypeBuilder bitsTypeBuilder = BaseTypes.bitsTypeBuilder(Mockito.mock(SchemaPath.class));
         bitsTypeBuilder.addBit(mockBit1);
         bitsTypeBuilder.addBit(mockBit2);
@@ -246,10 +246,10 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
     public void nnAsYangUnionToXmlTest() throws Exception {
         final BitsTypeDefinition.Bit mockBit1 = Mockito.mock(BitsTypeDefinition.Bit.class);
         Mockito.when(mockBit1.getName()).thenReturn("first");
-        Mockito.when(mockBit1.getPosition()).thenReturn(1l);
+        Mockito.when(mockBit1.getPosition()).thenReturn(1L);
         final BitsTypeDefinition.Bit mockBit2 = Mockito.mock(BitsTypeDefinition.Bit.class);
         Mockito.when(mockBit2.getName()).thenReturn("second");
-        Mockito.when(mockBit2.getPosition()).thenReturn(2l);
+        Mockito.when(mockBit2.getPosition()).thenReturn(2L);
 
         final BitsTypeBuilder bitsTypeBuilder = BaseTypes.bitsTypeBuilder(Mockito.mock(SchemaPath.class));
         bitsTypeBuilder.addBit(mockBit1);
@@ -259,26 +259,36 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         unionTypeBuilder.addType(BaseTypes.int8Type());
         unionTypeBuilder.addType(bitsTypeBuilder.build());
         unionTypeBuilder.addType(BaseTypes.booleanType());
+        unionTypeBuilder.addType(BaseTypes.stringType());
 
         final String elName = "lfUnion";
 
+        // test int8
         final String int8 = "15";
         NormalizedNodeContext normalizedNodeContext = prepareNNC(
                 TypeDefinitionAwareCodec.from(unionTypeBuilder.build()).deserialize(int8), elName);
         nnToXml(normalizedNodeContext, "<" + elName + ">15</" + elName + ">");
 
+        // test bits
         final String bits = "first second";
         normalizedNodeContext = prepareNNC(TypeDefinitionAwareCodec.from(unionTypeBuilder.build()).deserialize(bits),
                 elName);
-        nnToXml(normalizedNodeContext, "<" + elName + ">first second</" + elName + ">");
+        nnToXml(normalizedNodeContext, "<" + elName + ">[first, second]</" + elName + ">");
 
+        // test boolean
         final String bool = "true";
         normalizedNodeContext = prepareNNC(TypeDefinitionAwareCodec.from(unionTypeBuilder.build()).deserialize(bool),
                 elName);
         nnToXml(normalizedNodeContext, "<" + elName + ">true</" + elName + ">");
+
+        // test string
+        final String s = "Hi!";
+        normalizedNodeContext = prepareNNC(TypeDefinitionAwareCodec.from(unionTypeBuilder.build()).deserialize(s),
+                elName);
+        nnToXml(normalizedNodeContext, "<" + elName + ">Hi!</" + elName + ">");
     }
 
-    private NormalizedNodeContext prepareNNC(final Object object, final String name) {
+    private static NormalizedNodeContext prepareNNC(final Object object, final String name) {
         final QName cont = QName.create("basic:module", "2013-12-2", "cont");
         final QName lf = QName.create("basic:module", "2013-12-2", name);
 
@@ -294,7 +304,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(Builders.leafBuilder((LeafSchemaNode) schemaLf).withValue(object).build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext<DataSchemaNode>(null, contSchema, null, schemaContext), contData.build());
+                new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build());
 
         return testNormalizedNodeContext;
     }
@@ -304,12 +314,12 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         final OutputStream output = new ByteArrayOutputStream();
         this.xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null, this.mediaType, null, output);
 
-        for (int i = 0; i < xmlRepresentation.length; i++) {
-            assertTrue(output.toString().contains(xmlRepresentation[i]));
+        for (String element : xmlRepresentation) {
+            assertTrue(output.toString().contains(element));
         }
     }
 
-    private NormalizedNodeContext prepareLeafrefData() {
+    private static NormalizedNodeContext prepareLeafrefData() {
         final QName cont = QName.create("basic:module", "2013-12-2", "cont");
         final QName lfBoolean = QName.create("basic:module", "2013-12-2", "lfBoolean");
         final QName lfLfref = QName.create("basic:module", "2013-12-2", "lfLfref");
@@ -332,12 +342,12 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(Builders.leafBuilder((LeafSchemaNode) schemaLf).withValue("true").build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext<DataSchemaNode>(null, contSchema, null, schemaContext), contData.build());
+                new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build());
 
         return testNormalizedNodeContext;
     }
 
-    private NormalizedNodeContext prepareLeafrefNegativeData() {
+    private static NormalizedNodeContext prepareLeafrefNegativeData() {
         final QName cont = QName.create("basic:module", "2013-12-2", "cont");
         final QName lfLfref = QName.create("basic:module", "2013-12-2", "lfLfrefNegative");
 
@@ -355,7 +365,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
                 new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build());
     }
 
-    private NormalizedNodeContext prepareIdrefData(final String prefix, final boolean valueAsQName) {
+    private static NormalizedNodeContext prepareIdrefData(final String prefix, final boolean valueAsQName) {
         final QName cont = QName.create("basic:module", "2013-12-2", "cont");
         final QName cont1 = QName.create("basic:module", "2013-12-2", "cont1");
         final QName lf11 = QName.create("basic:module", "2013-12-2", "lf11");
@@ -386,7 +396,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         contData.withChild(cont1Data.build());
 
         final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext(
-                new InstanceIdentifierContext<DataSchemaNode>(null, contSchema, null, schemaContext), contData.build());
+                new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build());
         return testNormalizedNodeContext;
     }