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 0b899bbb50..56e33a9d71 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 @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.DedicatedHostGroupPrototypeDedicatedHostByZoneContext; import com.ibm.cloud.is.vpc.v1.model.DedicatedHostProfileIdentityByName; import com.ibm.cloud.is.vpc.v1.model.DedicatedHostPrototypeDedicatedHostByZone; @@ -80,7 +81,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()); + assertEquals(JsonParser.parseString(dedicatedHostPrototypeDedicatedHostByZoneModelNew.group().toString()), JsonParser.parseString(dedicatedHostGroupPrototypeDedicatedHostByZoneContextModel.toString())); assertEquals(dedicatedHostPrototypeDedicatedHostByZoneModelNew.zone().toString(), zoneIdentityModel.toString()); } 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 fec15399a1..66784f8e8a 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 @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.InstanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManager; import com.ibm.cloud.is.vpc.v1.model.InstanceGroupManagerScheduledActionManagerPrototypeAutoScalePrototypeById; import com.ibm.cloud.is.vpc.v1.utils.TestUtilities; @@ -56,7 +57,7 @@ public void testInstanceGroupManagerActionPrototypeScheduledActionPrototypeByCro assertTrue(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew instanceof InstanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManager); assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew.name(), "my-instance-group-manager-action"); assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew.cronSpec(), "*/5 1,2,3 * * *"); - assertEquals(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew.manager().toString(), instanceGroupManagerScheduledActionManagerPrototypeModel.toString()); + assertEquals(JsonParser.parseString(instanceGroupManagerActionPrototypeScheduledActionPrototypeByCronSpecByManagerModelNew.manager().toString()), JsonParser.parseString(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 10d8f07ea5..9822de1b0e 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 @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.InstanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManager; import com.ibm.cloud.is.vpc.v1.model.InstanceGroupManagerScheduledActionManagerPrototypeAutoScalePrototypeById; import com.ibm.cloud.is.vpc.v1.utils.TestUtilities; @@ -57,7 +58,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()); + assertEquals(JsonParser.parseString(instanceGroupManagerActionPrototypeScheduledActionPrototypeByRunAtByManagerModelNew.manager().toString()), JsonParser.parseString(instanceGroupManagerScheduledActionManagerPrototypeModel.toString())); } @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageTest.java index c130c74f4f..0994f7e2ef 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByImageTest.java @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.EncryptionKeyIdentityByCRN; import com.ibm.cloud.is.vpc.v1.model.ImageIdentityById; import com.ibm.cloud.is.vpc.v1.model.InstancePlacementTargetPrototypeDedicatedHostIdentityDedicatedHostIdentityById; @@ -195,7 +196,7 @@ public void testInstancePrototypeInstanceByImage() throws Throwable { assertEquals(instancePrototypeInstanceByImageModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceByImageModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceByImageModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByImageModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + assertEquals(JsonParser.parseString(instancePrototypeInstanceByImageModelNew.bootVolumeAttachment().toString()), JsonParser.parseString(volumeAttachmentPrototypeInstanceByImageContextModel.toString())); assertEquals(instancePrototypeInstanceByImageModelNew.image().toString(), imageIdentityModel.toString()); assertEquals(instancePrototypeInstanceByImageModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); assertEquals(instancePrototypeInstanceByImageModelNew.zone().toString(), zoneIdentityModel.toString()); 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 2dc7063ac1..a02fc6548b 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 @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.EncryptionKeyIdentityByCRN; import com.ibm.cloud.is.vpc.v1.model.ImageIdentityById; import com.ibm.cloud.is.vpc.v1.model.InstancePlacementTargetPrototypeDedicatedHostIdentityDedicatedHostIdentityById; @@ -203,7 +204,7 @@ 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(JsonParser.parseString(instancePrototypeInstanceBySourceTemplateModelNew.bootVolumeAttachment().toString()), JsonParser.parseString(volumeAttachmentPrototypeInstanceByImageContextModel.toString())); assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.image().toString(), imageIdentityModel.toString()); assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); assertEquals(instancePrototypeInstanceBySourceTemplateModelNew.sourceTemplate().toString(), instanceTemplateIdentityModel.toString()); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeTest.java index 0492fb7f15..867b56dee8 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstancePrototypeInstanceByVolumeTest.java @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.EncryptionKeyIdentityByCRN; import com.ibm.cloud.is.vpc.v1.model.InstancePlacementTargetPrototypeDedicatedHostIdentityDedicatedHostIdentityById; import com.ibm.cloud.is.vpc.v1.model.InstanceProfileIdentityByName; @@ -195,7 +196,7 @@ public void testInstancePrototypeInstanceByVolume() throws Throwable { assertEquals(instancePrototypeInstanceByVolumeModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instancePrototypeInstanceByVolumeModelNew.userData(), "testString"); assertEquals(instancePrototypeInstanceByVolumeModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instancePrototypeInstanceByVolumeModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByVolumeContextModel.toString()); + assertEquals(JsonParser.parseString(instancePrototypeInstanceByVolumeModelNew.bootVolumeAttachment().toString()), JsonParser.parseString(volumeAttachmentPrototypeInstanceByVolumeContextModel.toString())); assertEquals(instancePrototypeInstanceByVolumeModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); assertEquals(instancePrototypeInstanceByVolumeModelNew.zone().toString(), zoneIdentityModel.toString()); } diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceByImageTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceByImageTest.java index 6e4e0acab8..c966abc158 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceByImageTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceByImageTest.java @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.EncryptionKeyIdentityByCRN; import com.ibm.cloud.is.vpc.v1.model.ImageIdentityById; import com.ibm.cloud.is.vpc.v1.model.InstancePlacementTargetPrototypeDedicatedHostIdentityDedicatedHostIdentityById; @@ -195,7 +196,7 @@ public void testInstanceTemplatePrototypeInstanceByImage() throws Throwable { assertEquals(instanceTemplatePrototypeInstanceByImageModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceByImageModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceByImageModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceByImageModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + assertEquals(JsonParser.parseString(instanceTemplatePrototypeInstanceByImageModelNew.bootVolumeAttachment().toString()), JsonParser.parseString(volumeAttachmentPrototypeInstanceByImageContextModel.toString())); assertEquals(instanceTemplatePrototypeInstanceByImageModelNew.image().toString(), imageIdentityModel.toString()); assertEquals(instanceTemplatePrototypeInstanceByImageModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); assertEquals(instanceTemplatePrototypeInstanceByImageModelNew.zone().toString(), zoneIdentityModel.toString()); diff --git a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceBySourceTemplateTest.java b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceBySourceTemplateTest.java index 59ca7c3c59..e859c831d7 100644 --- a/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceBySourceTemplateTest.java +++ b/modules/vpc/src/test/java/com/ibm/cloud/is/vpc/v1/model/InstanceTemplatePrototypeInstanceBySourceTemplateTest.java @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.EncryptionKeyIdentityByCRN; import com.ibm.cloud.is.vpc.v1.model.ImageIdentityById; import com.ibm.cloud.is.vpc.v1.model.InstancePlacementTargetPrototypeDedicatedHostIdentityDedicatedHostIdentityById; @@ -203,7 +204,7 @@ public void testInstanceTemplatePrototypeInstanceBySourceTemplate() throws Throw assertEquals(instanceTemplatePrototypeInstanceBySourceTemplateModelNew.totalVolumeBandwidth(), Long.valueOf("500")); assertEquals(instanceTemplatePrototypeInstanceBySourceTemplateModelNew.userData(), "testString"); assertEquals(instanceTemplatePrototypeInstanceBySourceTemplateModelNew.vpc().toString(), vpcIdentityModel.toString()); - assertEquals(instanceTemplatePrototypeInstanceBySourceTemplateModelNew.bootVolumeAttachment().toString(), volumeAttachmentPrototypeInstanceByImageContextModel.toString()); + assertEquals(JsonParser.parseString(instanceTemplatePrototypeInstanceBySourceTemplateModelNew.bootVolumeAttachment().toString()), JsonParser.parseString(volumeAttachmentPrototypeInstanceByImageContextModel.toString())); assertEquals(instanceTemplatePrototypeInstanceBySourceTemplateModelNew.image().toString(), imageIdentityModel.toString()); assertEquals(instanceTemplatePrototypeInstanceBySourceTemplateModelNew.primaryNetworkInterface().toString(), networkInterfacePrototypeModel.toString()); assertEquals(instanceTemplatePrototypeInstanceBySourceTemplateModelNew.sourceTemplate().toString(), instanceTemplateIdentityModel.toString()); 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 d557d11a9d..f114790d22 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 @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.EncryptionKeyIdentityByCRN; import com.ibm.cloud.is.vpc.v1.model.VolumeAttachmentPrototypeInstanceByImageContext; import com.ibm.cloud.is.vpc.v1.model.VolumeProfileIdentityByName; @@ -72,7 +73,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()); + assertEquals(JsonParser.parseString(volumeAttachmentPrototypeInstanceByImageContextModelNew.volume().toString()), JsonParser.parseString(volumePrototypeInstanceByImageContextModel.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 8bffcf1df7..fb273f755f 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 @@ -13,6 +13,7 @@ package com.ibm.cloud.is.vpc.v1.model; +import com.google.gson.JsonParser; import com.ibm.cloud.is.vpc.v1.model.EncryptionKeyIdentityByCRN; import com.ibm.cloud.is.vpc.v1.model.SnapshotIdentityById; import com.ibm.cloud.is.vpc.v1.model.VolumeAttachmentPrototypeInstanceByVolumeContext; @@ -80,7 +81,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(), volumeAttachmentVolumePrototypeInstanceByVolumeContextModel.toString()); + assertEquals(JsonParser.parseString(volumeAttachmentPrototypeInstanceByVolumeContextModelNew.volume().toString()), JsonParser.parseString(volumeAttachmentVolumePrototypeInstanceByVolumeContextModel.toString())); } @Test(expectedExceptions = IllegalArgumentException.class)