From 94fd03df1373d1ecae9a4899cc05f2992a3c6e2e Mon Sep 17 00:00:00 2001 From: yannizhou05 <61256379+yannizhou05@users.noreply.github.com> Date: Wed, 30 Nov 2022 01:53:11 -0600 Subject: [PATCH] fix flaky tests (#6905) Co-authored-by: Yanni --- .../opendaylight/api/test/NeutronNetworkAdapterTest.java | 4 +++- .../network/opendaylight/api/test/NeutronNodeAdapterTest.java | 4 +++- .../network/opendaylight/api/test/NeutronPortAdapterTest.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronNetworkAdapterTest.java b/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronNetworkAdapterTest.java index 463646aa97d..04b0d7f85b1 100644 --- a/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronNetworkAdapterTest.java +++ b/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronNetworkAdapterTest.java @@ -27,6 +27,7 @@ import junit.framework.Assert; import org.apache.commons.httpclient.methods.StringRequestEntity; import org.junit.Test; +import com.google.gson.JsonParser; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -58,7 +59,8 @@ public class NeutronNetworkAdapterTest { entity = new StringRequestEntity(gsonNeutronNetwork.toJson(networkWrapper), "application/json", null); String actual = entity.getContent(); - Assert.assertEquals(jsonString, actual); + JsonParser parser = new JsonParser(); + Assert.assertEquals(parser.parse(jsonString), parser.parse(actual)); } catch (UnsupportedEncodingException e) { Assert.fail(e.getMessage()); } diff --git a/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronNodeAdapterTest.java b/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronNodeAdapterTest.java index 632b570bd6b..33cab45041f 100644 --- a/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronNodeAdapterTest.java +++ b/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronNodeAdapterTest.java @@ -29,6 +29,7 @@ import org.apache.cloudstack.network.opendaylight.api.model.NeutronNodeWrapper; import org.apache.commons.httpclient.methods.StringRequestEntity; import org.junit.Test; +import com.google.gson.JsonParser; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -48,7 +49,8 @@ public class NeutronNodeAdapterTest { entity = new StringRequestEntity(gsonNeutronNode.toJson(nodeWrapper), "application/json", null); String actual = entity.getContent(); - Assert.assertEquals(jsonString, actual); + JsonParser parser = new JsonParser(); + Assert.assertEquals(parser.parse(jsonString), parser.parse(actual)); } catch (UnsupportedEncodingException e) { Assert.fail(e.getMessage()); } diff --git a/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronPortAdapterTest.java b/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronPortAdapterTest.java index d888e9d13f1..e27c6f0dc2e 100644 --- a/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronPortAdapterTest.java +++ b/plugins/network-elements/opendaylight/src/test/java/org/apache/cloudstack/network/opendaylight/api/test/NeutronPortAdapterTest.java @@ -30,6 +30,7 @@ import org.apache.cloudstack.network.opendaylight.api.model.NeutronPortWrapper; import org.apache.commons.httpclient.methods.StringRequestEntity; import org.junit.Test; +import com.google.gson.JsonParser; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -61,7 +62,8 @@ public class NeutronPortAdapterTest { String actual = entity.getContent(); - Assert.assertEquals(jsonString, actual); + JsonParser parser = new JsonParser(); + Assert.assertEquals(parser.parse(jsonString), parser.parse(actual)); } catch (UnsupportedEncodingException e) { Assert.fail(e.getMessage()); }