From e2f8a32e091c3afaf8a075bbf563b338631427cd Mon Sep 17 00:00:00 2001 From: "Jincheng Xu (Frank)" Date: Wed, 5 Nov 2025 10:14:17 -0600 Subject: [PATCH] fix(tests): fix vpc model tests to use robust Json comparison --- ...talServerNetworkAttachmentByPCIPrototypeTest.java | 2 +- ...alServerNetworkAttachmentByVLANPrototypeTest.java | 2 +- ...eBareMetalServerNetworkAttachmentContextTest.java | 2 +- ...erNetworkInterfaceByHiperSocketPrototypeTest.java | 2 +- ...etalServerNetworkInterfaceByPCIPrototypeTest.java | 2 +- ...talServerNetworkInterfaceByVLANPrototypeTest.java | 2 +- ...erPrimaryNetworkAttachmentByPCIPrototypeTest.java | 2 +- ...alServerPrimaryNetworkInterfacePrototypeTest.java | 2 +- ...totypeBareMetalServerByNetworkAttachmentTest.java | 2 +- ...ototypeBareMetalServerByNetworkInterfaceTest.java | 2 +- ...edicatedHostPrototypeDedicatedHostByZoneTest.java | 2 +- ...rototypeInstanceClusterNetworkAttachmentTest.java | 2 +- ...etworkAttachmentPrototypeInstanceContextTest.java | 2 +- ...eduledActionPrototypeByCronSpecByManagerTest.java | 2 +- ...ScheduledActionPrototypeByRunAtByManagerTest.java | 2 +- .../InstanceNetworkAttachmentPrototypeTest.java | 2 +- ...rototypeInstanceNetworkAttachmentContextTest.java | 2 +- ...talogOfferingInstanceByNetworkAttachmentTest.java | 6 +++--- ...atalogOfferingInstanceByNetworkInterfaceTest.java | 6 +++--- ...stanceByImageInstanceByNetworkAttachmentTest.java | 4 ++-- ...nstanceByImageInstanceByNetworkInterfaceTest.java | 4 ++-- ...ourceSnapshotInstanceByNetworkAttachmentTest.java | 4 ++-- ...SourceSnapshotInstanceByNetworkInterfaceTest.java | 4 ++-- ...nstancePrototypeInstanceBySourceTemplateTest.java | 8 ++++---- ...tanceByVolumeInstanceByNetworkAttachmentTest.java | 4 ++-- ...stanceByVolumeInstanceByNetworkInterfaceTest.java | 4 ++-- ...talogOfferingInstanceByNetworkAttachmentTest.java | 6 +++--- ...atalogOfferingInstanceByNetworkInterfaceTest.java | 6 +++--- ...mplateByImageInstanceByNetworkAttachmentTest.java | 4 ++-- ...emplateByImageInstanceByNetworkInterfaceTest.java | 4 ++-- ...ourceSnapshotInstanceByNetworkAttachmentTest.java | 4 ++-- ...SourceSnapshotInstanceByNetworkInterfaceTest.java | 4 ++-- ...rototypeInstanceTemplateBySourceTemplateTest.java | 8 ++++---- ...BalancerPoolPrototypeLoadBalancerContextTest.java | 2 +- .../vpc/v1/model/NetworkInterfacePrototypeTest.java | 2 +- ...ntTargetByAccessControlModeSecurityGroupTest.java | 2 +- ...nterfacePrototypeShareMountTargetContextTest.java | 2 +- .../model/SharePrototypeShareByOriginShareTest.java | 2 +- .../vpc/v1/model/SharePrototypeShareBySizeTest.java | 2 +- .../model/SharePrototypeShareBySourceShareTest.java | 2 +- .../SharePrototypeShareBySourceSnapshotTest.java | 2 +- .../cloud/is/vpc/v1/model/VPCDNSPrototypeTest.java | 2 +- ...ototypeVPNGatewayConnectionPeerByAddressTest.java | 2 +- ...rPrototypeVPNGatewayConnectionPeerByFQDNTest.java | 2 +- ...eVPNGatewayConnectionPolicyModePrototypeTest.java | 4 ++-- ...atewayConnectionStaticRouteModePrototypeTest.java | 4 ++-- ...ototypeVPNGatewayConnectionPeerByAddressTest.java | 2 +- ...rPrototypeVPNGatewayConnectionPeerByFQDNTest.java | 2 +- ...ttachmentPrototypeInstanceByImageContextTest.java | 2 +- ...PrototypeInstanceBySourceSnapshotContextTest.java | 2 +- ...tachmentPrototypeInstanceByVolumeContextTest.java | 2 +- .../vpc/v1/model/VolumeAttachmentPrototypeTest.java | 2 +- .../com/ibm/cloud/is/vpc/v1/utils/TestUtilities.java | 12 ++++++++++++ 53 files changed, 90 insertions(+), 78 deletions(-) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPCIPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPCIPrototypeTest.java index 3599f20689..4837dcb255 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPCIPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPCIPrototypeTest.java @@ -109,7 +109,7 @@ public void testBareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkA BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPCIPrototype bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPciPrototypeModelNew = TestUtilities.deserialize(json, BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPCIPrototype.class); assertTrue(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPciPrototypeModelNew instanceof BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPCIPrototype); assertEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPciPrototypeModelNew.name(), "my-bare-metal-server-network-attachment"); - assertEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPciPrototypeModelNew.virtualNetworkInterface().toString(), bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPciPrototypeModelNew.virtualNetworkInterface().toString(), bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceModel.toString()); assertEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByPciPrototypeModelNew.interfaceType(), "pci"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVLANPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVLANPrototypeTest.java index 298fd05af1..6b1a285ad5 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVLANPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVLANPrototypeTest.java @@ -111,7 +111,7 @@ public void testBareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkA BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVLANPrototype bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVlanPrototypeModelNew = TestUtilities.deserialize(json, BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVLANPrototype.class); assertTrue(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVlanPrototypeModelNew instanceof BareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVLANPrototype); assertEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVlanPrototypeModelNew.name(), "my-bare-metal-server-network-attachment"); - assertEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVlanPrototypeModelNew.virtualNetworkInterface().toString(), bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVlanPrototypeModelNew.virtualNetworkInterface().toString(), bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceModel.toString()); assertEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVlanPrototypeModelNew.allowToFloat(), Boolean.valueOf(false)); assertEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVlanPrototypeModelNew.interfaceType(), "vlan"); assertEquals(bareMetalServerNetworkAttachmentPrototypeBareMetalServerNetworkAttachmentByVlanPrototypeModelNew.vlan(), Long.valueOf("4")); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextTest.java index 54955215ec..71a3da172d 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextTest.java @@ -100,7 +100,7 @@ public void testBareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterface assertEquals(bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextModelNew.autoDelete(), Boolean.valueOf(false)); assertEquals(bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextModelNew.enableInfrastructureNat(), Boolean.valueOf(true)); assertEquals(bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextModelNew.name(), "my-virtual-network-interface"); - assertEquals(bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextModelNew.primaryIp().toString(), virtualNetworkInterfacePrimaryIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextModelNew.primaryIp().toString(), virtualNetworkInterfacePrimaryIpPrototypeModel.toString()); assertEquals(bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextModelNew.protocolStateFilteringMode(), "auto"); assertEquals(bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextModelNew.resourceGroup().toString(), resourceGroupIdentityModel.toString()); assertEquals(bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeBareMetalServerNetworkAttachmentContextModelNew.subnet().toString(), subnetIdentityModel.toString()); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeTest.java index 59a91e0685..d175d3a1d1 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeTest.java @@ -77,7 +77,7 @@ public void testBareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkIn assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeModelNew.allowIpSpoofing(), Boolean.valueOf(true)); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeModelNew.enableInfrastructureNat(), Boolean.valueOf(true)); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeModelNew.name(), "my-bare-metal-server-network-interface"); - assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeModelNew.subnet().toString(), subnetIdentityModel.toString()); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByHiperSocketPrototypeModelNew.interfaceType(), "hipersocket"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPCIPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPCIPrototypeTest.java index e8fd387a93..73b3c533ff 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPCIPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPCIPrototypeTest.java @@ -79,7 +79,7 @@ public void testBareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkIn assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPciPrototypeModelNew.allowIpSpoofing(), Boolean.valueOf(true)); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPciPrototypeModelNew.enableInfrastructureNat(), Boolean.valueOf(true)); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPciPrototypeModelNew.name(), "my-bare-metal-server-network-interface"); - assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPciPrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPciPrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPciPrototypeModelNew.subnet().toString(), subnetIdentityModel.toString()); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByPciPrototypeModelNew.interfaceType(), "pci"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVLANPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVLANPrototypeTest.java index 3807b4a9c3..8df7ca33ae 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVLANPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVLANPrototypeTest.java @@ -81,7 +81,7 @@ public void testBareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkIn assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVlanPrototypeModelNew.allowIpSpoofing(), Boolean.valueOf(true)); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVlanPrototypeModelNew.enableInfrastructureNat(), Boolean.valueOf(true)); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVlanPrototypeModelNew.name(), "my-bare-metal-server-network-interface"); - assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVlanPrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVlanPrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVlanPrototypeModelNew.subnet().toString(), subnetIdentityModel.toString()); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVlanPrototypeModelNew.allowInterfaceToFloat(), Boolean.valueOf(false)); assertEquals(bareMetalServerNetworkInterfacePrototypeBareMetalServerNetworkInterfaceByVlanPrototypeModelNew.interfaceType(), "vlan"); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPCIPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPCIPrototypeTest.java index beb8be887d..568e7a988d 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPCIPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPCIPrototypeTest.java @@ -109,7 +109,7 @@ public void testBareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerP BareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPCIPrototype bareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPciPrototypeModelNew = TestUtilities.deserialize(json, BareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPCIPrototype.class); assertTrue(bareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPciPrototypeModelNew instanceof BareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPCIPrototype); assertEquals(bareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPciPrototypeModelNew.name(), "my-bare-metal-server-network-attachment"); - assertEquals(bareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPciPrototypeModelNew.virtualNetworkInterface().toString(), bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPciPrototypeModelNew.virtualNetworkInterface().toString(), bareMetalServerNetworkAttachmentPrototypeVirtualNetworkInterfaceModel.toString()); assertEquals(bareMetalServerPrimaryNetworkAttachmentPrototypeBareMetalServerPrimaryNetworkAttachmentByPciPrototypeModelNew.interfaceType(), "pci"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrimaryNetworkInterfacePrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrimaryNetworkInterfacePrototypeTest.java index c4f5f5f3ab..13e7c279f1 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrimaryNetworkInterfacePrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrimaryNetworkInterfacePrototypeTest.java @@ -80,7 +80,7 @@ public void testBareMetalServerPrimaryNetworkInterfacePrototype() throws Throwab assertEquals(bareMetalServerPrimaryNetworkInterfacePrototypeModelNew.enableInfrastructureNat(), Boolean.valueOf(true)); assertEquals(bareMetalServerPrimaryNetworkInterfacePrototypeModelNew.interfaceType(), "pci"); assertEquals(bareMetalServerPrimaryNetworkInterfacePrototypeModelNew.name(), "my-bare-metal-server-network-interface"); - assertEquals(bareMetalServerPrimaryNetworkInterfacePrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerPrimaryNetworkInterfacePrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); assertEquals(bareMetalServerPrimaryNetworkInterfacePrototypeModelNew.subnet().toString(), subnetIdentityModel.toString()); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrototypeBareMetalServerByNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrototypeBareMetalServerByNetworkAttachmentTest.java index 48808c377e..56ea7bca14 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrototypeBareMetalServerByNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrototypeBareMetalServerByNetworkAttachmentTest.java @@ -218,7 +218,7 @@ public void testBareMetalServerPrototypeBareMetalServerByNetworkAttachment() thr assertEquals(bareMetalServerPrototypeBareMetalServerByNetworkAttachmentModelNew.trustedPlatformModule().toString(), bareMetalServerTrustedPlatformModulePrototypeModel.toString()); assertEquals(bareMetalServerPrototypeBareMetalServerByNetworkAttachmentModelNew.vpc().toString(), vpcIdentityModel.toString()); assertEquals(bareMetalServerPrototypeBareMetalServerByNetworkAttachmentModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(bareMetalServerPrototypeBareMetalServerByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), bareMetalServerPrimaryNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerPrototypeBareMetalServerByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), bareMetalServerPrimaryNetworkAttachmentPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrototypeBareMetalServerByNetworkInterfaceTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrototypeBareMetalServerByNetworkInterfaceTest.java index 5de076324b..fd0eaa2594 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrototypeBareMetalServerByNetworkInterfaceTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/BareMetalServerPrototypeBareMetalServerByNetworkInterfaceTest.java @@ -198,7 +198,7 @@ public void testBareMetalServerPrototypeBareMetalServerByNetworkInterface() thro assertEquals(bareMetalServerPrototypeBareMetalServerByNetworkInterfaceModelNew.trustedPlatformModule().toString(), bareMetalServerTrustedPlatformModulePrototypeModel.toString()); assertEquals(bareMetalServerPrototypeBareMetalServerByNetworkInterfaceModelNew.vpc().toString(), vpcIdentityModel.toString()); assertEquals(bareMetalServerPrototypeBareMetalServerByNetworkInterfaceModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(bareMetalServerPrototypeBareMetalServerByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), bareMetalServerPrimaryNetworkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(bareMetalServerPrototypeBareMetalServerByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), bareMetalServerPrimaryNetworkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/DedicatedHostPrototypeDedicatedHostByZoneTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/DedicatedHostPrototypeDedicatedHostByZoneTest.java index fe47f74c8c..023b8bd58f 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/DedicatedHostPrototypeDedicatedHostByZoneTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/DedicatedHostPrototypeDedicatedHostByZoneTest.java @@ -80,7 +80,7 @@ public void testDedicatedHostPrototypeDedicatedHostByZone() throws Throwable { assertEquals(dedicatedHostPrototypeDedicatedHostByZoneModelNew.name(), "my-host"); assertEquals(dedicatedHostPrototypeDedicatedHostByZoneModelNew.profile().toString(), dedicatedHostProfileIdentityModel.toString()); assertEquals(dedicatedHostPrototypeDedicatedHostByZoneModelNew.resourceGroup().toString(), resourceGroupIdentityModel.toString()); - assertEquals(dedicatedHostPrototypeDedicatedHostByZoneModelNew.group().toString(), dedicatedHostGroupPrototypeDedicatedHostByZoneContextModel.toString()); + TestUtilities.assertJsonEquals(dedicatedHostPrototypeDedicatedHostByZoneModelNew.group().toString(), dedicatedHostGroupPrototypeDedicatedHostByZoneContextModel.toString()); assertEquals(dedicatedHostPrototypeDedicatedHostByZoneModelNew.zone().toString(), zoneIdentityModel.toString()); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentTest.java index 3584d5cbee..4703edb0b0 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentTest.java @@ -64,7 +64,7 @@ public void testInstanceClusterNetworkAttachmentPrototypeClusterNetworkInterface assertTrue(instanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentModelNew instanceof InstanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachment); assertEquals(instanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentModelNew.autoDelete(), Boolean.valueOf(false)); assertEquals(instanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentModelNew.name(), "my-cluster-network-interface"); - assertEquals(instanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentModelNew.primaryIp().toString(), clusterNetworkInterfacePrimaryIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentModelNew.primaryIp().toString(), clusterNetworkInterfacePrimaryIpPrototypeModel.toString()); assertEquals(instanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceInstanceClusterNetworkInterfacePrototypeInstanceClusterNetworkAttachmentModelNew.subnet().toString(), clusterNetworkSubnetIdentityModel.toString()); } } \ No newline at end of file diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceClusterNetworkAttachmentPrototypeInstanceContextTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceClusterNetworkAttachmentPrototypeInstanceContextTest.java index 92fd7f68fa..430bf984b3 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceClusterNetworkAttachmentPrototypeInstanceContextTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceClusterNetworkAttachmentPrototypeInstanceContextTest.java @@ -70,7 +70,7 @@ public void testInstanceClusterNetworkAttachmentPrototypeInstanceContext() throw InstanceClusterNetworkAttachmentPrototypeInstanceContext instanceClusterNetworkAttachmentPrototypeInstanceContextModelNew = TestUtilities.deserialize(json, InstanceClusterNetworkAttachmentPrototypeInstanceContext.class); assertTrue(instanceClusterNetworkAttachmentPrototypeInstanceContextModelNew instanceof InstanceClusterNetworkAttachmentPrototypeInstanceContext); - assertEquals(instanceClusterNetworkAttachmentPrototypeInstanceContextModelNew.clusterNetworkInterface().toString(), instanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceModel.toString()); + TestUtilities.assertJsonEquals(instanceClusterNetworkAttachmentPrototypeInstanceContextModelNew.clusterNetworkInterface().toString(), instanceClusterNetworkAttachmentPrototypeClusterNetworkInterfaceModel.toString()); assertEquals(instanceClusterNetworkAttachmentPrototypeInstanceContextModelNew.name(), "my-instance-network-attachment"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerTest.java index ae9daff1df..f8282d5d49 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerTest.java @@ -56,7 +56,7 @@ public void testInstanceGroupManagerActionPrototypeScheduledActionPrototypeByCro assertTrue(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew instanceof InstanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManager); assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew.name(), "my-instance-group-manager-action"); assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew.cronSpec(), "30 */2 * * 1-5"); - assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew.manager().toString(), instanceGroupManagerScheduledActionManagerPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew.manager().toString(), instanceGroupManagerScheduledActionManagerPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerTest.java index 94c8ea0c9c..f4b7a1c2bb 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerTest.java @@ -57,7 +57,7 @@ public void testInstanceGroupManagerActionPrototypeScheduledActionPrototypeByRun assertTrue(instanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerModelNew instanceof InstanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManager); assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerModelNew.name(), "my-instance-group-manager-action"); assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerModelNew.runAt(), DateUtils.parseAsDateTime("2019-01-01T12:00:00.000Z")); - assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerModelNew.manager().toString(), instanceGroupManagerScheduledActionManagerPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerModelNew.manager().toString(), instanceGroupManagerScheduledActionManagerPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceNetworkAttachmentPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceNetworkAttachmentPrototypeTest.java index 16e3ef45b0..8ed1ad38f9 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceNetworkAttachmentPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceNetworkAttachmentPrototypeTest.java @@ -105,7 +105,7 @@ public void testInstanceNetworkAttachmentPrototype() throws Throwable { InstanceNetworkAttachmentPrototype instanceNetworkAttachmentPrototypeModelNew = TestUtilities.deserialize(json, InstanceNetworkAttachmentPrototype.class); assertTrue(instanceNetworkAttachmentPrototypeModelNew instanceof InstanceNetworkAttachmentPrototype); assertEquals(instanceNetworkAttachmentPrototypeModelNew.name(), "my-instance-network-attachment"); - assertEquals(instanceNetworkAttachmentPrototypeModelNew.virtualNetworkInterface().toString(), instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceModel.toString()); + TestUtilities.assertJsonEquals(instanceNetworkAttachmentPrototypeModelNew.virtualNetworkInterface().toString(), instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextTest.java index b245d279d8..7f73a84484 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextTest.java @@ -100,7 +100,7 @@ public void testInstanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtual assertEquals(instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextModelNew.autoDelete(), Boolean.valueOf(false)); assertEquals(instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextModelNew.enableInfrastructureNat(), Boolean.valueOf(true)); assertEquals(instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextModelNew.name(), "my-virtual-network-interface"); - assertEquals(instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextModelNew.primaryIp().toString(), virtualNetworkInterfacePrimaryIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextModelNew.primaryIp().toString(), virtualNetworkInterfacePrimaryIpPrototypeModel.toString()); assertEquals(instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextModelNew.protocolStateFilteringMode(), "auto"); assertEquals(instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextModelNew.resourceGroup().toString(), resourceGroupIdentityModel.toString()); assertEquals(instanceNetworkAttachmentPrototypeVirtualNetworkInterfaceVirtualNetworkInterfacePrototypeInstanceNetworkAttachmentContextModelNew.subnet().toString(), subnetIdentityModel.toString()); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentTest.java index 489ea46526..c3044d22d1 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentTest.java @@ -351,10 +351,10 @@ public void testInstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOffer assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); - assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceTest.java index 9655fd386e..a876f2b9a1 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceTest.java @@ -323,10 +323,10 @@ public void testInstancePrototypeInstanceByCatalogOfferingInstanceByCatalogOffer assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); - assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByCatalogOfferingInstanceByCatalogOfferingInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentTest.java index e29fe7d9b5..6754faef30 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentTest.java @@ -337,10 +337,10 @@ public void testInstancePrototypeInstanceByImageInstanceByImageInstanceByNetwork assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.image().toString(), imageIdentityModel.toString()); assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceTest.java index 32a6915bb4..727edfe855 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceTest.java @@ -309,10 +309,10 @@ public void testInstancePrototypeInstanceByImageInstanceByImageInstanceByNetwork assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.image().toString(), imageIdentityModel.toString()); assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByImageInstanceByImageInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentTest.java index c9ab2301f7..2df39eda68 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentTest.java @@ -337,9 +337,9 @@ public void testInstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapsho assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceBySourceSnapshotContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceBySourceSnapshotContextModel.toString()); assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceTest.java index 9c2aabe2aa..ae909ae82c 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceTest.java @@ -309,9 +309,9 @@ public void testInstancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapsho assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceBySourceSnapshotContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceBySourceSnapshotContextModel.toString()); assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceBySourceSnapshotInstanceBySourceSnapshotInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceTemplateTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceTemplateTest.java index 9c0fbac408..2ccc3eb859 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceTemplateTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceBySourceTemplateTest.java @@ -395,11 +395,11 @@ public void testInstancePrototypeInstanceBySourceTemplate() throws Throwable { assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); - assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceBySourceTemplateModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceBySourceTemplateModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.image().toString(), imageIdentityModel.toString()); - assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); - assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceBySourceTemplateModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceBySourceTemplateModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.sourceTemplate().toString(), instanceTemplateIdentityModel.toString()); assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.zone().toString(), zoneIdentityModel.toString()); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentTest.java index d21590ce79..026a9aa462 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentTest.java @@ -303,9 +303,9 @@ public void testInstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetwo assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByVolumeContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByVolumeContextModel.toString()); assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceTest.java index 0f4c4393be..c380e9804f 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceTest.java @@ -275,9 +275,9 @@ public void testInstancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetwo assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByVolumeContextModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByVolumeContextModel.toString()); assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instancePrototypeInstanceByVolumeInstanceByVolumeInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentTest.java index 90b64f380c..33d30c67e2 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentTest.java @@ -351,10 +351,10 @@ public void testInstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstan assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceTest.java index df45162ba1..7f556c9c79 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceTest.java @@ -323,10 +323,10 @@ public void testInstanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstan assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByCatalogOfferingInstanceTemplateByCatalogOfferingInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentTest.java index 6da0bf9b82..77026e7640 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentTest.java @@ -337,10 +337,10 @@ public void testInstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplate assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.image().toString(), imageIdentityModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceTest.java index 1d5b728369..5eeed03615 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceTest.java @@ -309,10 +309,10 @@ public void testInstanceTemplatePrototypeInstanceTemplateByImageInstanceTemplate assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.image().toString(), imageIdentityModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateByImageInstanceTemplateByImageInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentTest.java index 4cb9205825..83864cf5ee 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentTest.java @@ -337,9 +337,9 @@ public void testInstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanc assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceBySourceSnapshotContextModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceBySourceSnapshotContextModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkAttachmentModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceTest.java index 5b85fba151..03511be5b8 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceTest.java @@ -309,9 +309,9 @@ public void testInstanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanc assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceBySourceSnapshotContextModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceBySourceSnapshotContextModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceModelNew.zone().toString(), zoneIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateBySourceSnapshotInstanceTemplateBySourceSnapshotInstanceByNetworkInterfaceModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceTemplateTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceTemplateTest.java index 180f871a37..0f9391a695 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceTemplateTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceTemplateBySourceTemplateTest.java @@ -395,11 +395,11 @@ public void testInstanceTemplatePrototypeInstanceTemplateBySourceTemplate() thro assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.catalogOffering().toString(), instanceCatalogOfferingPrototypeModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.image().toString(), imageIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.primaryNetworkAttachment().toString(), instanceNetworkAttachmentPrototypeModel.toString()); + TestUtilities.assertJsonEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.sourceTemplate().toString(), instanceTemplateIdentityModel.toString()); assertEquals(instanceTemplatePrototypeInstanceTemplateBySourceTemplateModelNew.zone().toString(), zoneIdentityModel.toString()); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/LoadBalancerPoolPrototypeLoadBalancerContextTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/LoadBalancerPoolPrototypeLoadBalancerContextTest.java index 652b9e7b4a..af09e159fe 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/LoadBalancerPoolPrototypeLoadBalancerContextTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/LoadBalancerPoolPrototypeLoadBalancerContextTest.java @@ -91,7 +91,7 @@ public void testLoadBalancerPoolPrototypeLoadBalancerContext() throws Throwable LoadBalancerPoolPrototypeLoadBalancerContext loadBalancerPoolPrototypeLoadBalancerContextModelNew = TestUtilities.deserialize(json, LoadBalancerPoolPrototypeLoadBalancerContext.class); assertTrue(loadBalancerPoolPrototypeLoadBalancerContextModelNew instanceof LoadBalancerPoolPrototypeLoadBalancerContext); assertEquals(loadBalancerPoolPrototypeLoadBalancerContextModelNew.algorithm(), "least_connections"); - assertEquals(loadBalancerPoolPrototypeLoadBalancerContextModelNew.healthMonitor().toString(), loadBalancerPoolHealthMonitorPrototypeModel.toString()); + TestUtilities.assertJsonEquals(loadBalancerPoolPrototypeLoadBalancerContextModelNew.healthMonitor().toString(), loadBalancerPoolHealthMonitorPrototypeModel.toString()); assertEquals(loadBalancerPoolPrototypeLoadBalancerContextModelNew.name(), "my-load-balancer-pool"); assertEquals(loadBalancerPoolPrototypeLoadBalancerContextModelNew.protocol(), "http"); assertEquals(loadBalancerPoolPrototypeLoadBalancerContextModelNew.proxyProtocol(), "disabled"); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/NetworkInterfacePrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/NetworkInterfacePrototypeTest.java index b16cb50908..69a1939be0 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/NetworkInterfacePrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/NetworkInterfacePrototypeTest.java @@ -72,7 +72,7 @@ public void testNetworkInterfacePrototype() throws Throwable { assertTrue(networkInterfacePrototypeModelNew instanceof NetworkInterfacePrototype); assertEquals(networkInterfacePrototypeModelNew.allowIpSpoofing(), Boolean.valueOf(true)); assertEquals(networkInterfacePrototypeModelNew.name(), "my-instance-network-interface"); - assertEquals(networkInterfacePrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(networkInterfacePrototypeModelNew.primaryIp().toString(), networkInterfaceIpPrototypeModel.toString()); assertEquals(networkInterfacePrototypeModelNew.subnet().toString(), subnetIdentityModel.toString()); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/ShareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/ShareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupTest.java index 02a3db4a34..269b7a632c 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/ShareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/ShareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupTest.java @@ -108,7 +108,7 @@ public void testShareMountTargetPrototypeShareMountTargetByAccessControlModeSecu assertTrue(shareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupModelNew instanceof ShareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroup); assertEquals(shareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupModelNew.name(), "my-share-mount-target"); assertEquals(shareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupModelNew.transitEncryption(), "none"); - assertEquals(shareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupModelNew.virtualNetworkInterface().toString(), shareMountTargetVirtualNetworkInterfacePrototypeModel.toString()); + TestUtilities.assertJsonEquals(shareMountTargetPrototypeShareMountTargetByAccessControlModeSecurityGroupModelNew.virtualNetworkInterface().toString(), shareMountTargetVirtualNetworkInterfacePrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/ShareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/ShareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextTest.java index baa153cb39..799c041fe0 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/ShareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/ShareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextTest.java @@ -100,7 +100,7 @@ public void testShareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkIn assertEquals(shareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextModelNew.autoDelete(), Boolean.valueOf(false)); assertEquals(shareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextModelNew.enableInfrastructureNat(), Boolean.valueOf(true)); assertEquals(shareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextModelNew.name(), "my-virtual-network-interface"); - assertEquals(shareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextModelNew.primaryIp().toString(), virtualNetworkInterfacePrimaryIpPrototypeModel.toString()); + TestUtilities.assertJsonEquals(shareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextModelNew.primaryIp().toString(), virtualNetworkInterfacePrimaryIpPrototypeModel.toString()); assertEquals(shareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextModelNew.protocolStateFilteringMode(), "auto"); assertEquals(shareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextModelNew.resourceGroup().toString(), resourceGroupIdentityModel.toString()); assertEquals(shareMountTargetVirtualNetworkInterfacePrototypeVirtualNetworkInterfacePrototypeShareMountTargetContextModelNew.subnet().toString(), subnetIdentityModel.toString()); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareByOriginShareTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareByOriginShareTest.java index f511248bb3..e69fc4a7bd 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareByOriginShareTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareByOriginShareTest.java @@ -163,7 +163,7 @@ public void testSharePrototypeShareByOriginShare() throws Throwable { SharePrototypeShareByOriginShare sharePrototypeShareByOriginShareModelNew = TestUtilities.deserialize(json, SharePrototypeShareByOriginShare.class); assertTrue(sharePrototypeShareByOriginShareModelNew instanceof SharePrototypeShareByOriginShare); assertEquals(sharePrototypeShareByOriginShareModelNew.name(), "my-share"); - assertEquals(sharePrototypeShareByOriginShareModelNew.replicaShare().toString(), sharePrototypeShareContextModel.toString()); + TestUtilities.assertJsonEquals(sharePrototypeShareByOriginShareModelNew.replicaShare().toString(), sharePrototypeShareContextModel.toString()); assertEquals(sharePrototypeShareByOriginShareModelNew.originShare().toString(), shareIdentityModel.toString()); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySizeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySizeTest.java index 92f74fb63b..47ed11a15d 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySizeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySizeTest.java @@ -185,7 +185,7 @@ public void testSharePrototypeShareBySize() throws Throwable { SharePrototypeShareBySize sharePrototypeShareBySizeModelNew = TestUtilities.deserialize(json, SharePrototypeShareBySize.class); assertTrue(sharePrototypeShareBySizeModelNew instanceof SharePrototypeShareBySize); assertEquals(sharePrototypeShareBySizeModelNew.name(), "my-share"); - assertEquals(sharePrototypeShareBySizeModelNew.replicaShare().toString(), sharePrototypeShareContextModel.toString()); + TestUtilities.assertJsonEquals(sharePrototypeShareBySizeModelNew.replicaShare().toString(), sharePrototypeShareContextModel.toString()); assertEquals(sharePrototypeShareBySizeModelNew.accessControlMode(), "security_group"); assertEquals(sharePrototypeShareBySizeModelNew.encryptionKey().toString(), encryptionKeyIdentityModel.toString()); assertEquals(sharePrototypeShareBySizeModelNew.initialOwner().toString(), shareInitialOwnerModel.toString()); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySourceShareTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySourceShareTest.java index e5a415a614..02fb58c0da 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySourceShareTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySourceShareTest.java @@ -181,7 +181,7 @@ public void testSharePrototypeShareBySourceShare() throws Throwable { SharePrototypeShareBySourceShare sharePrototypeShareBySourceShareModelNew = TestUtilities.deserialize(json, SharePrototypeShareBySourceShare.class); assertTrue(sharePrototypeShareBySourceShareModelNew instanceof SharePrototypeShareBySourceShare); assertEquals(sharePrototypeShareBySourceShareModelNew.name(), "my-share"); - assertEquals(sharePrototypeShareBySourceShareModelNew.replicaShare().toString(), sharePrototypeShareContextModel.toString()); + TestUtilities.assertJsonEquals(sharePrototypeShareBySourceShareModelNew.replicaShare().toString(), sharePrototypeShareContextModel.toString()); assertEquals(sharePrototypeShareBySourceShareModelNew.encryptionKey().toString(), encryptionKeyIdentityModel.toString()); assertEquals(sharePrototypeShareBySourceShareModelNew.iops(), Long.valueOf("100")); assertEquals(sharePrototypeShareBySourceShareModelNew.profile().toString(), shareProfileIdentityModel.toString()); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySourceSnapshotTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySourceSnapshotTest.java index aeb0c52979..2d4a23a767 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySourceSnapshotTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/SharePrototypeShareBySourceSnapshotTest.java @@ -189,7 +189,7 @@ public void testSharePrototypeShareBySourceSnapshot() throws Throwable { SharePrototypeShareBySourceSnapshot sharePrototypeShareBySourceSnapshotModelNew = TestUtilities.deserialize(json, SharePrototypeShareBySourceSnapshot.class); assertTrue(sharePrototypeShareBySourceSnapshotModelNew instanceof SharePrototypeShareBySourceSnapshot); assertEquals(sharePrototypeShareBySourceSnapshotModelNew.name(), "my-share"); - assertEquals(sharePrototypeShareBySourceSnapshotModelNew.replicaShare().toString(), sharePrototypeShareContextModel.toString()); + TestUtilities.assertJsonEquals(sharePrototypeShareBySourceSnapshotModelNew.replicaShare().toString(), sharePrototypeShareContextModel.toString()); assertEquals(sharePrototypeShareBySourceSnapshotModelNew.encryptionKey().toString(), encryptionKeyIdentityModel.toString()); assertEquals(sharePrototypeShareBySourceSnapshotModelNew.initialOwner().toString(), shareInitialOwnerModel.toString()); assertEquals(sharePrototypeShareBySourceSnapshotModelNew.iops(), Long.valueOf("100")); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPCDNSPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPCDNSPrototypeTest.java index f4f2ff4d20..581c9c81df 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPCDNSPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPCDNSPrototypeTest.java @@ -65,6 +65,6 @@ public void testVPCDNSPrototype() throws Throwable { VPCDNSPrototype vpcdnsPrototypeModelNew = TestUtilities.deserialize(json, VPCDNSPrototype.class); assertTrue(vpcdnsPrototypeModelNew instanceof VPCDNSPrototype); assertEquals(vpcdnsPrototypeModelNew.enableHub(), Boolean.valueOf(false)); - assertEquals(vpcdnsPrototypeModelNew.resolver().toString(), vpcdnsResolverPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpcdnsPrototypeModelNew.resolver().toString(), vpcdnsResolverPrototypeModel.toString()); } } \ No newline at end of file diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByAddressTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByAddressTest.java index 27e4e2af7c..c232139c1c 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByAddressTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByAddressTest.java @@ -52,7 +52,7 @@ public void testVPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionP VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByAddress vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew = TestUtilities.deserialize(json, VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByAddress.class); assertTrue(vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew instanceof VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByAddress); - assertEquals(vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew.ikeIdentity().toString(), vpnGatewayConnectionIkeIdentityPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew.ikeIdentity().toString(), vpnGatewayConnectionIkeIdentityPrototypeModel.toString()); assertEquals(vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew.address(), "192.0.2.5"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByFQDNTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByFQDNTest.java index 399300b5cb..e0e7ff8288 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByFQDNTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByFQDNTest.java @@ -52,7 +52,7 @@ public void testVPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionP VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByFQDN vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew = TestUtilities.deserialize(json, VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByFQDN.class); assertTrue(vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew instanceof VPNGatewayConnectionPolicyModePeerPrototypeVPNGatewayConnectionPeerByFQDN); - assertEquals(vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew.ikeIdentity().toString(), vpnGatewayConnectionIkeIdentityPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew.ikeIdentity().toString(), vpnGatewayConnectionIkeIdentityPrototypeModel.toString()); assertEquals(vpnGatewayConnectionPolicyModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew.fqdn(), "my-service.example.com"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPrototypeVPNGatewayConnectionPolicyModePrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPrototypeVPNGatewayConnectionPolicyModePrototypeTest.java index a32b27881e..7396f801bb 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPrototypeVPNGatewayConnectionPolicyModePrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPrototypeVPNGatewayConnectionPolicyModePrototypeTest.java @@ -111,8 +111,8 @@ public void testVPNGatewayConnectionPrototypeVPNGatewayConnectionPolicyModeProto assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionPolicyModePrototypeModelNew.ipsecPolicy().toString(), vpnGatewayConnectionIPsecPolicyPrototypeModel.toString()); assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionPolicyModePrototypeModelNew.name(), "my-vpn-gateway-connection"); assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionPolicyModePrototypeModelNew.psk(), "lkj14b1oi0alcniejkso"); - assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionPolicyModePrototypeModelNew.local().toString(), vpnGatewayConnectionPolicyModeLocalPrototypeModel.toString()); - assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionPolicyModePrototypeModelNew.peer().toString(), vpnGatewayConnectionPolicyModePeerPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionPolicyModePrototypeModelNew.local().toString(), vpnGatewayConnectionPolicyModeLocalPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionPolicyModePrototypeModelNew.peer().toString(), vpnGatewayConnectionPolicyModePeerPrototypeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPrototypeVPNGatewayConnectionStaticRouteModePrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPrototypeVPNGatewayConnectionStaticRouteModePrototypeTest.java index a8b3bf7c5b..ac4b27ba8c 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPrototypeVPNGatewayConnectionStaticRouteModePrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionPrototypeVPNGatewayConnectionStaticRouteModePrototypeTest.java @@ -112,8 +112,8 @@ public void testVPNGatewayConnectionPrototypeVPNGatewayConnectionStaticRouteMode assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionStaticRouteModePrototypeModelNew.name(), "my-vpn-gateway-connection"); assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionStaticRouteModePrototypeModelNew.psk(), "lkj14b1oi0alcniejkso"); assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionStaticRouteModePrototypeModelNew.distributeTraffic(), Boolean.valueOf(false)); - assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionStaticRouteModePrototypeModelNew.local().toString(), vpnGatewayConnectionStaticRouteModeLocalPrototypeModel.toString()); - assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionStaticRouteModePrototypeModelNew.peer().toString(), vpnGatewayConnectionStaticRouteModePeerPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionStaticRouteModePrototypeModelNew.local().toString(), vpnGatewayConnectionStaticRouteModeLocalPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionStaticRouteModePrototypeModelNew.peer().toString(), vpnGatewayConnectionStaticRouteModePeerPrototypeModel.toString()); assertEquals(vpnGatewayConnectionPrototypeVpnGatewayConnectionStaticRouteModePrototypeModelNew.routingProtocol(), "none"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByAddressTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByAddressTest.java index 120f806992..0b30325516 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByAddressTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByAddressTest.java @@ -50,7 +50,7 @@ public void testVPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnec VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByAddress vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew = TestUtilities.deserialize(json, VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByAddress.class); assertTrue(vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew instanceof VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByAddress); - assertEquals(vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew.ikeIdentity().toString(), vpnGatewayConnectionIkeIdentityPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew.ikeIdentity().toString(), vpnGatewayConnectionIkeIdentityPrototypeModel.toString()); assertEquals(vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByAddressModelNew.address(), "192.0.2.5"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByFQDNTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByFQDNTest.java index 35e4d13318..fae4b95a91 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByFQDNTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByFQDNTest.java @@ -50,7 +50,7 @@ public void testVPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnec VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByFQDN vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew = TestUtilities.deserialize(json, VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByFQDN.class); assertTrue(vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew instanceof VPNGatewayConnectionStaticRouteModePeerPrototypeVPNGatewayConnectionPeerByFQDN); - assertEquals(vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew.ikeIdentity().toString(), vpnGatewayConnectionIkeIdentityPrototypeModel.toString()); + TestUtilities.assertJsonEquals(vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew.ikeIdentity().toString(), vpnGatewayConnectionIkeIdentityPrototypeModel.toString()); assertEquals(vpnGatewayConnectionStaticRouteModePeerPrototypeVpnGatewayConnectionPeerByFqdnModelNew.fqdn(), "my-service.example.com"); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceByImageContextTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceByImageContextTest.java index b1baa115fb..489dd4857a 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceByImageContextTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceByImageContextTest.java @@ -84,7 +84,7 @@ public void testVolumeAttachmentPrototypeInstanceByImageContext() throws Throwab assertTrue(volumeAttachmentPrototypeInstanceByImageContextModelNew instanceof VolumeAttachmentPrototypeInstanceByImageContext); assertEquals(volumeAttachmentPrototypeInstanceByImageContextModelNew.deleteVolumeOnInstanceDelete(), Boolean.valueOf(true)); assertEquals(volumeAttachmentPrototypeInstanceByImageContextModelNew.name(), "my-volume-attachment"); - assertEquals(volumeAttachmentPrototypeInstanceByImageContextModelNew.volume().toString(), volumePrototypeInstanceByImageContextModel.toString()); + TestUtilities.assertJsonEquals(volumeAttachmentPrototypeInstanceByImageContextModelNew.volume().toString(), volumePrototypeInstanceByImageContextModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceBySourceSnapshotContextTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceBySourceSnapshotContextTest.java index 499f15cb02..f49bc442a3 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceBySourceSnapshotContextTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceBySourceSnapshotContextTest.java @@ -92,7 +92,7 @@ public void testVolumeAttachmentPrototypeInstanceBySourceSnapshotContext() throw assertTrue(volumeAttachmentPrototypeInstanceBySourceSnapshotContextModelNew instanceof VolumeAttachmentPrototypeInstanceBySourceSnapshotContext); assertEquals(volumeAttachmentPrototypeInstanceBySourceSnapshotContextModelNew.deleteVolumeOnInstanceDelete(), Boolean.valueOf(true)); assertEquals(volumeAttachmentPrototypeInstanceBySourceSnapshotContextModelNew.name(), "my-volume-attachment"); - assertEquals(volumeAttachmentPrototypeInstanceBySourceSnapshotContextModelNew.volume().toString(), volumePrototypeInstanceBySourceSnapshotContextModel.toString()); + TestUtilities.assertJsonEquals(volumeAttachmentPrototypeInstanceBySourceSnapshotContextModelNew.volume().toString(), volumePrototypeInstanceBySourceSnapshotContextModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceByVolumeContextTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceByVolumeContextTest.java index b05c9f7d04..ad02a5e620 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceByVolumeContextTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeInstanceByVolumeContextTest.java @@ -52,7 +52,7 @@ public void testVolumeAttachmentPrototypeInstanceByVolumeContext() throws Throwa assertTrue(volumeAttachmentPrototypeInstanceByVolumeContextModelNew instanceof VolumeAttachmentPrototypeInstanceByVolumeContext); assertEquals(volumeAttachmentPrototypeInstanceByVolumeContextModelNew.deleteVolumeOnInstanceDelete(), Boolean.valueOf(false)); assertEquals(volumeAttachmentPrototypeInstanceByVolumeContextModelNew.name(), "my-volume-attachment"); - assertEquals(volumeAttachmentPrototypeInstanceByVolumeContextModelNew.volume().toString(), volumeIdentityModel.toString()); + TestUtilities.assertJsonEquals(volumeAttachmentPrototypeInstanceByVolumeContextModelNew.volume().toString(), volumeIdentityModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeTest.java index b75c7e1722..8f75327217 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/VolumeAttachmentPrototypeTest.java @@ -84,7 +84,7 @@ public void testVolumeAttachmentPrototype() throws Throwable { assertTrue(volumeAttachmentPrototypeModelNew instanceof VolumeAttachmentPrototype); assertEquals(volumeAttachmentPrototypeModelNew.deleteVolumeOnInstanceDelete(), Boolean.valueOf(false)); assertEquals(volumeAttachmentPrototypeModelNew.name(), "my-volume-attachment"); - assertEquals(volumeAttachmentPrototypeModelNew.volume().toString(), volumeAttachmentPrototypeVolumeModel.toString()); + TestUtilities.assertJsonEquals(volumeAttachmentPrototypeModelNew.volume().toString(), volumeAttachmentPrototypeVolumeModel.toString()); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/utils/TestUtilities.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/utils/TestUtilities.java index fc112dd7d0..2941527831 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/utils/TestUtilities.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/utils/TestUtilities.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.TreeMap; import java.io.InputStream; import java.io.ByteArrayInputStream; @@ -28,6 +29,7 @@ import com.ibm.cloud.sdk.core.util.DateUtils; import com.ibm.cloud.sdk.core.util.GsonSingleton; import com.ibm.cloud.sdk.core.service.model.FileWithMetadata; +import static org.testng.Assert.*; /** * A class used by the unit tests containing utility functions. @@ -128,4 +130,14 @@ public static Date createMockDate(String date) throws Exception { public static Date createMockDateTime(String date) throws Exception { return DateUtils.parseAsDateTime(date); } + + public static void assertJsonEquals(String expectedJson, String actualJson) { + try { + TreeMap expectedMap = GsonSingleton.getGson().fromJson(expectedJson, TreeMap.class); + TreeMap actualMap = GsonSingleton.getGson().fromJson(actualJson, TreeMap.class); + assertEquals(expectedMap, actualMap); + } catch (Exception e) { + throw new RuntimeException(e); + } + } } \ No newline at end of file