Eliminate IetfYangUtil.INSTANCE

[mdsal.git] / model / ietf / rfc6991-ietf-yang-types / src / test / java / org / opendaylight / yang / gen / v1 / urn / ietf / params / xml / ns / yang / ietf / yang / types / rev130715 / IetfYangUtilTest.java

diff --git a/model/ietf/rfc6991-ietf-yang-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtilTest.java b/model/ietf/rfc6991-ietf-yang-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtilTest.java
index 38c1905838efca35cb03a2973d940e2b56cd82d6..38c83a4c5591cc3d8ed8c16390b73cb07b15d361 100644 (file)
--- a/model/ietf/rfc6991-ietf-yang-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtilTest.java
+++ b/model/ietf/rfc6991-ietf-yang-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtilTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.IetfYangUtil.INSTANCE;
 
 import java.util.UUID;
 import org.eclipse.jdt.annotation.NonNull;
@@ -21,108 +20,109 @@ public class IetfYangUtilTest {
 
     @Test
     public void testBytesToMac() {
-        final var mac = INSTANCE.macAddressFor(BYTES);
+        final var mac = IetfYangUtil.macAddressFor(BYTES);
         assertEquals(CANON, mac.getValue());
     }
 
     @Test
     public void testMacToBytes() {
-        final byte[] bytes1 = INSTANCE.macAddressBytes(new MacAddress(CANON));
+        final byte[] bytes1 = IetfYangUtil.macAddressBytes(new MacAddress(CANON));
         assertArrayEquals(BYTES, bytes1);
 
-        final byte[] bytes2 = INSTANCE.macAddressBytes(new MacAddress("01:02:1E:5a:Fb:88"));
+        final byte[] bytes2 = IetfYangUtil.macAddressBytes(new MacAddress("01:02:1E:5a:Fb:88"));
         assertArrayEquals(BYTES, bytes2);
     }
 
     @Test
     public void testBytesToHex() {
-        final HexString hex = INSTANCE.hexStringFor(BYTES);
+        final HexString hex = IetfYangUtil.hexStringFor(BYTES);
         assertEquals(CANON, hex.getValue());
     }
 
     @Test
     public void testHexToBytes() {
-        final byte[] bytes1 = INSTANCE.hexStringBytes(new HexString(CANON));
+        final byte[] bytes1 = IetfYangUtil.hexStringBytes(new HexString(CANON));
         assertArrayEquals(BYTES, bytes1);
 
-        final byte[] bytes2 = INSTANCE.hexStringBytes(new HexString("01:02:1E:5a:Fb:88"));
+        final byte[] bytes2 = IetfYangUtil.hexStringBytes(new HexString("01:02:1E:5a:Fb:88"));
         assertArrayEquals(BYTES, bytes2);
     }
 
     @Test
     public void testPhysToBytes() {
-        final byte[] bytes1 = INSTANCE.physAddressBytes(new PhysAddress(CANON));
+        final byte[] bytes1 = IetfYangUtil.physAddressBytes(new PhysAddress(CANON));
         assertArrayEquals(BYTES, bytes1);
 
-        final byte[] bytes2 = INSTANCE.physAddressBytes(new PhysAddress("01:02:1E:5a:Fb:88"));
+        final byte[] bytes2 = IetfYangUtil.physAddressBytes(new PhysAddress("01:02:1E:5a:Fb:88"));
         assertArrayEquals(BYTES, bytes2);
 
-        assertArrayEquals(new byte[0], INSTANCE.physAddressBytes(new PhysAddress("")));
-        assertArrayEquals(new byte[] { (byte) 0xaa }, INSTANCE.physAddressBytes(new PhysAddress("aa")));
-        assertArrayEquals(new byte[] { (byte) 0xaa, (byte) 0xbb }, INSTANCE.physAddressBytes(new PhysAddress("aa:bb")));
+        assertArrayEquals(new byte[0], IetfYangUtil.physAddressBytes(new PhysAddress("")));
+        assertArrayEquals(new byte[] { (byte) 0xaa }, IetfYangUtil.physAddressBytes(new PhysAddress("aa")));
+        assertArrayEquals(new byte[] { (byte) 0xaa, (byte) 0xbb },
+            IetfYangUtil.physAddressBytes(new PhysAddress("aa:bb")));
     }
 
     @Test
     public void testQuadBits() {
-        assertEquals(0x01020304, INSTANCE.dottedQuadBits(new DottedQuad("1.2.3.4")));
-        assertEquals(0xFFFFFFFF, INSTANCE.dottedQuadBits(new DottedQuad("255.255.255.255")));
+        assertEquals(0x01020304, IetfYangUtil.dottedQuadBits(new DottedQuad("1.2.3.4")));
+        assertEquals(0xFFFFFFFF, IetfYangUtil.dottedQuadBits(new DottedQuad("255.255.255.255")));
     }
 
     @Test
     public void testQuadBytes() {
-        assertArrayEquals(new byte[] { 1, 2, 3, 4 }, INSTANCE.dottedQuadBytes(new DottedQuad("1.2.3.4")));
+        assertArrayEquals(new byte[] { 1, 2, 3, 4 }, IetfYangUtil.dottedQuadBytes(new DottedQuad("1.2.3.4")));
     }
 
     @Test
     public void testQuadForBits() {
-        assertEquals("1.2.3.4", INSTANCE.dottedQuadFor(0x01020304).getValue());
-        assertEquals("255.255.255.255", INSTANCE.dottedQuadFor(0xFFFFFFFF).getValue());
+        assertEquals("1.2.3.4", IetfYangUtil.dottedQuadFor(0x01020304).getValue());
+        assertEquals("255.255.255.255", IetfYangUtil.dottedQuadFor(0xFFFFFFFF).getValue());
     }
 
     @Test
     public void testQuadForBytes() {
-        assertEquals("1.2.3.4", INSTANCE.dottedQuadFor(new byte[] { 1, 2, 3, 4 }).getValue());
+        assertEquals("1.2.3.4", IetfYangUtil.dottedQuadFor(new byte[] { 1, 2, 3, 4 }).getValue());
     }
 
     @Test
     public void testUuidFor() {
-        final UUID uuid = UUID.fromString("f81d4fae-7dec-11d0-a765-00a0c91e6bf6");
-        assertEquals("f81d4fae-7dec-11d0-a765-00a0c91e6bf6", INSTANCE.uuidFor(uuid).getValue());
+        final var uuid = UUID.fromString("f81d4fae-7dec-11d0-a765-00a0c91e6bf6");
+        assertEquals("f81d4fae-7dec-11d0-a765-00a0c91e6bf6", IetfYangUtil.uuidFor(uuid).getValue());
     }
 
     @Test
     public void canonizeMACTest() {
-        assertEquals(CANON, INSTANCE.canonizeMacAddress(new MacAddress("01:02:1E:5A:FB:88")).getValue());
+        assertEquals(CANON, IetfYangUtil.canonizeMacAddress(new MacAddress("01:02:1E:5A:FB:88")).getValue());
     }
 
     @Test
     public void testDottedQuad() {
-        assertArrayEquals(new byte[] { 1, 2, 3, 4 }, INSTANCE.dottedQuadBytes(new DottedQuad("1.2.3.4")));
-        assertEquals(new DottedQuad("1.2.3.4"), INSTANCE.dottedQuadFor(new byte[] { 1, 2, 3, 4 }));
+        assertArrayEquals(new byte[] { 1, 2, 3, 4 }, IetfYangUtil.dottedQuadBytes(new DottedQuad("1.2.3.4")));
+        assertEquals(new DottedQuad("1.2.3.4"), IetfYangUtil.dottedQuadFor(new byte[] { 1, 2, 3, 4 }));
     }
 
     @Test
     public void testHexString() {
-        assertArrayEquals(new byte[] { 0, 1 }, INSTANCE.hexStringBytes(new HexString("00:01")));
-        assertEquals(new HexString("00:01"), INSTANCE.hexStringFor(new byte[] { 0, 1 }));
+        assertArrayEquals(new byte[] { 0, 1 }, IetfYangUtil.hexStringBytes(new HexString("00:01")));
+        assertEquals(new HexString("00:01"), IetfYangUtil.hexStringFor(new byte[] { 0, 1 }));
     }
 
     @Test
     public void testPhysAddress() {
-        assertArrayEquals(new byte[] { 0, 1} , INSTANCE.physAddressBytes(new PhysAddress("00:01")));
-        assertEquals(new PhysAddress("00:01"), INSTANCE.physAddressFor(new byte[] { 0, 1 }));
+        assertArrayEquals(new byte[] { 0, 1} , IetfYangUtil.physAddressBytes(new PhysAddress("00:01")));
+        assertEquals(new PhysAddress("00:01"), IetfYangUtil.physAddressFor(new byte[] { 0, 1 }));
     }
 
     @Test
     public void testMacAddress() {
         assertArrayEquals(new byte[] { 0, 1, 2, 3, 4, 5 },
-            INSTANCE.macAddressBytes(new MacAddress("00:01:02:03:04:05")));
-        assertEquals(new MacAddress("00:01:02:03:04:05"), INSTANCE.macAddressFor(new byte[] { 0, 1, 2, 3, 4, 5 }));
+            IetfYangUtil.macAddressBytes(new MacAddress("00:01:02:03:04:05")));
+        assertEquals(new MacAddress("00:01:02:03:04:05"), IetfYangUtil.macAddressFor(new byte[] { 0, 1, 2, 3, 4, 5 }));
     }
 
     @Test
     public void testUuid() {
         final UUID java = UUID.randomUUID();
-        assertEquals(new Uuid(java.toString()), INSTANCE.uuidFor(java));
+        assertEquals(new Uuid(java.toString()), IetfYangUtil.uuidFor(java));
     }
 }