Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MQTT Tests #20

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

MQTT Tests #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5e601dd
* added MQTT Subscribe Test (Level 8)
mjacoby Aug 9, 2016
bad9647
* fixed deletion of all entities after test
mjacoby Aug 9, 2016
7e68cae
* fixed preparation of each test case
mjacoby Aug 9, 2016
2a1fb20
* Updated paho version to 1.1.1-SNAPSHOT so websockets are supported.
hylkevds Aug 17, 2016
92d3d10
* comparing times using JodaTime instead fo String
mjacoby Aug 17, 2016
5dcd54e
* added tests for creating observations through MQTT publish (Conform…
mjacoby Aug 17, 2016
f7807cd
* added missing properties to test-run-props.xml
mjacoby Aug 17, 2016
79b04be
Merge branch 'ets-sta10' into mqttSubscribeTests
hylkevds May 21, 2017
068872f
Update EntityHelper.java
bertt May 30, 2017
bb27745
Update EntityHelper.java
bertt May 30, 2017
c61b816
Merge pull request #2 from bertt/patch-3
hylkevds May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,19 @@
<spec-version>1.0</spec-version>
</properties>

<repositories>
<repository>
<id>Eclipse Paho Repo</id>
<url>https://repo.eclipse.org/content/repositories/paho-snapshots/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-spi</artifactId>
Expand Down
13 changes: 11 additions & 2 deletions src/main/java/org/opengis/cite/sta10/SuiteAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@SuppressWarnings("rawtypes")
public enum SuiteAttribute {

/**
/**
* A client component for interacting with HTTP endpoints.
*/
CLIENT("httpClient", Client.class),
Expand All @@ -22,7 +22,16 @@ public enum SuiteAttribute {
* An integer denoting the conformance level to check. A given conformance
* level includes all lower levels.
*/
LEVEL("level", Integer.class);
LEVEL("level", Integer.class),
/**
* Address of the MQTT server including port (e.g. tcp://localhost:1883)
*/
MQTT_SERVER("mqttServer", String.class),
/**
* Timeout used to wait for messages on MQTT in milliseconds (e.g. 3000
* equals 3 seconds)
*/
MQTT_TIMEOUT("mqttTimeout", Long.class);

private final Class attrType;
private final String attrName;
Expand Down
69 changes: 40 additions & 29 deletions src/main/java/org/opengis/cite/sta10/SuiteFixtureListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.opengis.cite.sta10;

import com.sun.jersey.api.client.Client;

import java.io.*;
import java.net.*;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
Expand Down Expand Up @@ -46,9 +44,8 @@ public void onFinish(ISuite suite) {
* entity referenced by the {@link TestRunArg#IUT iut} argument is parsed
* and the resulting Document is set as the value of the "testSubject"
* attribute.
*
* @param suite
* An ISuite object representing a TestNG test suite.
*
* @param suite An ISuite object representing a TestNG test suite.
*/
void processSuiteParameters(ISuite suite) {
Map<String, String> params = suite.getXmlSuite().getParameters();
Expand All @@ -67,16 +64,27 @@ void processSuiteParameters(ISuite suite) {
String iutParam = params.get(TestRunArg.IUT.toString());

String response = checkServiceRootUri(iutParam);
if(!response.equals("")){
if (!response.equals("")) {
throw new IllegalArgumentException(
response);
}
suite.setAttribute(SuiteAttribute.TEST_SUBJECT.getName(), iutParam);
suite.setAttribute(SuiteAttribute.MQTT_SERVER.getName(), params.get(TestRunArg.MQTT_SERVER.toString()));
// defaulting to 30s timeout
Long mqttTimeout = new Long(30000);
if (null != params.get(TestRunArg.MQTT_TIMEOUT.toString())) {
try {
mqttTimeout = Long.valueOf(params.get(TestRunArg.MQTT_TIMEOUT.toString()));
} catch (NumberFormatException nfe) { // use default value instead
mqttTimeout = 30000l;
}
}
suite.setAttribute(SuiteAttribute.MQTT_TIMEOUT.getName(), mqttTimeout);
if (TestSuiteLogger.isLoggable(Level.FINE)) {
StringBuilder logMsg = new StringBuilder(
"Parsed resource retrieved from ");
logMsg.append(TestRunArg.IUT).append("\n");
// logMsg.append(XMLUtils.writeNodeToString(iutDoc));
// logMsg.append(XMLUtils.writeNodeToString(iutDoc));
TestSuiteLogger.log(Level.FINE, logMsg.toString());
}
}
Expand All @@ -97,13 +105,16 @@ void registerClientComponent(ISuite suite) {

/**
* Checking the service root URL to be compliant with SensorThings API
*
* @param rootUri The root URL for the service under test
* @return If the root URL of the service is not compliant to SensorThings API, it will return the reason it is not compliant. Otherwise it returns empty String.
* @return If the root URL of the service is not compliant to SensorThings
* API, it will return the reason it is not compliant. Otherwise it returns
* empty String.
*/
private String checkServiceRootUri(String rootUri) {
rootUri = rootUri.trim();
if(rootUri.lastIndexOf('/')==rootUri.length()-1){
rootUri = rootUri.substring(0,rootUri.length()-1);
if (rootUri.lastIndexOf('/') == rootUri.length() - 1) {
rootUri = rootUri.substring(0, rootUri.length() - 1);
}
HttpURLConnection connection = null;
String response = null;
Expand All @@ -112,7 +123,7 @@ private String checkServiceRootUri(String rootUri) {
try {
url = new URL(rootUri);

connection = (HttpURLConnection) url.openConnection();
connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
connection.setRequestProperty("Content-Type",
"application/json");
Expand All @@ -133,13 +144,13 @@ private String checkServiceRootUri(String rootUri) {
rd.close();
} catch (MalformedURLException e) {
e.printStackTrace();
return "Cannot connect to "+rootUri+".";
return "Cannot connect to " + rootUri + ".";
} catch (ProtocolException e) {
e.printStackTrace();
return "Cannot connect to "+rootUri+".";
return "Cannot connect to " + rootUri + ".";
} catch (IOException e) {
e.printStackTrace();
return "Cannot connect to "+rootUri+".";
return "Cannot connect to " + rootUri + ".";
}
JSONObject jsonResponse = null;
JSONArray entities = null;
Expand All @@ -148,7 +159,7 @@ private String checkServiceRootUri(String rootUri) {
entities = jsonResponse.getJSONArray("value");
} catch (JSONException e) {
e.printStackTrace();
return "The service response for the root URI \""+rootUri+"\" is not JSON.";
return "The service response for the root URI \"" + rootUri + "\" is not JSON.";
}
Map<String, Boolean> addedLinks = new HashMap<>();
addedLinks.put("Things", false);
Expand All @@ -164,70 +175,70 @@ private String checkServiceRootUri(String rootUri) {
String name, nameUrl;
try {
entity = entities.getJSONObject(i);
if(entity.get("name") == null){
if (entity.get("name") == null) {
return "The name component of Service root URI response is not available.";
}
if(entity.get("url") == null){
if (entity.get("url") == null) {
return "The name component of Service root URI response is not available.";
}
name = entity.getString("name");
nameUrl = entity.getString("url");
} catch (JSONException e) {
e.printStackTrace();
return "The service response for the root URI \""+rootUri+"\" is not JSON.";
return "The service response for the root URI \"" + rootUri + "\" is not JSON.";
}
switch (name) {
case "Things":
if(!nameUrl.equals(rootUri + "/Things") ){
return "The URL for Things in Service Root URI is not compliant to SensorThings API.";
if (!nameUrl.equals(rootUri + "/Things")) {
return "The URL for Things in Service Root URI is not compliant to SensorThings API.";
}
addedLinks.remove("Things");
addedLinks.put(name, true);
break;
case "Locations":
if(!nameUrl.equals(rootUri + "/Locations")) {
if (!nameUrl.equals(rootUri + "/Locations")) {
return "The URL for Locations in Service Root URI is not compliant to SensorThings API.";
}
addedLinks.remove("Locations");
addedLinks.put(name, true);
break;
case "HistoricalLocations":
if(!nameUrl.equals(rootUri + "/HistoricalLocations")) {
if (!nameUrl.equals(rootUri + "/HistoricalLocations")) {
return "The URL for HistoricalLocations in Service Root URI is not compliant to SensorThings API.";
}
addedLinks.remove("HistoricalLocations");
addedLinks.put(name, true);
break;
case "Datastreams":
if(!nameUrl.equals(rootUri + "/Datastreams")) {
if (!nameUrl.equals(rootUri + "/Datastreams")) {
return "The URL for Datastreams in Service Root URI is not compliant to SensorThings API.";
}
addedLinks.remove("Datastreams");
addedLinks.put(name, true);
break;
case "Sensors":
if(!nameUrl.equals(rootUri + "/Sensors")) {
if (!nameUrl.equals(rootUri + "/Sensors")) {
return "The URL for Sensors in Service Root URI is not compliant to SensorThings API.";
}
addedLinks.remove("Sensors");
addedLinks.put(name, true);
break;
case "Observations":
if(!nameUrl.equals(rootUri + "/Observations")) {
if (!nameUrl.equals(rootUri + "/Observations")) {
return "The URL for Observations in Service Root URI is not compliant to SensorThings API.";
}
addedLinks.remove("Observations");
addedLinks.put(name, true);
break;
case "ObservedProperties":
if(!nameUrl.equals(rootUri + "/ObservedProperties")) {
if (!nameUrl.equals(rootUri + "/ObservedProperties")) {
return "The URL for ObservedProperties in Service Root URI is not compliant to SensorThings API.";
}
addedLinks.remove("ObservedProperties");
addedLinks.put(name, true);
break;
case "FeaturesOfInterest":
if(!nameUrl.equals(rootUri + "/FeaturesOfInterest")) {
if (!nameUrl.equals(rootUri + "/FeaturesOfInterest")) {
return "The URL for FeaturesOfInterest in Service Root URI is not compliant to SensorThings API.";
}
addedLinks.remove("FeaturesOfInterest");
Expand All @@ -238,8 +249,8 @@ private String checkServiceRootUri(String rootUri) {
}
}
for (String key : addedLinks.keySet()) {
if(addedLinks.get(key) == false){
return "The Service Root URI response does not contain ";
if (addedLinks.get(key) == false) {
return "The Service Root URI response does not contain ";
}
}
return "";
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/org/opengis/cite/sta10/TestRunArg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@ public enum TestRunArg {
* An integer value denoting the conformance level to check. A given
* conformance level includes all lower levels.
*/
ICS;
ICS,
/**
* Address of the MQTT server including port (e.g. tcp://localhost:1883)
*/
MQTT_SERVER,
/**
* Timeout used to wait for messages on MQTT in milliseconds (e.g. 3000
* equals 3 seconds)
*/
MQTT_TIMEOUT;

@Override
public String toString() {
Expand Down
Loading