From 585ec0f637f743f54b619f9c78b5baa8f1a1286f Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 17 Jun 2021 15:39:34 -0400 Subject: Use lombok annotations for sdnr, simulators Issue-ID: POLICY-3396 Change-Id: I16787f72b0529417c58b9e83a21880baaba92a3d Signed-off-by: Jim Hahn --- .../src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java | 2 +- .../sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java | 4 ++-- .../src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java | 7 +++++-- .../sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java | 4 ++-- .../sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) (limited to 'models-interactions/model-impl/sdnr/src/test/java') diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java index 9d497602f..11f408aeb 100644 --- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java +++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciCommonHeaderTest.java @@ -69,7 +69,7 @@ public class PciCommonHeaderTest { assertNotEquals(0, commonHeader.hashCode()); - assertEquals("CommonHeader [timeStamp=", commonHeader.toString().substring(0, 24)); + assertEquals("PciCommonHeader(timeStamp=", commonHeader.toString().substring(0, 26)); PciCommonHeader copiedPciCommonHeader = new PciCommonHeader(); copiedPciCommonHeader.setApiVer(commonHeader.getApiVer()); diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java index 0bff14de9..d504dbb7b 100644 --- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java +++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestTest.java @@ -4,7 +4,7 @@ * ================================================================================ * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019-2021 AT&T 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. @@ -52,7 +52,7 @@ public class PciRequestTest { assertNotEquals(0, request.hashCode()); - assertEquals("PciRequest[commonHeader=CommonHeader [timeStamp=", request.toString().substring(0, 48)); + assertEquals("PciRequest(commonHeader=PciCommonHeader(timeStamp=", request.toString().substring(0, 50)); PciRequest copiedPciRequest = new PciRequest(); copiedPciRequest.setCommonHeader(request.getCommonHeader()); diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java index a5c81bc1a..e44800e4b 100644 --- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java +++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciRequestWrapperTest.java @@ -4,7 +4,7 @@ * ================================================================================ * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2020-2021 AT&T 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. @@ -22,6 +22,7 @@ package org.onap.policy.sdnr; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; @@ -44,7 +45,9 @@ public class PciRequestWrapperTest { assertNotEquals(0, requestWrapper.hashCode()); - assertEquals("RequestWrapper [body=PciRequest[commonHeader=nul", requestWrapper.toString().substring(0, 48)); + assertThat(requestWrapper.toString()) + .startsWith("PciRequestWrapper(") + .contains("body=PciRequest(commonHeader=nul"); PciRequestWrapper copiedPciRequestWrapper = new PciRequestWrapper(); copiedPciRequestWrapper.setBody(requestWrapper.getBody()); diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java index d496f86fe..f0b6ffb90 100644 --- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java +++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciStatusTest.java @@ -4,7 +4,7 @@ * ================================================================================ * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019-2021 AT&T 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. @@ -44,7 +44,7 @@ public class PciStatusTest { status.setValue(THE_WONDERFUL_LAND_OF_OZ); assertEquals(THE_WONDERFUL_LAND_OF_OZ, status.getValue()); - assertEquals("Status [code = 1234, value = The wonderfu", status.toString().substring(0, 41)); + assertEquals("Status(code=1234, value=The wonderful", status.toString().substring(0, 37)); Status copiedStatus = new Status(); copiedStatus.setCode(status.getCode()); diff --git a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java index 91d42a3bf..708363bcc 100644 --- a/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java +++ b/models-interactions/model-impl/sdnr/src/test/java/org/onap/policy/sdnr/PciWrapperTest.java @@ -60,7 +60,7 @@ public class PciWrapperTest { assertNotEquals(0, wrapper.hashCode()); - assertEquals("Wrapper [version=19.3.9, cambriaPartition=The ", wrapper.toString().substring(0, 46)); + assertEquals("PciWrapper(version=19.3.9, cambriaPartition=The ", wrapper.toString().substring(0, 48)); PciWrapper copiedPciWrapper = new PciWrapper(); copiedPciWrapper.setVersion(wrapper.getVersion()); -- cgit