fix(emulator): Yet another set of small fixes (#5242)

* Updated wrong platform in kura.properties file; fixed launch config Signed-off-by: pierantoniomerlino <[email protected]> * Fixed system test Signed-off-by: pierantoniomerlino <[email protected]> --------- Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · May 22, 2024 · e7cd70d · e7cd70d
1 parent 457b953
commit e7cd70d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/kura/emulator/org.eclipse.kura.emulator/src/main/resources/Kura_Emulator.launch b/kura/emulator/org.eclipse.kura.emulator/src/main/resources/Kura_Emulator.launch
@@ -78,7 +78,7 @@
         <setEntry value="org.apache.geronimo.specs.geronimo-json_1.0_spec@default:default"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-jta_1.1_spec@default:default"/>
         <setEntry value="org.apache.logging.log4j.api@default:default"/>
-        <setEntry value="org.apache.logging.log4j.core@default:default"/>
+        <setEntry value="org.apache.logging.log4j.core@3:default"/>
         <setEntry value="org.apache.logging.log4j.slf4j.impl@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.c3p0@default:default"/>
         <setEntry value="org.eclipse.equinox.cm@default:default"/>
@@ -153,6 +153,7 @@
         <setEntry value="org.eclipse.kura.linux.bluetooth@default:default"/>
         <setEntry value="org.eclipse.kura.localization.resources@default:false"/>
         <setEntry value="org.eclipse.kura.localization@default:default"/>
+        <setEntry value="org.eclipse.kura.net.configuration@default:default"/>
         <setEntry value="org.eclipse.kura.request.handler.jaxrs@default:default"/>
         <setEntry value="org.eclipse.kura.rest.asset.provider@default:default"/>
         <setEntry value="org.eclipse.kura.rest.configuration.provider@default:default"/>
@@ -175,4 +176,4 @@
     <booleanAttribute key="tracing" value="false"/>
     <booleanAttribute key="useCustomFeatures" value="false"/>
     <booleanAttribute key="useDefaultConfigArea" value="true"/>
-</launchConfiguration>
+</launchConfiguration>
diff --git a/kura/emulator/org.eclipse.kura.emulator/src/main/resources/kura.properties b/kura/emulator/org.eclipse.kura.emulator/src/main/resources/kura.properties
@@ -19,7 +19,7 @@ kura.version=kura_emulator
 kura.marketplace.compatibility.version=
 kura.company=Eclipse
 kura.project=Dev
-kura.platform=dynacor
+kura.platform=DevPlatform
 kura.device.name=DevEmulator
 kura.model.id=DevModelId
 kura.model.name=DevModelName

diff --git a/...a.core.system.test/src/main/java/org/eclipse/kura/core/system/test/SystemServiceTest.java b/...a.core.system.test/src/main/java/org/eclipse/kura/core/system/test/SystemServiceTest.java
@@ -1,23 +1,25 @@
 /*******************************************************************************
  * Copyright (c) 2011, 2020 Eurotech and/or its affiliates and others
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *  Eurotech
  *******************************************************************************/
 package org.eclipse.kura.core.system.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.eclipse.kura.core.testutil.TestUtil;
+import org.eclipse.kura.executor.Command;
+import org.eclipse.kura.executor.CommandExecutorService;
+import org.eclipse.kura.executor.CommandStatus;
+import org.eclipse.kura.system.SystemService;
+import org.eclipse.kura.test.annotation.TestTarget;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -29,22 +31,20 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.kura.core.testutil.TestUtil;
-import org.eclipse.kura.executor.Command;
-import org.eclipse.kura.executor.CommandExecutorService;
-import org.eclipse.kura.executor.CommandStatus;
-import org.eclipse.kura.system.SystemService;
-import org.eclipse.kura.test.annotation.TestTarget;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class SystemServiceTest {
 
     private static final String UNKNOWN = "UNKNOWN";
     private static final String LINUX = "Linux"; // Ubuntu
     private static SystemService systemService = null;
     private static CommandExecutorService executorService = null;
-    private static CountDownLatch dependencyLatch = new CountDownLatch(2);	// initialize with number of dependencies
+    private static CountDownLatch dependencyLatch = new CountDownLatch(2);    // initialize with number of dependencies
     private boolean onCloudbees = false;
 
     @BeforeClass
@@ -100,9 +100,9 @@ public void testGetPrimaryMacAddress() {
     @TestTarget(targetPlatforms = { TestTarget.PLATFORM_ALL })
     @Test
     public void testGetPlatform() {
-        String[] expected = { "dynacor",   					// emulated
-                "Ubuntu",   									// Ubuntu
-                "BeagleBone"								// BeagleBone
+        String[] expected = { "DevPlatform", // emulated
+                "Ubuntu",                    // Ubuntu
+                "BeagleBone"                 // BeagleBone
         };
 
         try {
@@ -122,7 +122,7 @@ public void testGetPlatform() {
     @TestTarget(targetPlatforms = { TestTarget.PLATFORM_ALL })
     @Test
     public void testGetOsDistro() {
-        String[] expected = { "DevOsDitribution",   			// emulated
+        String[] expected = { "DevOsDitribution",            // emulated
                 LINUX };
 
         try {
@@ -142,8 +142,8 @@ public void testGetOsDistro() {
     @TestTarget(targetPlatforms = { TestTarget.PLATFORM_ALL })
     @Test
     public void testGetOsDistroVersion() {
-        String[] expected = { "DevOsDitributionVersion",   	// emulated
-                "N/A" 										// Ubuntu
+        String[] expected = { "DevOsDitributionVersion",    // emulated
+                "N/A"                                        // Ubuntu
         };
 
         try {

diff --git a/...esources/archetype-resources/org.eclipse.kura.emulator/src/main/resources/kura.properties b/...esources/archetype-resources/org.eclipse.kura.emulator/src/main/resources/kura.properties
@@ -18,7 +18,7 @@ kura.name=Kura
 kura.version=kura_emulator
 kura.company=Eclipse
 kura.project=Dev
-kura.platform=dynacor
+kura.platform=DevPlatform
 kura.device.name=DevEmulator
 kura.model.id=DevModelId
 kura.model.name=DevModelName