Updated tests

iofog-agent-daemon/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'jacoco'
-//    id "org.jetbrains.kotlin.jvm" version "1.9.22"
 }
 
 description = 'iofog-agent-daemon'
@@ -13,7 +12,6 @@ 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 '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'
@@ -27,10 +25,6 @@ dependencies {
     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'
-//    testImplementation 'org.powermock:powermock-core:2.0.9'
 }
 
 processResources {

iofog-agent-daemon/src/main/java/org/eclipse/iofog/utils/device_info/ArchitectureType.java

@@ -40,7 +40,7 @@ public int getCode() {
 	 * common type for popular arm architectures:
 	 * arm, arm32, aarch64, armv{VERSION}{CODE}
 	 */
-	ARM("^(arm|arm32|armv[0-9]+.*|aarch64)$") {
+	ARM("^(arm|arm32|arm64|armv[0-9]+.*|aarch64)$") {
 		@Override
 		public int getCode() {
 			return 2;

iofog-agent-daemon/src/test/java/org/eclipse/iofog/command_line/CommandLineActionTest.java

@@ -1,6 +1,6 @@
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,7 +80,6 @@ public void setup() {
                 .thenReturn(new HashMap<>())
                 .thenThrow(new Exception("item not found or defined more than once"));
 
-        // CommandProperties mock
         Mockito.when(CmdProperties.getVersion()).thenReturn("1.2.2");
         Mockito.when(CmdProperties.getVersionMessage()).thenReturn(version);
         Mockito.when(CmdProperties.getDeprovisionMessage()).thenReturn("Deprovisioning from controller ... %s");
@@ -108,7 +107,6 @@ public void tearDown() throws Exception {
     @Test
     public void testGetKeys() {
         Assertions.assertFalse(CommandLineAction.HELP_ACTION.getKeys().isEmpty());
-//        Assertions.assertTrue(isEqual(stop, CommandLineAction.getActionByKey("stop").getKeys()));
     }
 
     /**

iofog-agent-daemon/src/test/java/org/eclipse/iofog/command_line/CommandLineConfigParamTest.java

@@ -1,6 +1,6 @@
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at

iofog-agent-daemon/src/test/java/org/eclipse/iofog/command_line/CommandLineParserTest.java

@@ -1,6 +1,6 @@
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at

iofog-agent-daemon/src/test/java/org/eclipse/iofog/command_line/util/CommandShellExecutorTest.java

@@ -1,7 +1,7 @@
 package org.eclipse.iofog.command_line.util;
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,23 +29,18 @@
  */
 @ExtendWith(MockitoExtension.class)
 public class CommandShellExecutorTest {
-    private static CommandShellExecutor commandShellExecutor;
     private CommandShellResultSet<List<String>, List<String>> commandShellResultSet;
     private String command;
     List<String> value;
     List<String> errors;
 
     @BeforeAll
     public static void setUp() throws Exception {
-        commandShellExecutor = spy(new CommandShellExecutor());
+        spy(new CommandShellExecutor());
     }
 
     @AfterAll
     public static void tearDown() throws Exception {
-//        command = null;
-//        value = null;
-//        errors = null;
-//        commandShellResultSet = null;
     }
 
     /**

iofog-agent-daemon/src/test/java/org/eclipse/iofog/command_line/util/CommandShellResultSetTest.java

@@ -1,6 +1,6 @@
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at

iofog-agent-daemon/src/test/java/org/eclipse/iofog/diagnostics/ImageDownloadManagerTest.java

@@ -1,6 +1,6 @@
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,7 +55,6 @@ public class ImageDownloadManagerTest {
     @Mock
     private static DockerUtil dockerUtil;
     private static String microserviceUuid;
-    private static DockerClient dockerClient;
     private static MockedStatic<CommandShellExecutor> cmdShellExecutor;
     private static Container container;
     private static CommandShellResultSet<List<String>, List<String>> resultSetWithPath;
@@ -69,19 +68,8 @@ public class ImageDownloadManagerTest {
     public void setUp() throws Exception {
         cmdShellExecutor = mockStatic(CommandShellExecutor.class);
         microserviceUuid = "microservice-id";
-//        mockStatic(Configuration.class);
-//        when(Configuration.getDockerUrl()).thenReturn("unix://dockerUrl/");
-//        when(Configuration.getDockerApiVersion()).thenReturn("19.03.1");
         orchestrator = mock(Orchestrator.class);
         mock(DefaultDockerClientConfig.class);
-//        DockerClientBuilder dockerClientBuilder = mock(DockerClientBuilder.class);
-//        mockStatic(DockerClientBuilder.class);
-
-//        dockerClient = mock(DockerClient.class);
-//        mockStatic(DockerClient.class);
-//        when(DockerClientBuilder.getInstance(any(DefaultDockerClientConfig.class))).thenReturn(dockerClientBuilder);
-//        when(dockerClientBuilder.build()).thenReturn(dockerClient);
-//        dockerUtil = mock(DockerUtil.class);
         dockerUtilStatic = mockStatic(DockerUtil.class);
         container = mock(Container.class);
         when(DockerUtil.getInstance()).thenReturn(dockerUtil);
@@ -94,13 +82,6 @@ public void setUp() throws Exception {
         when(dockerUtil.getContainer(microserviceUuid)).thenReturn(Optional.of(container));
         cmdShellExecutor.when(() -> CommandShellExecutor.executeCommand(any()))
                 .thenReturn(resultSetWithPath);
-//        cmdShellExecutor.when(CommandShellExecutor::executeCommand(any())).thenReturn(resultSetWithPath);
-
-//        error = new ArrayList<>();
-//        value = new ArrayList<>();
-//        value.add("local/path/newFile");
-//        resultSetWithPath = new CommandShellResultSet<>(value, error);
-//        when(CommandShellExecutor.executeCommand(any())).thenReturn(resultSetWithPath);
         doAnswer(new Answer() {
             @Override
             public Object answer(InvocationOnMock invocation) throws Throwable {
@@ -116,8 +97,6 @@ public void tearDown() throws Exception {
         value = null;
         resultSetWithPath = null;
         MODULE_NAME = null;
-//        dockerClient.close();
-//        reset(dockerClientBuilder);
         cmdShellExecutor.close();
         reset(dockerUtil);
         dockerUtilStatic.close();
@@ -146,7 +125,6 @@ public void createImageSnapshotWhenCommandExecuteReturnsSuccess() throws Excepti
         verify(dockerUtil, atLeastOnce()).getContainer(microserviceUuid);
         verify(orchestrator, atLeastOnce()).sendFileToController(any(), any());
         Mockito.verify(LoggingService.class, atLeastOnce());
-//        LoggingService.logInfo(MODULE_NAME, "Image snapshot deleted");
         LoggingService.logDebug(MODULE_NAME, "Finished Create image snapshot");
     }
 
@@ -177,16 +155,9 @@ public void createImageSnapshotWhenCommandExecuteReturnsError() throws Exception
      */
     @Test
     public void createImageSnapshotWhenCommandExecuteReturnsEmpty() throws Exception {
-//        error = new ArrayList<>();
-//        value = new ArrayList<>();
-//        resultSetWithPath = new CommandShellResultSet<>(value, error);
         when(dockerUtil.getContainer(microserviceUuid)).thenReturn(Optional.of(container));
-//        when(CommandShellExecutor.executeCommand(any())).thenReturn(resultSetWithPath);
         ImageDownloadManager.createImageSnapshot(orchestrator, microserviceUuid);
         verify(dockerUtil, atLeastOnce()).getContainer(microserviceUuid);
-//        verify(orchestrator, never()).sendFileToController(any(), any());
-//        Mockito.verify(LoggingService.class);
-//        LoggingService.logDebug(MODULE_NAME, "Finished Create image snapshot");
     }
 
     /**

iofog-agent-daemon/src/test/java/org/eclipse/iofog/diagnostics/strace/MicroserviceStraceDataTest.java

@@ -1,6 +1,6 @@
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at

iofog-agent-daemon/src/test/java/org/eclipse/iofog/diagnostics/strace/StraceDiagnosticManagerTest.java

@@ -1,6 +1,6 @@
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,7 +90,6 @@ public void setUp() throws Exception {
     @AfterEach
     public void tearDown() throws Exception {
         commandShellExecutor.close();
-//        reset(CommandShellExecutor.class);
         loggingService.close();
         reset(iterator);
         microserviceUuid = null;
@@ -151,10 +150,6 @@ public void throwsIllegalExceptionWhenPidByContainerNameIsNotFound() {
         straceDiagnosticManager.updateMonitoringMicroservices(jsonObject);
         verify(jsonObject, times(1)).getJsonArray("straceValues");
         verify(iterator, atLeastOnce()).hasNext();
-//        verify(microserviceObject, atLeastOnce()).getString("microserviceUuid");
-//        verify(microserviceObject, atLeastOnce()).getBoolean("straceRun");
-//        CommandShellExecutor.executeCommand(any());
-//        verify(CommandShellExecutor.class, times(1));
         verify(LoggingService.class, times(1));
         LoggingService.logError(any(), any(), any());
     }
@@ -302,18 +297,6 @@ public void testDisableMicroserviceStraceDiagnosticsWhenMicroserviceUuidIsPresen
         assertEquals(1, straceDiagnosticManager.getMonitoringMicroservices().size());
     }
 
-    /**
-     * Test disableMicroserviceStraceDiagnostics with microserviceUuid which is not present
-     */
-//    @Test
-//    public void testDisableMicroserviceStraceDiagnosticsWhenMicroserviceUuidIsNotPresent() {
-//        microserviceStraceData = new MicroserviceStraceData("newMicroserviceUuid", 1234, true);
-//        straceDiagnosticManager.getMonitoringMicroservices().add(microserviceStraceData);
-//        straceDiagnosticManager.disableMicroserviceStraceDiagnostics("Uuid");
-//        assertEquals(0, straceDiagnosticManager.getMonitoringMicroservices().size());
-//
-//    }
-
     /**
      * Test disableMicroserviceStraceDiagnostics with microserviceUuid null
      */

iofog-agent-daemon/src/test/java/org/eclipse/iofog/field_agent/FieldAgentStatusTest.java

@@ -1,6 +1,6 @@
 /*
  * *******************************************************************************
- *  * Copyright (c) 2018-2022 Edgeworx, Inc.
+ *  * Copyright (c) 2018-2024 Edgeworx, Inc.
  *  *
  *  * This program and the accompanying materials are made available under the
  *  * terms of the Eclipse Public License v. 2.0 which is available at