diff --git a/build.gradle b/build.gradle index ebda54f..8e5b2ab 100644 --- a/build.gradle +++ b/build.gradle @@ -51,8 +51,12 @@ configure(javaProjects) { } dependencies { - testCompile group: "junit", name: "junit", version: "4.12" - itestCompile group: "junit", name: "junit", version: "4.12" + testImplementation group: "org.junit.jupiter", name: "junit-jupiter", version: "5.5.1" + itestImplementation group: "org.junit.jupiter", name: "junit-jupiter", version: "5.5.1" + } + + test { + useJUnitPlatform() } jar { diff --git a/src/test/java/com/beanit/josistack/SiemensClientITest.java b/src/test/java/com/beanit/josistack/SiemensClientITest.java index ad309e3..1e993f7 100644 --- a/src/test/java/com/beanit/josistack/SiemensClientITest.java +++ b/src/test/java/com/beanit/josistack/SiemensClientITest.java @@ -13,13 +13,14 @@ */ package com.beanit.josistack; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.BufferedOutputStream; import java.io.DataOutputStream; import java.io.IOException; import java.net.Socket; import java.nio.ByteBuffer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SiemensClientITest { @@ -277,7 +278,7 @@ public class SiemensClientITest { Thread.sleep(2000); - Assert.assertTrue(success); + assertTrue(success); serverAcseSAP.stopListening(); } diff --git a/src/test/java/com/beanit/jositransport/ClientServerITest.java b/src/test/java/com/beanit/jositransport/ClientServerITest.java index 95941a8..16f2801 100644 --- a/src/test/java/com/beanit/jositransport/ClientServerITest.java +++ b/src/test/java/com/beanit/jositransport/ClientServerITest.java @@ -13,6 +13,8 @@ */ package com.beanit.jositransport; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.IOException; import java.net.InetAddress; import java.nio.ByteBuffer; @@ -20,7 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ClientServerITest { @@ -382,7 +384,7 @@ public class ClientServerITest { 0, subArrayOfReturnedData.length); - Arrays.equals(subArrayOfReturnedData, concat(testData, testData)); + assertTrue(Arrays.equals(subArrayOfReturnedData, concat(testData, testData))); tConnection.disconnect(); diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest.java b/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest.java index 44f6aca..f0b842b 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest.java @@ -13,6 +13,12 @@ */ package com.beanit.openiec61850.integrationtests; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaBoolean; import com.beanit.openiec61850.BdaFloat32; @@ -45,8 +51,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ClientServerITest extends Thread implements ServerEventListener, ClientEventListener { @@ -149,20 +154,20 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl namePlateVendor.setDefault(); clientAssociation.getDataValues(namePlateVendor); - Assert.assertEquals("Fraunhofer ISE", new String(namePlateVendor.getValue())); + assertEquals("Fraunhofer ISE", new String(namePlateVendor.getValue())); // -------------Test DataSets-Start--------------------- Collection dataSets = serverModel.getDataSets(); - Assert.assertEquals(2, dataSets.size()); + assertEquals(2, dataSets.size()); DataSet dataSet1 = serverModel.getDataSet("ied1lDevice1/LLN0.dataset1"); - Assert.assertEquals("ied1lDevice1/LLN0.dataset1", dataSet1.getReferenceStr()); + assertEquals("ied1lDevice1/LLN0.dataset1", dataSet1.getReferenceStr()); DataSet dataSet2 = serverModel.getDataSet("ied1lDevice1/LLN0.dataset2"); - Assert.assertEquals("ied1lDevice1/LLN0.dataset2", dataSet2.getReferenceStr()); + assertEquals("ied1lDevice1/LLN0.dataset2", dataSet2.getReferenceStr()); for (FcModelNode dataSet2Member : dataSet2) { ((BdaInt32) dataSet2Member).setValue(9); @@ -188,19 +193,19 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl List serviceErrors = clientAssociation.getDataSetValues(nonPersistentDataSet); for (ServiceError serviceError : serviceErrors) { - Assert.assertNull(serviceError); + assertNull(serviceError); } - Assert.assertTrue("Fraunhofer ISE".equals(new String(namePlateVendor.getValue()))); + assertTrue("Fraunhofer ISE".equals(new String(namePlateVendor.getValue()))); clientAssociation.deleteDataSet(nonPersistentDataSet); serviceErrors = clientAssociation.getDataSetValues(nonPersistentDataSet); - Assert.assertEquals(2, serviceErrors.size()); + assertEquals(2, serviceErrors.size()); for (ServiceError serviceError : serviceErrors) { - Assert.assertNotNull(serviceError); + assertNotNull(serviceError); } // -------------Test DataSets-End--------------------- @@ -212,11 +217,11 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl f.setFloat(3.0f); - Assert.assertEquals(f.getFloat(), 3.0f, 0.00001); + assertEquals(f.getFloat(), 3.0f, 0.00001); clientAssociation.getDataSetValues(dataSet1); - Assert.assertEquals(f.getFloat(), 0.0f, 0.00001); + assertEquals(f.getFloat(), 0.0f, 0.00001); /* Test selecting a controllable Data Object */ @@ -227,15 +232,15 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl BdaVisibleString sbo = (BdaVisibleString) serverModel.findModelNode("ied1lDevice1/CSWI1.PosA.SBO", Fc.CO); - Assert.assertNotNull(sbo); + assertNotNull(sbo); clientAssociation.getDataValues(sbo); - Assert.assertTrue(sbo.getStringValue().equals("success")); + assertTrue(sbo.getStringValue().equals("success")); clientAssociation.getDataValues(sbo); - Assert.assertEquals(sbo.getStringValue(), "success"); + assertEquals(sbo.getStringValue(), "success"); /* select with second connection */ @@ -246,7 +251,7 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl (BdaVisibleString) serverModel2.findModelNode("ied1lDevice1/CSWI1.PosA.SBO", Fc.CO); clientAssociation2.getDataValues(sbo2); - Assert.assertEquals(sbo2.getStringValue(), ""); + assertEquals(sbo2.getStringValue(), ""); /* select with second connection after the sboTimeout of 1000ms should have been run out */ @@ -259,12 +264,12 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl } clientAssociation2.getDataValues(sbo2); - Assert.assertEquals(sbo2.getStringValue(), "success"); + assertEquals(sbo2.getStringValue(), "success"); /* select with first connnection after the second was quit */ clientAssociation.getDataValues(sbo); - Assert.assertEquals(sbo.getStringValue(), ""); + assertEquals(sbo.getStringValue(), ""); clientAssociation2.close(); @@ -275,79 +280,79 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl } clientAssociation.getDataValues(sbo); - Assert.assertEquals(sbo.getStringValue(), "success"); + assertEquals(sbo.getStringValue(), "success"); FcModelNode switchPosAFcDo = (FcModelNode) serverModel.findModelNode("ied1lDevice1/CSWI1.PosA", Fc.CO); - Assert.assertNotNull(switchPosAFcDo); + assertNotNull(switchPosAFcDo); clientAssociation.operate(switchPosAFcDo); // -------------Test Reporting-Start------------------- Urcb urcb1 = serverModel.getUrcb("ied1lDevice1/LLN0.urcb101"); - Assert.assertNotNull(urcb1); + assertNotNull(urcb1); Urcb urcb2 = serverModel.getUrcb("ied1lDevice1/LLN0.urcb2"); - Assert.assertNotNull(urcb2); + assertNotNull(urcb2); clientAssociation.getRcbValues(urcb1); clientAssociation.getRcbValues(urcb2); BdaBoolean resv = (BdaBoolean) urcb1.getChild("Resv"); - Assert.assertNotNull(resv); + assertNotNull(resv); clientAssociation.getDataValues(resv); - Assert.assertFalse(resv.getValue()); + assertFalse(resv.getValue()); clientAssociation.reserveUrcb(urcb1); clientAssociation.getDataValues(resv); - Assert.assertTrue(resv.getValue()); - - Assert.assertEquals("urcb1", urcb1.getRptId().getStringValue()); - Assert.assertEquals("ied1lDevice1/LLN0.urcb2", urcb2.getRptId().getStringValue()); - - Assert.assertEquals("ied1lDevice1/LLN0$dataset1", urcb1.getDatSet().getStringValue()); - Assert.assertEquals("ied1lDevice1/LLN0$dataset1", urcb2.getDatSet().getStringValue()); - - Assert.assertEquals(true, urcb1.getOptFlds().isDataSetName()); - Assert.assertEquals(false, urcb1.getOptFlds().isBufferOverflow()); - Assert.assertEquals(false, urcb1.getOptFlds().isConfigRevision()); - Assert.assertEquals(false, urcb1.getOptFlds().isDataReference()); - Assert.assertEquals(false, urcb1.getOptFlds().isEntryId()); - Assert.assertEquals(true, urcb1.getOptFlds().isReasonForInclusion()); - Assert.assertEquals(true, urcb1.getOptFlds().isReportTimestamp()); - Assert.assertEquals(false, urcb1.getOptFlds().isSegmentation()); - Assert.assertEquals(true, urcb1.getOptFlds().isSequenceNumber()); - - Assert.assertEquals(false, urcb2.getOptFlds().isDataSetName()); - Assert.assertEquals(false, urcb2.getOptFlds().isBufferOverflow()); - Assert.assertEquals(false, urcb2.getOptFlds().isConfigRevision()); - Assert.assertEquals(false, urcb2.getOptFlds().isDataReference()); - Assert.assertEquals(false, urcb2.getOptFlds().isEntryId()); - Assert.assertEquals(false, urcb2.getOptFlds().isReasonForInclusion()); - Assert.assertEquals(false, urcb2.getOptFlds().isReportTimestamp()); - Assert.assertEquals(false, urcb2.getOptFlds().isSegmentation()); - Assert.assertEquals(false, urcb2.getOptFlds().isSequenceNumber()); - - Assert.assertEquals(50L, urcb1.getBufTm().getValue()); - - Assert.assertEquals(true, urcb1.getTrgOps().isDataChange()); - Assert.assertEquals(true, urcb1.getTrgOps().isDataUpdate()); - Assert.assertEquals(true, urcb1.getTrgOps().isGeneralInterrogation()); - Assert.assertEquals(false, urcb1.getTrgOps().isIntegrity()); - Assert.assertEquals(true, urcb1.getTrgOps().isQualityChange()); - - Assert.assertEquals(false, urcb2.getTrgOps().isDataChange()); - Assert.assertEquals(false, urcb2.getTrgOps().isDataUpdate()); - Assert.assertEquals(true, urcb2.getTrgOps().isGeneralInterrogation()); - Assert.assertEquals(false, urcb2.getTrgOps().isIntegrity()); - Assert.assertEquals(false, urcb2.getTrgOps().isQualityChange()); - - Assert.assertEquals(5000L, urcb1.getIntgPd().getValue()); - - Assert.assertEquals(0, urcb1.getSqNum().getValue()); - - Assert.assertEquals(0L, urcb1.getConfRev().getValue()); + assertTrue(resv.getValue()); + + assertEquals("urcb1", urcb1.getRptId().getStringValue()); + assertEquals("ied1lDevice1/LLN0.urcb2", urcb2.getRptId().getStringValue()); + + assertEquals("ied1lDevice1/LLN0$dataset1", urcb1.getDatSet().getStringValue()); + assertEquals("ied1lDevice1/LLN0$dataset1", urcb2.getDatSet().getStringValue()); + + assertEquals(true, urcb1.getOptFlds().isDataSetName()); + assertEquals(false, urcb1.getOptFlds().isBufferOverflow()); + assertEquals(false, urcb1.getOptFlds().isConfigRevision()); + assertEquals(false, urcb1.getOptFlds().isDataReference()); + assertEquals(false, urcb1.getOptFlds().isEntryId()); + assertEquals(true, urcb1.getOptFlds().isReasonForInclusion()); + assertEquals(true, urcb1.getOptFlds().isReportTimestamp()); + assertEquals(false, urcb1.getOptFlds().isSegmentation()); + assertEquals(true, urcb1.getOptFlds().isSequenceNumber()); + + assertEquals(false, urcb2.getOptFlds().isDataSetName()); + assertEquals(false, urcb2.getOptFlds().isBufferOverflow()); + assertEquals(false, urcb2.getOptFlds().isConfigRevision()); + assertEquals(false, urcb2.getOptFlds().isDataReference()); + assertEquals(false, urcb2.getOptFlds().isEntryId()); + assertEquals(false, urcb2.getOptFlds().isReasonForInclusion()); + assertEquals(false, urcb2.getOptFlds().isReportTimestamp()); + assertEquals(false, urcb2.getOptFlds().isSegmentation()); + assertEquals(false, urcb2.getOptFlds().isSequenceNumber()); + + assertEquals(50L, urcb1.getBufTm().getValue()); + + assertEquals(true, urcb1.getTrgOps().isDataChange()); + assertEquals(true, urcb1.getTrgOps().isDataUpdate()); + assertEquals(true, urcb1.getTrgOps().isGeneralInterrogation()); + assertEquals(false, urcb1.getTrgOps().isIntegrity()); + assertEquals(true, urcb1.getTrgOps().isQualityChange()); + + assertEquals(false, urcb2.getTrgOps().isDataChange()); + assertEquals(false, urcb2.getTrgOps().isDataUpdate()); + assertEquals(true, urcb2.getTrgOps().isGeneralInterrogation()); + assertEquals(false, urcb2.getTrgOps().isIntegrity()); + assertEquals(false, urcb2.getTrgOps().isQualityChange()); + + assertEquals(5000L, urcb1.getIntgPd().getValue()); + + assertEquals(0, urcb1.getSqNum().getValue()); + + assertEquals(0L, urcb1.getConfRev().getValue()); urcb1.getRptId().setValue("myurcb1"); urcb1.getTrgOps().setGeneralInterrogation(false); @@ -360,7 +365,7 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl clientAssociation.getRcbValues(urcb1); - Assert.assertEquals("myurcb1", urcb1.getRptId().getStringValue()); + assertEquals("myurcb1", urcb1.getRptId().getStringValue()); clientAssociation.reserveUrcb(urcb1); clientAssociation.cancelUrcbReservation(urcb1); @@ -372,7 +377,7 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl } catch (ServiceError e) { thrown = true; } - Assert.assertTrue(thrown); + assertTrue(thrown); urcb1.getTrgOps().setGeneralInterrogation(true); urcb1.getTrgOps().setDataChange(true); @@ -381,12 +386,12 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl serviceErrors = clientAssociation.setRcbValues(urcb1, false, false, false, false, true, true, false, false); - Assert.assertNotNull(serviceErrors.get(0)); + assertNotNull(serviceErrors.get(0)); clientAssociation.disableReporting(urcb1); serviceErrors = clientAssociation.setRcbValues(urcb1, false, false, false, false, true, true, false, false); - Assert.assertNull(serviceErrors.get(0)); + assertNull(serviceErrors.get(0)); clientAssociation.enableReporting(urcb1); @@ -394,8 +399,8 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl Thread.sleep(4000); - Assert.assertEquals(2, numReports); - Assert.assertEquals(2, numSuccess); + assertEquals(2, numReports); + assertEquals(2, numSuccess); clientAssociation.disableReporting(urcb1); @@ -403,13 +408,13 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl serviceErrors = clientAssociation.setRcbValues( urcb1, false, false, false, false, true, false, false, false); - Assert.assertNull(serviceErrors.get(0)); + assertNull(serviceErrors.get(0)); clientAssociation.enableReporting(urcb1); Thread.sleep(6500); - Assert.assertEquals(8, numReports); - Assert.assertEquals(8, numSuccess); + assertEquals(8, numReports); + assertEquals(8, numSuccess); clientAssociation.disableReporting(urcb1); @@ -418,7 +423,7 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl clientAssociation.disconnect(); Thread.sleep(500); - Assert.assertEquals(2, numAssociationClosed); + assertEquals(2, numAssociationClosed); serverSap.stop(); } @@ -512,19 +517,19 @@ public class ClientServerITest extends Thread implements ServerEventListener, Cl if (numReports == 1) { List reasons = report.getReasonCodes(); - Assert.assertEquals(2, reasons.size()); - Assert.assertTrue(reasons.get(0).isGeneralInterrogation()); - Assert.assertFalse(reasons.get(0).isDataUpdate()); + assertEquals(2, reasons.size()); + assertTrue(reasons.get(0).isGeneralInterrogation()); + assertFalse(reasons.get(0).isDataUpdate()); } else if (numReports == 2) { List reasons = report.getReasonCodes(); - Assert.assertEquals(1, reasons.size()); - Assert.assertFalse(reasons.get(0).isGeneralInterrogation()); - Assert.assertTrue(reasons.get(0).isDataChange()); + assertEquals(1, reasons.size()); + assertFalse(reasons.get(0).isGeneralInterrogation()); + assertTrue(reasons.get(0).isDataChange()); } else if (numReports >= 3) { List reasons = report.getReasonCodes(); - Assert.assertEquals(2, reasons.size()); - Assert.assertTrue(reasons.get(0).isIntegrity()); - Assert.assertTrue(reasons.get(1).isIntegrity()); + assertEquals(2, reasons.size()); + assertTrue(reasons.get(0).isIntegrity()); + assertTrue(reasons.get(1).isIntegrity()); } numSuccess++; diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest2.java b/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest2.java index c6befba..77b2844 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest2.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/ClientServerITest2.java @@ -13,6 +13,10 @@ */ package com.beanit.openiec61850.integrationtests; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaReasonForInclusion; import com.beanit.openiec61850.ClientAssociation; @@ -33,8 +37,7 @@ import java.net.InetAddress; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ClientServerITest2 extends Thread implements ServerEventListener, ClientEventListener { @@ -222,19 +225,19 @@ public class ClientServerITest2 extends Thread implements ServerEventListener, C if (numReports == 1) { List reasons = report.getReasonCodes(); - Assert.assertEquals(2, reasons.size()); - Assert.assertTrue(reasons.get(0).isGeneralInterrogation()); - Assert.assertFalse(reasons.get(0).isDataUpdate()); + assertEquals(2, reasons.size()); + assertTrue(reasons.get(0).isGeneralInterrogation()); + assertFalse(reasons.get(0).isDataUpdate()); } else if (numReports == 2) { List reasons = report.getReasonCodes(); - Assert.assertEquals(1, reasons.size()); - Assert.assertFalse(reasons.get(0).isGeneralInterrogation()); - Assert.assertTrue(reasons.get(0).isDataChange()); + assertEquals(1, reasons.size()); + assertFalse(reasons.get(0).isGeneralInterrogation()); + assertTrue(reasons.get(0).isDataChange()); } else if (numReports >= 3) { List reasons = report.getReasonCodes(); - Assert.assertEquals(2, reasons.size()); - Assert.assertTrue(reasons.get(0).isIntegrity()); - Assert.assertTrue(reasons.get(1).isIntegrity()); + assertEquals(2, reasons.size()); + assertTrue(reasons.get(0).isIntegrity()); + assertTrue(reasons.get(1).isIntegrity()); } numSuccess++; diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java b/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java index 1033bc9..d3cc411 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java @@ -13,7 +13,9 @@ */ package com.beanit.openiec61850.integrationtests; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import com.beanit.openiec61850.BasicDataAttribute; import com.beanit.openiec61850.BdaFloat32; @@ -35,10 +37,9 @@ import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; import java.util.List; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ReportingTest implements ClientEventListener { @@ -57,7 +58,7 @@ public class ReportingTest implements ClientEventListener { private ServerModel clientModel; private int reportCounter = 0; - @Before + @BeforeEach public void startServerAndClient() throws SclParseException, IOException, ServiceError { startServer(); startClient(); @@ -102,8 +103,8 @@ public class ReportingTest implements ClientEventListener { BdaFloat32 mag = (BdaFloat32) this.serverModel.findModelNode(CHANGING_SERVER_DA_REFERENCE_1, Fc.MX); - Assert.assertNotNull(mag); - Assert.assertEquals(0, this.reportCounter); + assertNotNull(mag); + assertEquals(0, this.reportCounter); mag.setFloat(3.0f); List bdas = new ArrayList<>(); @@ -112,7 +113,7 @@ public class ReportingTest implements ClientEventListener { Thread.sleep(500); - Assert.assertEquals(1, this.reportCounter); + assertEquals(1, this.reportCounter); } @Test @@ -135,7 +136,7 @@ public class ReportingTest implements ClientEventListener { this.clientAssociation.getRcbValues(urcb); - Assert.assertEquals(PREEXISTING_DATASET_REFERENCE, urcb.getDatSet().getStringValue()); + assertEquals(PREEXISTING_DATASET_REFERENCE, urcb.getDatSet().getStringValue()); System.out.println("dataset: " + urcb.getDatSet().getStringValue()); @@ -146,11 +147,11 @@ public class ReportingTest implements ClientEventListener { this.clientAssociation.setRcbValues( urcb, false, true, false, false, false, false, false, false); - Assert.assertNull(serviceErrors.get(0)); + assertNull(serviceErrors.get(0)); this.clientAssociation.getRcbValues(urcb); - Assert.assertEquals(CREATED_DATASET_REFERENCE, urcb.getDatSet().getStringValue()); + assertEquals(CREATED_DATASET_REFERENCE, urcb.getDatSet().getStringValue()); this.clientAssociation.enableReporting(urcb); @@ -158,8 +159,8 @@ public class ReportingTest implements ClientEventListener { BdaFloat32 mag = (BdaFloat32) this.serverModel.findModelNode(CHANGING_SERVER_DA_REFERENCE_1, Fc.MX); - Assert.assertNotNull(mag); - Assert.assertEquals(0, this.reportCounter); + assertNotNull(mag); + assertEquals(0, this.reportCounter); mag.setFloat(3.0f); List bdas = new ArrayList<>(); @@ -168,10 +169,10 @@ public class ReportingTest implements ClientEventListener { Thread.sleep(1_000); - Assert.assertEquals(1, this.reportCounter); + assertEquals(1, this.reportCounter); } - @After + @AfterEach public void disconnectAndStopServer() throws Exception { if (this.serverSap != null) { this.serverSap.stop(); diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/SclTests.java b/src/test/java/com/beanit/openiec61850/integrationtests/SclTests.java index d32ce12..e27cf1b 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/SclTests.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/SclTests.java @@ -15,7 +15,7 @@ package com.beanit.openiec61850.integrationtests; import com.beanit.openiec61850.SclParseException; import com.beanit.openiec61850.SclParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SclTests {