From d3936b67d5c34b6c12e3097ea9f930ab8211b1fe Mon Sep 17 00:00:00 2001 From: Ganesh Date: Fri, 15 Jul 2022 13:43:28 +0530 Subject: [PATCH] Jira issue, Swap these 2 arguments so they are in the correct order: expected value, actual value. Signed-off-by: Ganesh Change-Id: I241dfab988432f0474cf77ed2ac2056b89b25a11 Issue-ID: Issue-ID: SO-3966 --- .../adapters/catalogdb/catalogrest/CatalogDBRestTest.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CatalogDBRestTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CatalogDBRestTest.java index 48ef1329b0..74ea27cc06 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CatalogDBRestTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CatalogDBRestTest.java @@ -3,6 +3,7 @@ * ONAP - SO * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2022 Samsung Electronics Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -813,7 +814,7 @@ public class CatalogDBRestTest extends CatalogDbAdapterBaseTest { restTemplate.exchange(builder.toUriString(), HttpMethod.GET, entity, String.class); assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatusCode().value()); - JSONAssert.assertEquals(badQueryParamResponse, response.getBody().toString(), false); + JSONAssert.assertEquals(badQueryParamResponse, response.getBody(), false); } @Test @@ -850,10 +851,10 @@ public class CatalogDBRestTest extends CatalogDbAdapterBaseTest { ObjectMapper mapper = new ObjectMapper(); ProcessingFlags processingFlagsResponse = mapper.readValue(response.getBody(), ProcessingFlags.class); - assertEquals(processingFlagsResponse.getFlag(), "TESTFLAG"); - assertEquals(processingFlagsResponse.getValue(), "NO"); - assertEquals(processingFlagsResponse.getEndpoint(), "TESTENDPOINT"); - assertEquals(processingFlagsResponse.getDescription(), "TEST FLAG"); + assertEquals("TESTFLAG", processingFlagsResponse.getFlag()); + assertEquals("NO", processingFlagsResponse.getValue()); + assertEquals("TESTENDPOINT", processingFlagsResponse.getEndpoint()); + assertEquals("TEST FLAG", processingFlagsResponse.getDescription()); } @Test @@ -876,8 +877,8 @@ public class CatalogDBRestTest extends CatalogDbAdapterBaseTest { boolean testFlagFound = false; for (int i = 0; i < processingFlagsResponse.size(); i++) { if (processingFlagsResponse.get(i).getFlag().equals("TESTFLAG")) { - assertEquals(processingFlagsResponse.get(i).getEndpoint(), "TESTENDPOINT"); - assertEquals(processingFlagsResponse.get(i).getDescription(), "TEST FLAG"); + assertEquals("TESTENDPOINT", processingFlagsResponse.get(i).getEndpoint()); + assertEquals("TEST FLAG", processingFlagsResponse.get(i).getDescription()); testFlagFound = true; } } -- 2.16.6