From 5170130e0217618c9b94e8a40dbda45ceafe4531 Mon Sep 17 00:00:00 2001 From: Mariusz Pacek Date: Thu, 29 Dec 2022 16:13:22 +0100 Subject: [PATCH] Working wersion --- .vscode/settings.json | 4 ++ pom.xml | 41 ++++++++++++------- ...onTest.java => InfluxConnectionTests.java} | 7 +++- ...a => JsonFileBasedConfigurationTests.java} | 2 +- ...est.java => ModbusCachedWrapperTests.java} | 2 +- ....java => ModbusRtuTcpRepositoryTests.java} | 2 +- ...rviceTest.java => ModbusServiceTests.java} | 2 +- workspace.code-workspace | 8 ++++ 8 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 .vscode/settings.json rename src/test/java/home/automation/configuration/{InfluxConnectionTest.java => InfluxConnectionTests.java} (77%) rename src/test/java/home/automation/configuration/{JsonFileBasedConfigurationTest.java => JsonFileBasedConfigurationTests.java} (91%) rename src/test/java/home/automation/modbus/{ModbusCachedWrapperTest.java => ModbusCachedWrapperTests.java} (99%) rename src/test/java/home/automation/modbus/{ModbusRtuTcpRepositoryTest.java => ModbusRtuTcpRepositoryTests.java} (98%) rename src/test/java/home/automation/modbus/{ModbusServiceTest.java => ModbusServiceTests.java} (96%) create mode 100644 workspace.code-workspace diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d53ecaf --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "java.compile.nullAnalysis.mode": "automatic", + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 179e172..51f8964 100644 --- a/pom.xml +++ b/pom.xml @@ -41,25 +41,13 @@ org.junit.jupiter junit-jupiter - RELEASE - test - - - org.junit.jupiter - junit-jupiter - RELEASE - test - - - org.junit.jupiter - junit-jupiter - RELEASE + 5.8.2 test org.projectlombok lombok - 1.18.22 + 1.18.24 provided @@ -91,4 +79,29 @@ https://maven.mangoautomation.net/repository/ias-release/ + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M7 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 11 + 11 + + + org.projectlombok + lombok + 1.18.24 + + + + + + diff --git a/src/test/java/home/automation/configuration/InfluxConnectionTest.java b/src/test/java/home/automation/configuration/InfluxConnectionTests.java similarity index 77% rename from src/test/java/home/automation/configuration/InfluxConnectionTest.java rename to src/test/java/home/automation/configuration/InfluxConnectionTests.java index 21ba5db..78ec794 100644 --- a/src/test/java/home/automation/configuration/InfluxConnectionTest.java +++ b/src/test/java/home/automation/configuration/InfluxConnectionTests.java @@ -2,16 +2,19 @@ package home.automation.configuration; import home.automation.influxdb.InfluxConnection; import org.influxdb.InfluxDB; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.UnknownHostException; -public class InfluxConnectionTest { +public class InfluxConnectionTests { + + @Disabled @Test public void givenConfigurationWhenInfluxPingThenConnectionIsAstablished() throws UnknownHostException { final InfluxDBConfiguration connection = new InfluxDBConfiguration(); - final InetAddress byName = InetAddress.getByName("https://influxdb.mariuszpacek.pl"); + final InetAddress byName = InetAddress.getByName("influxdb.mariuszpacek.pl"); connection.setAddress(byName.getHostName()); final InfluxDB db = new InfluxConnection(connection).getConnection(); assert (db.ping().isGood()); diff --git a/src/test/java/home/automation/configuration/JsonFileBasedConfigurationTest.java b/src/test/java/home/automation/configuration/JsonFileBasedConfigurationTests.java similarity index 91% rename from src/test/java/home/automation/configuration/JsonFileBasedConfigurationTest.java rename to src/test/java/home/automation/configuration/JsonFileBasedConfigurationTests.java index b9c1e88..aedeaa7 100644 --- a/src/test/java/home/automation/configuration/JsonFileBasedConfigurationTest.java +++ b/src/test/java/home/automation/configuration/JsonFileBasedConfigurationTests.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import java.util.Optional; -class JsonFileBasedConfigurationTest { +class JsonFileBasedConfigurationTests { @Test public void GivenFileConfigurationStrategy_When_getConfig_Then_MappedClassShoudlBeCreated() { diff --git a/src/test/java/home/automation/modbus/ModbusCachedWrapperTest.java b/src/test/java/home/automation/modbus/ModbusCachedWrapperTests.java similarity index 99% rename from src/test/java/home/automation/modbus/ModbusCachedWrapperTest.java rename to src/test/java/home/automation/modbus/ModbusCachedWrapperTests.java index ab170f0..dde43d0 100644 --- a/src/test/java/home/automation/modbus/ModbusCachedWrapperTest.java +++ b/src/test/java/home/automation/modbus/ModbusCachedWrapperTests.java @@ -9,7 +9,7 @@ import static java.lang.Thread.sleep; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -class ModbusCachedWrapperTest { +class ModbusCachedWrapperTests { public static final int MAX_TESTS = 10; private final RepositoryInMemory repository = new RepositoryInMemory(); diff --git a/src/test/java/home/automation/modbus/ModbusRtuTcpRepositoryTest.java b/src/test/java/home/automation/modbus/ModbusRtuTcpRepositoryTests.java similarity index 98% rename from src/test/java/home/automation/modbus/ModbusRtuTcpRepositoryTest.java rename to src/test/java/home/automation/modbus/ModbusRtuTcpRepositoryTests.java index af1019a..7d55e06 100644 --- a/src/test/java/home/automation/modbus/ModbusRtuTcpRepositoryTest.java +++ b/src/test/java/home/automation/modbus/ModbusRtuTcpRepositoryTests.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -class ModbusRtuTcpRepositoryTest { +class ModbusRtuTcpRepositoryTests { private ModbusRtuTcpRepository repository; @Mock diff --git a/src/test/java/home/automation/modbus/ModbusServiceTest.java b/src/test/java/home/automation/modbus/ModbusServiceTests.java similarity index 96% rename from src/test/java/home/automation/modbus/ModbusServiceTest.java rename to src/test/java/home/automation/modbus/ModbusServiceTests.java index f7c25d7..909e7be 100644 --- a/src/test/java/home/automation/modbus/ModbusServiceTest.java +++ b/src/test/java/home/automation/modbus/ModbusServiceTests.java @@ -8,7 +8,7 @@ import java.util.Objects; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -public class ModbusServiceTest { +public class ModbusServiceTests { @Test public void givenRegistryWhenGetRegistryThenValueFromRepositoryIsReturned(){ diff --git a/workspace.code-workspace b/workspace.code-workspace new file mode 100644 index 0000000..bab1b7f --- /dev/null +++ b/workspace.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": ".." + } + ], + "settings": {} +} \ No newline at end of file