Merge pull request #6 from alezor/master

Addressed issues:
#3 
#4 
#5 (partially)

README.md

@@ -14,12 +14,9 @@ Contributors:
 
 # Kuksa-Integration Repo
 
-Contains build scripts and tests.
+Currently, the Jenkins file directs to servers from FH-Dortmund. Subject to be changed as soon as migrated to Eclipse.
+This Repo will further contain all necessary tests for Eclipse Kuksa.
 
-## Run Tests
-
-TBD
-
-## Run Build
-
-TBD
+Eclipse HONO API (including MQTT) and some Hawkbit API tests
+Appstore tests are not included in this release, as they are outdated with the new Appstore API
+APPSTACLE Cluster IPs have not been added, additional setup through Jenkins required

testing/pom.xml

@@ -75,6 +75,13 @@
 			<version>0.12.2</version>
 		</dependency>
 
+		<!-- PAHO LIBRARY -->
+		<dependency>
+			<groupId>org.eclipse.paho</groupId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+			<version>1.2.0</version>
+		</dependency>
+
 		<!-- VERTX LIBRARY -->
 		<dependency>
 			<groupId>io.vertx</groupId>

testing/src/main/java/org/eclipse/kuksa/testing/Application.java

@@ -1,3 +1,15 @@
+/*********************************************************************
+ * Copyright (c)  2019 Assystem GmbH [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: Assystem GmbH
+ **********************************************************************/
+
 package org.eclipse.kuksa.testing;
 
 import org.springframework.boot.SpringApplication;

testing/src/main/java/org/eclipse/kuksa/testing/config/AppStoreConfiguration.java

@@ -1,30 +1,42 @@
-package org.eclipse.kuksa.testing.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class AppStoreConfiguration {
-
-    @Value("${appstore.address}")
-    private String address;
-
-    @Value("${appstore.username}")
-    private String username;
-
-    @Value("${appstore.password}")
-    private String password;
-
-    public String getAddress() {
-        return address;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-}
+/*********************************************************************
+* Copyright (c)  2019 Assystem GmbH [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: Assystem GmbH
+**********************************************************************/
+
+package org.eclipse.kuksa.testing.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AppStoreConfiguration {
+
+    @Value("${appstore.address}")
+    private String address;
+
+    @Value("${appstore.username}")
+    private String username;
+
+    @Value("${appstore.password}")
+    private String password;
+
+    public String getAddress() {
+        return address;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+}

testing/src/main/java/org/eclipse/kuksa/testing/config/GlobalConfiguration.java

@@ -1,29 +1,41 @@
-package org.eclipse.kuksa.testing.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GlobalConfiguration {
-
-	@Value("${DEVICE_ID}")
-	private String deviceId;
-
-	@Value("${SECURITY_TOKEN}")
-	private String securityToken;
-
-	/**
-	 * @return the deviceId
-	 */
-	public String getDeviceId() {
-		return deviceId;
-	}
-
-	/**
-	 * @return the securityToken
-	 */
-	public String getSecurityToken() {
-		return securityToken;
-	}
-
-}
+/*********************************************************************
+ * Copyright (c)  2019 Assystem GmbH [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: Assystem GmbH
+ **********************************************************************/
+
+package org.eclipse.kuksa.testing.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class GlobalConfiguration {
+
+	@Value("${DEVICE_ID}")
+	private String deviceId;
+
+	@Value("${SECURITY_TOKEN}")
+	private String securityToken;
+
+	/**
+	 * @return the deviceId
+	 */
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	/**
+	 * @return the securityToken
+	 */
+	public String getSecurityToken() {
+		return securityToken;
+	}
+
+}

testing/src/main/java/org/eclipse/kuksa/testing/config/HawkBitConfiguration.java

@@ -1,70 +1,82 @@
-package org.eclipse.kuksa.testing.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class HawkBitConfiguration {
-
-	@Value("${hawkbit.tenant}")
-	private String tenant;
-
-	@Value("${hawkbit.address}")
-	private String address;
-
-	@Value("${hawkbit.username}")
-	private String username;
-
-	@Value("${hawkbit.password}")
-	private String password;
-
-	/**
-	 * @return the tenant
-	 */
-	public String getTenant() {
-		return tenant;
-	}
-
-	/**
-	 * @return the address
-	 */
-	public String getAddress() {
-		return address;
-	}
-
-	/**
-	 * @param address the address to set
-	 */
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	/**
-	 * @return the username
-	 */
-	public String getUsername() {
-		return username;
-	}
-
-	/**
-	 * @param username the username to set
-	 */
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	/**
-	 * @return the password
-	 */
-	public String getPassword() {
-		return password;
-	}
-
-	/**
-	 * @param password the password to set
-	 */
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-}
+/*********************************************************************
+ * Copyright (c)  2019 Assystem GmbH [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: Assystem GmbH
+ **********************************************************************/
+
+package org.eclipse.kuksa.testing.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class HawkBitConfiguration {
+
+	@Value("${hawkbit.tenant}")
+	private String tenant;
+
+	@Value("${hawkbit.address}")
+	private String address;
+
+	@Value("${hawkbit.username}")
+	private String username;
+
+	@Value("${hawkbit.password}")
+	private String password;
+
+	/**
+	 * @return the tenant
+	 */
+	public String getTenant() {
+		return tenant;
+	}
+
+	/**
+	 * @return the address
+	 */
+	public String getAddress() {
+		return address;
+	}
+
+	/**
+	 * @param address the address to set
+	 */
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	/**
+	 * @return the username
+	 */
+	public String getUsername() {
+		return username;
+	}
+
+	/**
+	 * @param username the username to set
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	/**
+	 * @return the password
+	 */
+	public String getPassword() {
+		return password;
+	}
+
+	/**
+	 * @param password the password to set
+	 */
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+}