Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up tests #2056

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Clean up tests #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions ...core/lighty-controller/src/test/java/io/lighty/core/controller/datainit/DataInitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -86,7 +84,6 @@ public void testInvalidInitFilePath() throws Exception {
.build();
boolean result = lightyController.start().get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
Assert.assertEquals(result,false);

}

@Test
Expand Down Expand Up @@ -114,10 +111,11 @@ public void shutdownLighty() {
lightyController.shutdown(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
}

private ToasterListener registerToasterListener(DataBroker dataBroker,
InstanceIdentifier<Toaster> instanceIdentifier,
CountDownLatch listenerLatch) {
ToasterListener listener = new ToasterListener(listenerLatch, EXPECTED_DARKNESS_FACTOR);
private ToasterListener registerToasterListener(final DataBroker dataBroker,
final InstanceIdentifier<Toaster> 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);
Expand Down
6 changes: 0 additions & 6 deletions ...on-tests/src/test/java/io/lighty/modules/southbound/netconf/tests/CallhomePluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -73,5 +68,4 @@ public void testStart() throws Exception {
socket.connect(endpoint);
}
}

}
1 change: 0 additions & 1 deletion ...nmi-sb/src/test/java/io/lighty/gnmi/southbound/lightymodule/GnmiSouthBoundModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 2 additions & 9 deletions ...hty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/GnmiWithoutRestconfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 0 additions & 4 deletions ...mi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand All @@ -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);
Expand Down
Loading