From e1d67de22d0bf9fe50c16ee6bc1e50310e74d4fa Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Tue, 24 Aug 2021 13:03:02 -0400 Subject: clamp sonar fix on test code and the rest - rename files to "...ItTestCase" to comply SONAR and checkstyle - surefire plugin include *Test.java files - failsafe plugin include *ItTestCase.java files - use assertEquals etc. - replace to "var" - remove unused import Issue-ID: POLICY-3452 Change-Id: I2e6e829726c4585f5f8bc985f4e8f2b88d17aef1 Signed-off-by: Taka Cho --- .../controlloop/runtime/monitoring/TestMonitoringProvider.java | 4 +++- .../controlloop/runtime/supervision/SupervisionAspectTest.java | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'runtime-controlloop/src/test') diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java index 5f885ec97..3ac6b6fa4 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java @@ -2,6 +2,8 @@ * ============LICENSE_START======================================================= * Copyright (C) 2021 Nordix Foundation. * ================================================================================ + * Modifications Copyright (C) 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. * You may obtain a copy of the License at @@ -229,7 +231,7 @@ class TestMonitoringProvider { var element = new ControlLoopElement(); element.setParticipantId(new ToscaConceptIdentifier("name1", "1.001")); controlLoop.setElements(Map.of(UUID.randomUUID(), element)); - when(mockClProvider.getControlLoop(eq(new ToscaConceptIdentifier("testName", "1.001")))) + when(mockClProvider.getControlLoop(new ToscaConceptIdentifier("testName", "1.001"))) .thenReturn(controlLoop); ParticipantStatisticsList getResponse = provider.fetchParticipantStatsPerControlLoop("testName", "1.001"); diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionAspectTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionAspectTest.java index 30ee9b1b9..b31aa8e4f 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionAspectTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionAspectTest.java @@ -2,6 +2,8 @@ * ============LICENSE_START======================================================= * Copyright (C) 2021 Nordix Foundation. * ================================================================================ + * Modifications Copyright (C) 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. * You may obtain a copy of the License at @@ -37,7 +39,7 @@ class SupervisionAspectTest { var supervisionScanner = spy(mock(SupervisionScanner.class)); try (var supervisionAspect = new SupervisionAspect(supervisionScanner)) { supervisionAspect.schedule(); - verify(supervisionScanner, timeout(500)).run(eq(true)); + verify(supervisionScanner, timeout(500)).run(true); } } @@ -47,7 +49,7 @@ class SupervisionAspectTest { try (var supervisionAspect = new SupervisionAspect(supervisionScanner)) { supervisionAspect.doCheck(); supervisionAspect.doCheck(); - verify(supervisionScanner, timeout(500).times(2)).run(eq(false)); + verify(supervisionScanner, timeout(500).times(2)).run(false); } } @@ -60,7 +62,7 @@ class SupervisionAspectTest { try (var supervisionAspect = new SupervisionAspect(supervisionScanner)) { supervisionAspect.handleParticipantStatus(participantStatusMessage); - verify(supervisionScanner, timeout(500)).handleParticipantStatus(eq(identifier)); + verify(supervisionScanner, timeout(500)).handleParticipantStatus(identifier); } } } -- cgit 1.2.3-korg