X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=model%2Fietf%2Frfc6991-ietf-inet-types%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyang%2Fgen%2Fv1%2Furn%2Fietf%2Fparams%2Fxml%2Fns%2Fyang%2Fietf%2Finet%2Ftypes%2Frev130715%2FHostBuilderTest.java;h=d8e878f3e3fc4cba09ea724904625036c235b55b;hb=refs%2Fchanges%2F96%2F100496%2F7;hp=1abe225e0ba5b970818f141ebb98b82182ffad1a;hpb=0efe5a0d2cffb6a2e4e78570f79f367cc234d74e;p=mdsal.git diff --git a/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilderTest.java b/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilderTest.java index 1abe225e0b..d8e878f3e3 100644 --- a/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilderTest.java +++ b/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilderTest.java @@ -8,22 +8,13 @@ package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; -import java.lang.reflect.Constructor; import org.junit.Test; public class HostBuilderTest { - @Test public void testGetDefaultInstance() throws Exception { - final Constructor constructor = HostBuilder.class.getDeclaredConstructor(); - assertFalse(constructor.isAccessible()); - constructor.setAccessible(true); - final HostBuilder newInstance = constructor.newInstance(); - assertNotNull(newInstance); - testIpv4("1.1.1.1"); testIpv4("192.168.155.100"); testIpv4("1.192.1.221"); @@ -44,9 +35,9 @@ public class HostBuilderTest { testDomain("test"); } - @Test(expected = IllegalArgumentException.class) + @Test public void testIllegalArgumentException1() { - HostBuilder.getDefaultInstance("2001:0DB8::CD3/60"); + assertThrows(IllegalArgumentException.class, () -> IetfInetUtil.hostFor("2001:0DB8::CD3/60")); } @Test(expected = IllegalArgumentException.class) @@ -55,17 +46,17 @@ public class HostBuilderTest { } private static void testIpv4(final String ip) { - final Host defaultInstance = HostBuilder.getDefaultInstance(ip); + final Host defaultInstance = IetfInetUtil.hostFor(ip); assertEquals(new Host(new IpAddress(new Ipv4Address(ip))), defaultInstance); } private static void testIpv6(final String ip) { - final Host defaultInstance = HostBuilder.getDefaultInstance(ip); + final Host defaultInstance = IetfInetUtil.hostFor(ip); assertEquals(new Host(new IpAddress(new Ipv6Address(ip))), defaultInstance); } private static void testDomain(final String ip) { - final Host defaultInstance = HostBuilder.getDefaultInstance(ip); + final Host defaultInstance = IetfInetUtil.hostFor(ip); assertEquals(new Host(new DomainName(ip)), defaultInstance); } } \ No newline at end of file