Updated tests using junit5

eclipse-iofog · Jan 25, 2024 · 46615a2 · 46615a2
1 parent 220dd08
commit 46615a2
Show file tree

Hide file tree

Showing 63 changed files with 7,397 additions and 7,266 deletions.
diff --git a/iofog-agent-daemon/build.gradle b/iofog-agent-daemon/build.gradle
@@ -12,16 +12,20 @@ dependencies {
     implementation 'com.jcraft:jsch:0.1.55'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.1'
     implementation 'org.apache.httpcomponents:httpmime:4.5.7'
-    implementation 'junit:junit:4.13.2'
+//    implementation 'junit:junit:4.13.2'
+    implementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
     implementation 'com.github.oshi:oshi-core:6.4.0'
     implementation 'org.slf4j:slf4j-nop:2.0.7'
     implementation 'org.apache.qpid:qpid-jms-client:2.4.0'
     implementation 'javax.json:javax.json-api:1.1.4'
     implementation 'org.glassfish:javax.json:1.1.4'
     testImplementation 'org.mockito:mockito-core:5.4.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:3.11.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation 'org.testng:testng:7.7.0'
 //    testImplementation 'org.powermock:powermock-module-junit4-rule:2.0.9'
 //    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
 //    testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
@@ -35,9 +39,9 @@ processResources {
 build {
     dependsOn shadowJar
 }
-
 test {
     jvmArgs '--add-opens=java.base/java.util=ALL-UNNAMED', '--add-opens=java.base/java.util.stream=ALL-UNNAMED', '--add-opens=java.base/java.lang=ALL-UNNAMED'
+    useJUnitPlatform()
 }
 
 tasks.register('copy', Copy)
@@ -100,4 +104,4 @@ jacoco {
 //}
 //
 //test.dependsOn(doJacocoOfflineInstrumentation)
-test.finalizedBy jacocoTestReport
+//test.finalizedBy jacocoTestReport
diff --git a/iofog-agent-daemon/src/main/java/org/eclipse/iofog/supervisor/Supervisor.java b/iofog-agent-daemon/src/main/java/org/eclipse/iofog/supervisor/Supervisor.java
@@ -113,7 +113,7 @@ private void startModule(IOFogModule ioFogModule) throws Exception {
         logInfo(" Started " + ioFogModule.getModuleName());
     }
 
-    private void operationDuration(){
+    protected void operationDuration(){
     	logDebug(" Start checking operation duration ");
         while (true) {
 			StatusReporter.setSupervisorStatus()

diff --git a/iofog-agent-daemon/src/main/resources/cmd_messages.properties b/iofog-agent-daemon/src/main/resources/cmd_messages.properties
@@ -1,4 +1,4 @@
-version_msg=ioFog %s \\nCopyright (C) 2022 Edgeworx, Inc. \\nEclipse ioFog is provided under the Eclipse Public License 2.0 (EPL-2.0) \\nhttps://www.eclipse.org/legal/epl-v20.html
+version_msg=ioFog %s \\nCopyright (C) 2018-2024 Edgeworx, Inc. \\nEclipse ioFog is provided under the Eclipse Public License 2.0 (EPL-2.0) \\nhttps://www.eclipse.org/legal/epl-v20.html
 deprovision_msg=Deprovisioning from controller ... %s
 provision_msg=Provisioning with key "%s" ... Result: %s
 provision_common_error=\\nProvisioning failed