From f28545e983023a32e50e7719392fc60ac47b821a Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Thu, 31 Oct 2024 13:32:55 +0100 Subject: [PATCH] Clean up tests Clean up various code style issues in tests. JIRA: LIGHTY-299 Signed-off-by: Ivan Hrasko (cherry picked from commit eb36f82e806b43e3ff46d6e0763bf44558c545ca) --- .../core/controller/datainit/DataInitTest.java | 12 +++++------- .../southbound/netconf/tests/CallhomePluginTest.java | 6 ------ .../lightymodule/GnmiSouthBoundModuleTest.java | 1 - .../gnmi/test/gnmi/GnmiWithoutRestconfTest.java | 11 ++--------- .../modules/gnmi/test/gnmi/SimulatorCrudTest.java | 4 ---- 5 files changed, 7 insertions(+), 27 deletions(-) diff --git a/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/datainit/DataInitTest.java b/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/datainit/DataInitTest.java index c85c3a5031..1b19ebe952 100644 --- a/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/datainit/DataInitTest.java +++ b/lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/datainit/DataInitTest.java @@ -25,8 +25,6 @@ import org.testng.annotations.Test; public class DataInitTest { - // value from .xml/.json file - private static int EXPECTED_DARKNESS_FACTOR = 200; private static final String PATH_TO_JSON_INIT_CONFIG = "/DataInitJsonConfig.json"; private static final String PATH_TO_XML_INIT_CONFIG = "/DataInitXmlConfig.json"; private static final String PATH_TO_INVALID_PATH_TO_INIT_CONFIG = "/DataInitInvalidInitPathConfig.json"; @@ -86,7 +84,6 @@ public void testInvalidInitFilePath() throws Exception { .build(); boolean result = lightyController.start().get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); Assert.assertEquals(result,false); - } @Test @@ -114,10 +111,11 @@ public void shutdownLighty() { lightyController.shutdown(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); } - private ToasterListener registerToasterListener(DataBroker dataBroker, - InstanceIdentifier instanceIdentifier, - CountDownLatch listenerLatch) { - ToasterListener listener = new ToasterListener(listenerLatch, EXPECTED_DARKNESS_FACTOR); + private ToasterListener registerToasterListener(final DataBroker dataBroker, + final InstanceIdentifier instanceIdentifier, final CountDownLatch listenerLatch) { + // value from .xml/.json file + final int expectedDarknessFactor = 200; + ToasterListener listener = new ToasterListener(listenerLatch, expectedDarknessFactor); dataBroker.registerDataTreeChangeListener( DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, instanceIdentifier), listener); diff --git a/lighty-modules/integration-tests/src/test/java/io/lighty/modules/southbound/netconf/tests/CallhomePluginTest.java b/lighty-modules/integration-tests/src/test/java/io/lighty/modules/southbound/netconf/tests/CallhomePluginTest.java index e16860e71e..c9a86b7d61 100644 --- a/lighty-modules/integration-tests/src/test/java/io/lighty/modules/southbound/netconf/tests/CallhomePluginTest.java +++ b/lighty-modules/integration-tests/src/test/java/io/lighty/modules/southbound/netconf/tests/CallhomePluginTest.java @@ -20,16 +20,12 @@ import java.net.Socket; import java.net.SocketAddress; import java.util.concurrent.TimeUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @Test public class CallhomePluginTest { - - private static final Logger LOG = LoggerFactory.getLogger(CallhomePluginTest.class); public static final long SHUTDOWN_TIMEOUT_MILLIS = 60_000; private LightyController lightyController; @@ -47,7 +43,6 @@ public void beforeClass() throws ConfigurationException { NetconfConfigUtils.injectServicesToTopologyConfig(configuration, lightyController.getServices()); netconfPlugin = NetconfCallhomePluginBuilder.from(configuration, lightyController.getServices(), restConfConfig.getInetAddress().getHostAddress(), restConfConfig.getHttpPort()).build(); - } @AfterClass @@ -73,5 +68,4 @@ public void testStart() throws Exception { socket.connect(endpoint); } } - } diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/lightymodule/GnmiSouthBoundModuleTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/lightymodule/GnmiSouthBoundModuleTest.java index 180a4c06ec..60328db03c 100644 --- a/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/lightymodule/GnmiSouthBoundModuleTest.java +++ b/lighty-modules/lighty-gnmi/lighty-gnmi-sb/src/test/java/io/lighty/gnmi/southbound/lightymodule/GnmiSouthBoundModuleTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at https://www.eclipse.org/legal/epl-v10.html */ - package io.lighty.gnmi.southbound.lightymodule; import static org.mockito.Mockito.when; diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/GnmiWithoutRestconfTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/GnmiWithoutRestconfTest.java index 85a43dad77..ab4897d54a 100644 --- a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/GnmiWithoutRestconfTest.java +++ b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/GnmiWithoutRestconfTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at https://www.eclipse.org/legal/epl-v10.html */ - package io.lighty.modules.gnmi.test.gnmi; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,8 +29,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; @@ -44,7 +41,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.GCMParameterSpec; @@ -152,17 +148,14 @@ public class GnmiWithoutRestconfTest { private static final QName YANG_VERSION_QN = QName.create(GNMI_YANG_MODEL_QN, "version"); private static final QName YANG_BODY_QN = QName.create(GNMI_YANG_MODEL_QN, "body"); - private static LightyController lightyController; private static GnmiSouthboundModule gnmiSouthboundModule; private static SimulatedGnmiDevice gnmiDevice; - @BeforeAll public static void startUp() throws ConfigurationException, ExecutionException, InterruptedException, IOException, - InvalidAlgorithmParameterException, NoSuchPaddingException, NoSuchAlgorithmException, - InvalidKeySpecException, InvalidKeyException, TimeoutException, EffectiveModelContextBuilderException { - + NoSuchAlgorithmException, InvalidKeySpecException, TimeoutException, + EffectiveModelContextBuilderException { lightyController = new LightyControllerBuilder() .from(ControllerConfigUtils.getConfiguration(Files.newInputStream(CONFIGURATION_PATH))) .build(); diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java index 626e50964c..84bf6edf9f 100644 --- a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java +++ b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at https://www.eclipse.org/legal/epl-v10.html */ - package io.lighty.modules.gnmi.test.gnmi; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -38,13 +37,11 @@ import org.slf4j.LoggerFactory; public class SimulatorCrudTest { - private static final Logger LOG = LoggerFactory.getLogger(SimulatorCrudTest.class); private static final int TARGET_PORT = 10161; private static final String TARGET_HOST = "127.0.0.1"; private static final String INITIAL_DATA_PATH = "src/test/resources/json/initData"; - private static final String TEST_SCHEMA_PATH = "src/test/resources/additional/models"; private static final String SIMULATOR_CONFIG = "/json/simulator_config.json"; private static final String SERVER_KEY = "src/test/resources/certs/server-pkcs8.key"; private static final String SERVER_CERT = "src/test/resources/certs/server.crt"; @@ -61,7 +58,6 @@ public class SimulatorCrudTest { @BeforeEach public void setUp() throws Exception { - GnmiSimulatorConfiguration simulatorConfiguration = GnmiSimulatorConfUtils .loadGnmiSimulatorConfiguration(this.getClass().getResourceAsStream(SIMULATOR_CONFIG)); simulatorConfiguration.setTargetAddress(TARGET_HOST);