From 0108d152aa014c70a946502fedaed54da030f742 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Mon, 5 Dec 2016 18:26:18 +0200 Subject: [PATCH] Telemetry TEST --- application/pom.xml | 3 +-- .../AbstractFeatureIntegrationTest.java} | 8 ++++---- .../{rpc/mqtt/MqttRpcSuite.java => mqtt/MqttSuite.java} | 6 +++--- .../telemetry/MqttTelemetryIntergrationTest.java} | 6 +++--- pom.xml | 6 ++++++ 5 files changed, 17 insertions(+), 12 deletions(-) rename application/src/test/java/org/thingsboard/server/{rpc/AbstractRpcIntegrationTest.java => mqtt/AbstractFeatureIntegrationTest.java} (90%) rename application/src/test/java/org/thingsboard/server/{rpc/mqtt/MqttRpcSuite.java => mqtt/MqttSuite.java} (90%) rename application/src/test/java/org/thingsboard/server/{rpc/mqtt/MqttRpcIntergrationTest.java => mqtt/telemetry/MqttTelemetryIntergrationTest.java} (95%) diff --git a/application/pom.xml b/application/pom.xml index 3aff9fb365..992267e5f1 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -197,9 +197,8 @@ springfox-swagger2 - org.thingsboard.server + org.thingsboard tools - 0.0.1-SNAPSHOT test diff --git a/application/src/test/java/org/thingsboard/server/rpc/AbstractRpcIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java similarity index 90% rename from application/src/test/java/org/thingsboard/server/rpc/AbstractRpcIntegrationTest.java rename to application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java index 61c3d9d685..8d22343e07 100644 --- a/application/src/test/java/org/thingsboard/server/rpc/AbstractRpcIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.rpc; +package org.thingsboard.server.mqtt; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +31,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.context.WebApplicationContext; -import org.thingsboard.server.rpc.mqtt.MqttRpcIntergrationTest; +import org.thingsboard.server.mqtt.telemetry.MqttTelemetryIntergrationTest; import java.util.Arrays; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertNotNull; */ @ActiveProfiles("default") @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes=MqttRpcIntergrationTest.class, loader=SpringApplicationContextLoader.class) +@ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class) @TestPropertySource("classpath:cassandra-test.properties") @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @Configuration @@ -50,7 +50,7 @@ import static org.junit.Assert.assertNotNull; @ComponentScan({"org.thingsboard.server"}) @WebAppConfiguration @IntegrationTest("server.port:8080") -public class AbstractRpcIntegrationTest { +public class AbstractFeatureIntegrationTest { @SuppressWarnings("rawtypes") private HttpMessageConverter mappingJackson2HttpMessageConverter; diff --git a/application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcSuite.java b/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java similarity index 90% rename from application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcSuite.java rename to application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java index 1c10c96f2e..2628caaa3d 100644 --- a/application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcSuite.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.rpc.mqtt; +package org.thingsboard.server.mqtt; import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; import org.junit.ClassRule; @@ -27,8 +27,8 @@ import java.util.Arrays; * @author Valerii Sosliuk */ @RunWith(ClasspathSuite.class) -@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.rpc.mqtt.*Test"}) -public class MqttRpcSuite { +@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.mqtt.*.*Test"}) +public class MqttSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = diff --git a/application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcIntergrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java similarity index 95% rename from application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcIntergrationTest.java rename to application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java index 64abc40896..213f650638 100644 --- a/application/src/test/java/org/thingsboard/server/rpc/mqtt/MqttRpcIntergrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.rpc.mqtt; +package org.thingsboard.server.mqtt.telemetry; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttAsyncClient; @@ -25,7 +25,7 @@ import org.springframework.web.util.UriComponentsBuilder; import org.thingsboard.client.tools.RestClient; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.security.DeviceCredentials; -import org.thingsboard.server.rpc.AbstractRpcIntegrationTest; +import org.thingsboard.server.mqtt.AbstractFeatureIntegrationTest; import java.net.URI; import java.util.Arrays; @@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull; * @author Valerii Sosliuk */ @Slf4j -public class MqttRpcIntergrationTest extends AbstractRpcIntegrationTest { +public class MqttTelemetryIntergrationTest extends AbstractFeatureIntegrationTest { private static final String MQTT_URL = "tcp://localhost:1883"; private static final String BASE_URL = "http://localhost:8080"; diff --git a/pom.xml b/pom.xml index bd1faaea6b..c34a454f0c 100755 --- a/pom.xml +++ b/pom.xml @@ -364,6 +364,12 @@ dao ${project.version} + + org.thingsboard + tools + ${project.version} + test + org.thingsboard dao