You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2016/11/30 15:46:30 UTC
[2/2] incubator-streams git commit: STREAMS-464: switch ITs from
junit to testng
STREAMS-464: switch ITs from junit to testng
testing with:
mvn clean verify -DargLine="-Dconfig.file=`pwd`/application.conf -Djava.util.Arrays.useLegacyMergeSort=true" -DskipTests=true -DskipITs=false
problems remain in several modules incuding:
streams-persist-elasticsearch
streams-provider-rss
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/899bb84f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/899bb84f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/899bb84f
Branch: refs/heads/master
Commit: 899bb84f3c9b411137f37d18114bfda76fc77c48
Parents: 0151714
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Tue Nov 29 21:43:00 2016 -0600
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Tue Nov 29 21:43:00 2016 -0600
----------------------------------------------------------------------
pom.xml | 5 +
.../streams-persist-elasticsearch/pom.xml | 3 +-
.../test/DatumFromMetadataProcessorIT.java | 19 +-
.../elasticsearch/test/ElasticsearchITs.java | 39 ----
.../test/ElasticsearchParentChildUpdaterIT.java | 133 ++++++-------
.../test/ElasticsearchParentChildWriterIT.java | 191 ++++++++++---------
.../test/ElasticsearchPersistUpdaterIT.java | 33 ++--
.../test/ElasticsearchPersistWriterIT.java | 20 +-
.../test/TestMetadataFromDocumentProcessor.java | 35 ++--
.../streams-persist-filebuffer/pom.xml | 4 +
.../filebuffer/test/FileBufferPersistIT.java | 14 +-
.../filebuffer/test/TestFileBufferPersist.java | 4 +-
.../streams/mongo/test/MongoPersistIT.java | 6 +-
.../test/data/FacebookActivitySerDeIT.java | 4 +-
.../facebook/test/data/FacebookPageSerDeIT.java | 4 +-
.../facebook/test/data/FacebookPostSerDeIT.java | 84 ++++----
.../providers/page/FacebookPageProviderIT.java | 13 +-
.../pagefeed/FacebookPageFeedProviderIT.java | 12 +-
.../google/gplus/GooglePlusCommentSerDeIT.java | 18 +-
.../google/gplus/GooglePlusPersonSerDeIT.java | 15 +-
.../processor/GooglePlusActivitySerDeIT.java | 10 +-
.../data/InstagramMediaFeedDataConverterIT.java | 5 +-
.../data/InstagramUserInfoDataConverterIT.java | 5 +-
.../InstagramRecentMediaProviderIT.java | 2 +-
.../providers/InstagramUserInfoProviderIT.java | 12 +-
.../test/MoreoverJsonActivitySerializerIT.java | 6 +-
.../test/MoreoverXmlActivitySerializerIT.java | 6 +-
.../test/provider/MoreoverProviderIT.java | 13 +-
.../rss/provider/RssStreamProviderTaskIT.java | 28 +--
.../streams/rss/test/RssStreamProviderIT.java | 6 +-
.../com/sysomos/test/SysomosJsonSerDeIT.java | 4 +-
.../test/provider/SysomosProviderIT.java | 14 +-
.../test/data/TwitterObjectMapperIT.java | 7 +-
.../providers/TwitterFollowingProviderIT.java | 13 +-
.../test/providers/TwitterStreamProviderIT.java | 12 +-
.../providers/TwitterTimelineProviderIT.java | 2 +-
.../TwitterUserInformationProviderIT.java | 13 +-
.../providers/YoutubeChannelProviderIT.java | 12 +-
.../YoutubeUserActivityProviderIT.java | 3 +-
...StreamsCassandraResourceGeneratorMojoIT.java | 14 +-
...amsElasticsearchResourceGeneratorMojoIT.java | 13 +-
.../StreamsHbaseResourceGeneratorMojoIT.java | 14 +-
.../StreamsHiveResourceGeneratorMojoIT.java | 15 +-
.../test/StreamsPigResourceGeneratorMojoIT.java | 15 +-
streams-plugins/streams-plugin-pojo/pom.xml | 5 +-
.../test/StreamsPojoSourceGeneratorMojoIT.java | 18 +-
.../test/resources/streams-plugin-pojo/pom.xml | 2 +-
.../test/StreamsScalaSourceGeneratorMojoIT.java | 18 +-
.../dropwizard/test/StreamsApplicationIT.java | 8 +-
.../activitystreams/test/ExamplesSerDeIT.java | 10 +-
.../java/org/apache/streams/util/GuidUtils.java | 5 +-
51 files changed, 479 insertions(+), 487 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef8e0ea..69366a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,6 +302,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/pom.xml b/streams-contrib/streams-persist-elasticsearch/pom.xml
index bf13df3..dd2bd05 100644
--- a/streams-contrib/streams-persist-elasticsearch/pom.xml
+++ b/streams-contrib/streams-persist-elasticsearch/pom.xml
@@ -210,10 +210,9 @@
<excludes>
<exclude>**/*Test.java</exclude>
<exclude>**/*Tests.java</exclude>
- <include>**/*IT.java</include>
</excludes>
<includes>
- <include>**/*ITs.java</include>
+ <include>**/*IT.java</include>
</includes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java
index 91afef6..c739d13 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java
@@ -29,18 +29,23 @@ import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
import org.apache.commons.lang.SerializationUtils;
import org.elasticsearch.client.Client;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
+import static org.testng.Assert.assertTrue;
+
/**
* Integration Test for
* @see org.apache.streams.elasticsearch.processor.DatumFromMetadataProcessor
*/
+@Test( groups={"DatumFromMetadataProcessorIT"},
+ dependsOnGroups={"ElasticsearchPersistWriterIT"}
+ )
public class DatumFromMetadataProcessorIT {
private ElasticsearchReaderConfiguration testConfiguration;
@@ -53,12 +58,12 @@ public class DatumFromMetadataProcessorIT {
DatumFromMetadataProcessor clone = (DatumFromMetadataProcessor) SerializationUtils.clone(processor);
}
- @Before
- public void prepareTest() throws Exception {
+ @BeforeClass
+ public void prepareTestDatumFromMetadataProcessor() throws Exception {
Config reference = ConfigFactory.load();
File conf_file = new File("target/test-classes/DatumFromMetadataProcessorIT.conf");
- assert(conf_file.exists());
+ assertTrue(conf_file.exists());
Config testResourceConfig = ConfigFactory.parseFileAnySyntax(conf_file, ConfigParseOptions.defaults().setAllowMissing(false));
Config typesafe = testResourceConfig.withFallback(reference).resolve();
testConfiguration = new ComponentConfigurator<>(ElasticsearchReaderConfiguration.class).detectConfiguration(typesafe, "elasticsearch");
@@ -66,7 +71,7 @@ public class DatumFromMetadataProcessorIT {
}
- @Test
+ @Test()
public void testDatumFromMetadataProcessor() {
Map<String, Object> metadata = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchITs.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchITs.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchITs.java
deleted file mode 100644
index b0e67a9..0000000
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchITs.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.elasticsearch.test;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- ElasticsearchPersistWriterIT.class,
- ElasticsearchPersistUpdaterIT.class,
- ElasticsearchParentChildWriterIT.class,
- ElasticsearchParentChildUpdaterIT.class,
- DatumFromMetadataProcessorIT.class
-})
-/**
- * Integration Test Suite for
- * @see org.apache.streams.elasticsearch
- */
-public class ElasticsearchITs {
- // the class remains empty,
- // used only as a holder for the above annotations
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
index 2764318..511b54f 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
@@ -43,14 +43,14 @@ import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.index.query.QueryBuilders;
-import org.junit.Before;
-import org.junit.Test;
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.util.ClasspathHelper;
import org.reflections.util.ConfigurationBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.InputStream;
@@ -58,88 +58,93 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
/**
* Integration Test for
* @see org.apache.streams.elasticsearch.ElasticsearchPersistUpdater
* using parent/child associated documents.
*/
+@Test
+ (
+ groups={"ElasticsearchParentChildUpdaterIT"},
+ dependsOnGroups={"ElasticsearchParentChildWriterIT"}
+ )
public class ElasticsearchParentChildUpdaterIT {
- private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchParentChildUpdaterIT.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchParentChildUpdaterIT.class);
- private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
+ private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
- private ElasticsearchWriterConfiguration testConfiguration;
- private Client testClient;
+ protected ElasticsearchWriterConfiguration testConfiguration;
+ protected Client testClient;
- private Set<Class<? extends ActivityObject>> objectTypes;
+ Set<Class<? extends ActivityObject>> objectTypes;
- private List<String> files;
+ List<String> files;
- @Before
- public void prepareTest() throws Exception {
+ @BeforeClass
+ public void prepareTestParentChildPersistUpdater() throws Exception {
- Config reference = ConfigFactory.load();
- File conf_file = new File("target/test-classes/ElasticsearchParentChildUpdaterIT.conf");
- assert(conf_file.exists());
- Config testResourceConfig = ConfigFactory.parseFileAnySyntax(conf_file, ConfigParseOptions.defaults().setAllowMissing(false));
- Config typesafe = testResourceConfig.withFallback(reference).resolve();
- testConfiguration = new ComponentConfigurator<>(ElasticsearchWriterConfiguration.class).detectConfiguration(typesafe, "elasticsearch");
- testClient = new ElasticsearchClientManager(testConfiguration).getClient();
+ Config reference = ConfigFactory.load();
+ File conf_file = new File("target/test-classes/ElasticsearchParentChildUpdaterIT.conf");
+ assertTrue(conf_file.exists());
+ Config testResourceConfig = ConfigFactory.parseFileAnySyntax(conf_file, ConfigParseOptions.defaults().setAllowMissing(false));
+ Config typesafe = testResourceConfig.withFallback(reference).resolve();
+ testConfiguration = new ComponentConfigurator<>(ElasticsearchWriterConfiguration.class).detectConfiguration(typesafe, "elasticsearch");
+ testClient = new ElasticsearchClientManager(testConfiguration).getClient();
- ClusterHealthRequest clusterHealthRequest = Requests.clusterHealthRequest();
- ClusterHealthResponse clusterHealthResponse = testClient.admin().cluster().health(clusterHealthRequest).actionGet();
- assertNotEquals(clusterHealthResponse.getStatus(), ClusterHealthStatus.RED);
+ ClusterHealthRequest clusterHealthRequest = Requests.clusterHealthRequest();
+ ClusterHealthResponse clusterHealthResponse = testClient.admin().cluster().health(clusterHealthRequest).actionGet();
+ assertNotEquals(clusterHealthResponse.getStatus(), ClusterHealthStatus.RED);
- IndicesExistsRequest indicesExistsRequest = Requests.indicesExistsRequest(testConfiguration.getIndex());
- IndicesExistsResponse indicesExistsResponse = testClient.admin().indices().exists(indicesExistsRequest).actionGet();
- assertTrue(indicesExistsResponse.isExists());
+ IndicesExistsRequest indicesExistsRequest = Requests.indicesExistsRequest(testConfiguration.getIndex());
+ IndicesExistsResponse indicesExistsResponse = testClient.admin().indices().exists(indicesExistsRequest).actionGet();
+ assertTrue(indicesExistsResponse.isExists());
- Reflections reflections = new Reflections(new ConfigurationBuilder()
- .setUrls(ClasspathHelper.forPackage("org.apache.streams.pojo.json"))
- .setScanners(new SubTypesScanner()));
- objectTypes = reflections.getSubTypesOf(ActivityObject.class);
+ Reflections reflections = new Reflections(new ConfigurationBuilder()
+ .setUrls(ClasspathHelper.forPackage("org.apache.streams.pojo.json"))
+ .setScanners(new SubTypesScanner()));
+ objectTypes = reflections.getSubTypesOf(ActivityObject.class);
- InputStream testActivityFolderStream = ElasticsearchParentChildUpdaterIT.class.getClassLoader()
- .getResourceAsStream("activities");
- files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
+ InputStream testActivityFolderStream = ElasticsearchParentChildUpdaterIT.class.getClassLoader()
+ .getResourceAsStream("activities");
+ files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
- }
+ }
+
+ @Test
+ public void testParentChildPersistUpdater() throws Exception {
- @Test
- public void testPersistUpdater() throws Exception {
-
- ElasticsearchPersistUpdater testPersistUpdater = new ElasticsearchPersistUpdater(testConfiguration);
- testPersistUpdater.prepare(null);
-
- for( String file : files) {
- LOGGER.info("File: " + file );
- InputStream testActivityFileStream = ElasticsearchParentChildUpdaterIT.class.getClassLoader()
- .getResourceAsStream("activities/" + file);
- Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class);
- activity.setAdditionalProperty("updated", Boolean.TRUE);
- StreamsDatum datum = new StreamsDatum(activity, activity.getVerb());
- if(StringUtils.isNotBlank(activity.getObject().getObjectType())) {
- datum.getMetadata().put("parent", activity.getObject().getObjectType());
- datum.getMetadata().put("type", "activity");
- testPersistUpdater.write(datum);
- LOGGER.info("Updated: " + activity.getVerb() );
- }
- }
-
- testPersistUpdater.cleanUp();
-
- SearchRequestBuilder countUpdatedRequest = testClient
- .prepareSearch(testConfiguration.getIndex())
- .setTypes("activity")
- .setQuery(QueryBuilders.queryStringQuery("updated:true"));
- SearchResponse countUpdatedResponse = countUpdatedRequest.execute().actionGet();
-
- assertEquals(84, countUpdatedResponse.getHits().getTotalHits());
+ ElasticsearchPersistUpdater testPersistUpdater = new ElasticsearchPersistUpdater(testConfiguration);
+ testPersistUpdater.prepare(null);
+ for( String file : files) {
+ LOGGER.info("File: " + file );
+ InputStream testActivityFileStream = ElasticsearchParentChildUpdaterIT.class.getClassLoader()
+ .getResourceAsStream("activities/" + file);
+ Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class);
+ activity.setAdditionalProperty("updated", Boolean.TRUE);
+ StreamsDatum datum = new StreamsDatum(activity, activity.getVerb());
+ if( !StringUtils.isEmpty(activity.getObject().getObjectType())) {
+ datum.getMetadata().put("parent", activity.getObject().getObjectType());
+ datum.getMetadata().put("type", "activity");
+ testPersistUpdater.write(datum);
+ LOGGER.info("Updated: " + activity.getVerb() );
+ }
}
+
+ testPersistUpdater.cleanUp();
+
+ SearchRequestBuilder countUpdatedRequest = testClient
+ .prepareSearch(testConfiguration.getIndex())
+ .setTypes("activity")
+ .setQuery(QueryBuilders.queryStringQuery("updated:true"));
+ SearchResponse countUpdatedResponse = countUpdatedRequest.execute().actionGet();
+
+ assertEquals(84, countUpdatedResponse.getHits().getTotalHits());
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
index 4cbc8bc..eb213f1 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
@@ -46,14 +46,15 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
-import org.junit.Before;
-import org.junit.Test;
+
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.util.ClasspathHelper;
import org.reflections.util.ConfigurationBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.InputStream;
@@ -62,121 +63,125 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
/**
* Integration Test for
* @see org.apache.streams.elasticsearch.ElasticsearchPersistWriter
* using parent/child associated documents.
*/
+@Test
+ (
+ groups={"ElasticsearchParentChildWriterIT"}
+ )
public class ElasticsearchParentChildWriterIT {
- private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchParentChildWriterIT.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchParentChildWriterIT.class);
+
+ private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
+
+ protected ElasticsearchWriterConfiguration testConfiguration;
+ protected Client testClient;
- private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
+ Set<Class<? extends ActivityObject>> objectTypes;
- private ElasticsearchWriterConfiguration testConfiguration;
- private Client testClient;
+ List<String> files;
- private Set<Class<? extends ActivityObject>> objectTypes;
+ @BeforeClass
+ public void prepareTestParentChildPersistWriter() throws Exception {
- private List<String> files;
+ Config reference = ConfigFactory.load();
+ File conf_file = new File("target/test-classes/ElasticsearchParentChildWriterIT.conf");
+ assertTrue(conf_file.exists());
+ Config testResourceConfig = ConfigFactory.parseFileAnySyntax(conf_file, ConfigParseOptions.defaults().setAllowMissing(false));
+ Config typesafe = testResourceConfig.withFallback(reference).resolve();
+ testConfiguration = new ComponentConfigurator<>(ElasticsearchWriterConfiguration.class).detectConfiguration(typesafe, "elasticsearch");
+ testClient = new ElasticsearchClientManager(testConfiguration).getClient();
- @Before
- public void prepareTest() throws Exception {
+ ClusterHealthRequest clusterHealthRequest = Requests.clusterHealthRequest();
+ ClusterHealthResponse clusterHealthResponse = testClient.admin().cluster().health(clusterHealthRequest).actionGet();
+ assertNotEquals(clusterHealthResponse.getStatus(), ClusterHealthStatus.RED);
- Config reference = ConfigFactory.load();
- File conf_file = new File("target/test-classes/ElasticsearchParentChildWriterIT.conf");
- assert(conf_file.exists());
- Config testResourceConfig = ConfigFactory.parseFileAnySyntax(conf_file, ConfigParseOptions.defaults().setAllowMissing(false));
- Config typesafe = testResourceConfig.withFallback(reference).resolve();
- testConfiguration = new ComponentConfigurator<>(ElasticsearchWriterConfiguration.class).detectConfiguration(typesafe, "elasticsearch");
- testClient = new ElasticsearchClientManager(testConfiguration).getClient();
+ IndicesExistsRequest indicesExistsRequest = Requests.indicesExistsRequest(testConfiguration.getIndex());
+ IndicesExistsResponse indicesExistsResponse = testClient.admin().indices().exists(indicesExistsRequest).actionGet();
+ if(indicesExistsResponse.isExists()) {
+ DeleteIndexRequest deleteIndexRequest = Requests.deleteIndexRequest(testConfiguration.getIndex());
+ DeleteIndexResponse deleteIndexResponse = testClient.admin().indices().delete(deleteIndexRequest).actionGet();
+ assertTrue(deleteIndexResponse.isAcknowledged());
+ }
- ClusterHealthRequest clusterHealthRequest = Requests.clusterHealthRequest();
- ClusterHealthResponse clusterHealthResponse = testClient.admin().cluster().health(clusterHealthRequest).actionGet();
- assertNotEquals(clusterHealthResponse.getStatus(), ClusterHealthStatus.RED);
+ PutIndexTemplateRequestBuilder putTemplateRequestBuilder = testClient.admin().indices().preparePutTemplate("mappings");
+ URL templateURL = ElasticsearchParentChildWriterIT.class.getResource("/ActivityChildObjectParent.json");
+ ObjectNode template = MAPPER.readValue(templateURL, ObjectNode.class);
+ String templateSource = MAPPER.writeValueAsString(template);
+ putTemplateRequestBuilder.setSource(templateSource);
- IndicesExistsRequest indicesExistsRequest = Requests.indicesExistsRequest(testConfiguration.getIndex());
- IndicesExistsResponse indicesExistsResponse = testClient.admin().indices().exists(indicesExistsRequest).actionGet();
- if(indicesExistsResponse.isExists()) {
- DeleteIndexRequest deleteIndexRequest = Requests.deleteIndexRequest(testConfiguration.getIndex());
- DeleteIndexResponse deleteIndexResponse = testClient.admin().indices().delete(deleteIndexRequest).actionGet();
- assertTrue(deleteIndexResponse.isAcknowledged());
- }
+ testClient.admin().indices().putTemplate(putTemplateRequestBuilder.request()).actionGet();
- PutIndexTemplateRequestBuilder putTemplateRequestBuilder = testClient.admin().indices().preparePutTemplate("mappings");
- URL templateURL = ElasticsearchParentChildWriterIT.class.getResource("/ActivityChildObjectParent.json");
- ObjectNode template = MAPPER.readValue(templateURL, ObjectNode.class);
- String templateSource = MAPPER.writeValueAsString(template);
- putTemplateRequestBuilder.setSource(templateSource);
+ Reflections reflections = new Reflections(new ConfigurationBuilder()
+ .setUrls(ClasspathHelper.forPackage("org.apache.streams.pojo.json"))
+ .setScanners(new SubTypesScanner()));
+ objectTypes = reflections.getSubTypesOf(ActivityObject.class);
- testClient.admin().indices().putTemplate(putTemplateRequestBuilder.request()).actionGet();
+ InputStream testActivityFolderStream = ElasticsearchParentChildWriterIT.class.getClassLoader()
+ .getResourceAsStream("activities");
+ files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
- Reflections reflections = new Reflections(new ConfigurationBuilder()
- .setUrls(ClasspathHelper.forPackage("org.apache.streams.pojo.json"))
- .setScanners(new SubTypesScanner()));
- objectTypes = reflections.getSubTypesOf(ActivityObject.class);
+ }
- InputStream testActivityFolderStream = ElasticsearchParentChildWriterIT.class.getClassLoader()
- .getResourceAsStream("activities");
- files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
+ @Test
+ public void testParentChildPersistWriter() throws Exception {
+ IndicesExistsRequest indicesExistsRequest = Requests.indicesExistsRequest(testConfiguration.getIndex());
+ IndicesExistsResponse indicesExistsResponse = testClient.admin().indices().exists(indicesExistsRequest).actionGet();
+ if(indicesExistsResponse.isExists()) {
+ DeleteIndexRequest deleteIndexRequest = Requests.deleteIndexRequest(testConfiguration.getIndex());
+ DeleteIndexResponse deleteIndexResponse = testClient.admin().indices().delete(deleteIndexRequest).actionGet();
}
- @Test
- public void testPersistWriter() throws Exception {
-
- IndicesExistsRequest indicesExistsRequest = Requests.indicesExistsRequest(testConfiguration.getIndex());
- IndicesExistsResponse indicesExistsResponse = testClient.admin().indices().exists(indicesExistsRequest).actionGet();
- if(indicesExistsResponse.isExists()) {
- DeleteIndexRequest deleteIndexRequest = Requests.deleteIndexRequest(testConfiguration.getIndex());
- DeleteIndexResponse deleteIndexResponse = testClient.admin().indices().delete(deleteIndexRequest).actionGet();
- }
-
- ElasticsearchPersistWriter testPersistWriter = new ElasticsearchPersistWriter(testConfiguration);
- testPersistWriter.prepare(null);
-
- for( Class objectType : objectTypes ) {
- Object object = objectType.newInstance();
- ActivityObject activityObject = MAPPER.convertValue(object, ActivityObject.class);
- StreamsDatum datum = new StreamsDatum(activityObject, activityObject.getObjectType());
- datum.getMetadata().put("type", "object");
- testPersistWriter.write( datum );
- }
-
- for( String file : files) {
- LOGGER.info("File: " + file );
- InputStream testActivityFileStream = ElasticsearchParentChildWriterIT.class.getClassLoader()
- .getResourceAsStream("activities/" + file);
- Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class);
- StreamsDatum datum = new StreamsDatum(activity, activity.getVerb());
- if(StringUtils.isNotBlank(activity.getObject().getObjectType())) {
- datum.getMetadata().put("parent", activity.getObject().getObjectType());
- datum.getMetadata().put("type", "activity");
- testPersistWriter.write(datum);
- LOGGER.info("Wrote: " + activity.getVerb());
- }
- }
-
- testPersistWriter.cleanUp();
-
- SearchRequestBuilder countParentRequest = testClient
- .prepareSearch(testConfiguration.getIndex())
- .setTypes("object");
- SearchResponse countParentResponse = countParentRequest.execute().actionGet();
-
- assertEquals(41, countParentResponse.getHits().getTotalHits());
-
- SearchRequestBuilder countChildRequest = testClient
- .prepareSearch(testConfiguration.getIndex())
- .setTypes("activity");
- SearchResponse countChildResponse = countChildRequest.execute().actionGet();
-
- assertEquals(84, countChildResponse.getHits().getTotalHits());
+ ElasticsearchPersistWriter testPersistWriter = new ElasticsearchPersistWriter(testConfiguration);
+ testPersistWriter.prepare(null);
+
+ for( Class objectType : objectTypes ) {
+ Object object = objectType.newInstance();
+ ActivityObject activityObject = MAPPER.convertValue(object, ActivityObject.class);
+ StreamsDatum datum = new StreamsDatum(activityObject, activityObject.getObjectType());
+ datum.getMetadata().put("type", "object");
+ testPersistWriter.write( datum );
+ }
+ for( String file : files) {
+ LOGGER.info("File: " + file );
+ InputStream testActivityFileStream = ElasticsearchParentChildWriterIT.class.getClassLoader()
+ .getResourceAsStream("activities/" + file);
+ Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class);
+ StreamsDatum datum = new StreamsDatum(activity, activity.getVerb());
+ if( !StringUtils.isEmpty(activity.getObject().getObjectType())) {
+ datum.getMetadata().put("parent", activity.getObject().getObjectType());
+ datum.getMetadata().put("type", "activity");
+ testPersistWriter.write(datum);
+ LOGGER.info("Wrote: " + activity.getVerb());
+ }
}
+ testPersistWriter.cleanUp();
+
+ SearchRequestBuilder countParentRequest = testClient
+ .prepareSearch(testConfiguration.getIndex())
+ .setTypes("object");
+ SearchResponse countParentResponse = countParentRequest.execute().actionGet();
+
+ assertEquals(41, countParentResponse.getHits().getTotalHits());
+
+ SearchRequestBuilder countChildRequest = testClient
+ .prepareSearch(testConfiguration.getIndex())
+ .setTypes("activity");
+ SearchResponse countChildResponse = countChildRequest.execute().actionGet();
+
+ assertEquals(84, countChildResponse.getHits().getTotalHits());
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
index 54303ea..5b4224a 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
@@ -42,24 +42,29 @@ import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.index.query.QueryBuilders;
-import org.junit.Before;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
/**
* Integration Test for
* @see org.apache.streams.elasticsearch.ElasticsearchPersistUpdater
*/
+@Test
+ (
+ groups={"ElasticsearchPersistUpdaterIT"},
+ dependsOnGroups={"ElasticsearchPersistWriterIT"}
+ )
public class ElasticsearchPersistUpdaterIT {
private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchPersistUpdaterIT.class);
@@ -69,24 +74,24 @@ public class ElasticsearchPersistUpdaterIT {
protected ElasticsearchWriterConfiguration testConfiguration;
protected Client testClient;
- @Before
- public void prepareTest() throws Exception {
+ @BeforeClass
+ public void prepareTestPersistUpdater() throws Exception {
Config reference = ConfigFactory.load();
File conf_file = new File("target/test-classes/ElasticsearchPersistUpdaterIT.conf");
- assert(conf_file.exists());
+ assertTrue(conf_file.exists());
Config testResourceConfig = ConfigFactory.parseFileAnySyntax(conf_file, ConfigParseOptions.defaults().setAllowMissing(false));
Config typesafe = testResourceConfig.withFallback(reference).resolve();
testConfiguration = new ComponentConfigurator<>(ElasticsearchWriterConfiguration.class).detectConfiguration(typesafe, "elasticsearch");
testClient = new ElasticsearchClientManager(testConfiguration).getClient();
- ClusterHealthRequest clusterHealthRequest = Requests.clusterHealthRequest();
- ClusterHealthResponse clusterHealthResponse = testClient.admin().cluster().health(clusterHealthRequest).actionGet();
- assertNotEquals(clusterHealthResponse.getStatus(), ClusterHealthStatus.RED);
+// ClusterHealthRequest clusterHealthRequest = Requests.clusterHealthRequest();
+// ClusterHealthResponse clusterHealthResponse = testClient.admin().cluster().health(clusterHealthRequest).actionGet();
+// assertNotEquals(clusterHealthResponse.getStatus(), ClusterHealthStatus.RED);
- IndicesExistsRequest indicesExistsRequest = Requests.indicesExistsRequest(testConfiguration.getIndex());
- IndicesExistsResponse indicesExistsResponse = testClient.admin().indices().exists(indicesExistsRequest).actionGet();
- assertTrue(indicesExistsResponse.isExists());
+// IndicesExistsRequest indicesExistsRequest = Requests.indicesExistsRequest(testConfiguration.getIndex());
+// IndicesExistsResponse indicesExistsResponse = testClient.admin().indices().exists(indicesExistsRequest).actionGet();
+// assertTrue(indicesExistsResponse.isExists());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
index 50331ec..cf99e87 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
@@ -42,24 +42,28 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
-import org.junit.Before;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
/**
* Integration Test for
* @see org.apache.streams.elasticsearch.ElasticsearchPersistWriter
*/
+@Test
+ (
+ groups={"ElasticsearchPersistWriterIT"}
+ )
public class ElasticsearchPersistWriterIT {
private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchPersistWriterIT.class);
@@ -69,12 +73,12 @@ public class ElasticsearchPersistWriterIT {
private ElasticsearchWriterConfiguration testConfiguration;
private Client testClient;
- @Before
- public void prepareTest() throws Exception {
+ @BeforeClass
+ public void prepareTestPersistWriter() throws Exception {
Config reference = ConfigFactory.load();
File conf_file = new File("target/test-classes/ElasticsearchPersistWriterIT.conf");
- assert(conf_file.exists());
+ assertTrue(conf_file.exists());
Config testResourceConfig = ConfigFactory.parseFileAnySyntax(conf_file, ConfigParseOptions.defaults().setAllowMissing(false));
Config typesafe = testResourceConfig.withFallback(reference).resolve();
testConfiguration = new ComponentConfigurator<>(ElasticsearchWriterConfiguration.class).detectConfiguration(typesafe, "elasticsearch");
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
index 7d89201..8b45eb2 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
@@ -38,6 +38,9 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* Unit Test for
* @see org.apache.streams.elasticsearch.processor.MetadataFromDocumentProcessor
@@ -89,16 +92,16 @@ public class TestMetadataFromDocumentProcessor {
StreamsDatum datum = new StreamsDatum(activity);
List<StreamsDatum> resultList = processor.process(datum);
- assert(resultList != null);
- assert(resultList.size() == 1);
+ assertNotNull(resultList);
+ assertEquals(1, resultList.size());
StreamsDatum result = resultList.get(0);
- assert(result != null);
- assert(result.getDocument() != null);
- assert(result.getId() != null);
- assert(result.getMetadata() != null);
- assert(result.getMetadata().get("id") != null);
- assert(result.getMetadata().get("type") != null);
+ assertNotNull(result);
+ assertNotNull(result.getDocument());
+ assertNotNull(result.getId());
+ assertNotNull(result.getMetadata());
+ assertNotNull(result.getMetadata().get("id"));
+ assertNotNull(result.getMetadata().get("type"));
LOGGER.info("valid: " + activity.getVerb() );
}
@@ -110,16 +113,16 @@ public class TestMetadataFromDocumentProcessor {
StreamsDatum datum = new StreamsDatum(activityObject);
List<StreamsDatum> resultList = processor.process(datum);
- assert(resultList != null);
- assert(resultList.size() == 1);
+ assertNotNull(resultList);
+ assertEquals(1, resultList.size());
StreamsDatum result = resultList.get(0);
- assert(result != null);
- assert(result.getDocument() != null);
- assert(result.getId() != null);
- assert(result.getMetadata() != null);
- assert(result.getMetadata().get("id") != null);
- assert(result.getMetadata().get("type") != null);
+ assertNotNull(result);
+ assertNotNull(result.getDocument());
+ assertNotNull(result.getId());
+ assertNotNull(result.getMetadata());
+ assertNotNull(result.getMetadata().get("id"));
+ assertNotNull(result.getMetadata().get("type"));
LOGGER.info("valid: " + activityObject.getObjectType() );
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-filebuffer/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-filebuffer/pom.xml b/streams-contrib/streams-persist-filebuffer/pom.xml
index ce0a37c..80c6985 100644
--- a/streams-contrib/streams-persist-filebuffer/pom.xml
+++ b/streams-contrib/streams-persist-filebuffer/pom.xml
@@ -87,6 +87,10 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java b/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java
index de8419d..5efd91e 100644
--- a/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java
+++ b/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java
@@ -28,11 +28,10 @@ import org.apache.streams.filebuffer.FileBufferPersistReader;
import org.apache.streams.filebuffer.FileBufferPersistWriter;
import org.apache.streams.local.builders.LocalStreamBuilder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.File;
import java.util.Arrays;
@@ -55,8 +54,8 @@ public class FileBufferPersistIT {
private StreamsDatum testDatum2 = new StreamsDatum("{\"datum\":2}");
private StreamsDatum testDatum3 = new StreamsDatum("{\"datum\":3}");
- @Before
- public void prepareTest() {
+ @BeforeClass
+ public void prepareTestPersistStream() {
testConfiguration = new FileBufferConfiguration();
testConfiguration.setPath("target/FilePersistIT.txt");
@@ -117,9 +116,4 @@ public class FileBufferPersistIT {
}
- @After
- public void shutdownTest() {
-
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java b/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java
index 391e445..677aaf4 100644
--- a/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java
+++ b/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java
@@ -29,6 +29,8 @@ import org.junit.Test;
import java.io.File;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests @link:{ org.apache.streams.filebuffer.FileBufferWriter }
* Tests @link:{ org.apache.streams.filebuffer.FileBufferReader }
@@ -68,7 +70,7 @@ public class TestFileBufferPersist {
testPersistReader.cleanUp();
- assert(testResult.size() == 1);
+ assertEquals(1, testResult.size());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java b/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
index db0acb5..bf7d80e 100644
--- a/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
+++ b/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
@@ -32,10 +32,10 @@ import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.InputStream;
@@ -57,7 +57,7 @@ public class MongoPersistIT {
private int count = 0;
- @Before
+ @BeforeClass
public void setup() throws Exception {
Config reference = ConfigFactory.load();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java
index 3309bf9..d1ca09a 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java
@@ -27,10 +27,10 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
-import org.junit.Assert;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
import java.io.InputStream;
import java.nio.charset.Charset;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java
index e31df25..7cdb54d 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java
@@ -25,10 +25,10 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
-import org.junit.Assert;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
import java.io.InputStream;
import java.nio.charset.Charset;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java
index ebfc693..a9877d8 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java
@@ -27,71 +27,71 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
-import org.junit.Assert;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
import java.io.InputStream;
import java.nio.charset.Charset;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
/**
* Tests serialization of Facebook Post inputs
*/
public class FacebookPostSerDeIT {
- private final static Logger LOGGER = LoggerFactory.getLogger(FacebookPostSerDeIT.class);
- private ObjectMapper mapper = StreamsJacksonMapper.getInstance();
+ private final static Logger LOGGER = LoggerFactory.getLogger(FacebookPostSerDeIT.class);
+ private ObjectMapper mapper = StreamsJacksonMapper.getInstance();
- @Test
- public void Tests()
- {
- mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, Boolean.TRUE);
- mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, Boolean.TRUE);
- mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE);
+ @Test
+ public void Tests()
+ {
+ mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, Boolean.TRUE);
+ mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, Boolean.TRUE);
+ mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE);
- InputStream is = FacebookPostSerDeIT.class.getResourceAsStream("/testpost.json");
- is = new BoundedInputStream(is, 10000);
- String json;
+ InputStream is = FacebookPostSerDeIT.class.getResourceAsStream("/testpost.json");
+ is = new BoundedInputStream(is, 10000);
+ String json;
- try {
- json = String.join(" ", IOUtils.readLines(is, Charset.defaultCharset()));
- LOGGER.debug(json);
+ try {
+ json = String.join(" ", IOUtils.readLines(is, Charset.defaultCharset()));
+ LOGGER.debug(json);
- Post ser = mapper.readValue(json, Post.class);
+ Post ser = mapper.readValue(json, Post.class);
- String de = mapper.writeValueAsString(ser);
+ String de = mapper.writeValueAsString(ser);
- LOGGER.debug(de);
+ LOGGER.debug(de);
- Post serde = mapper.readValue(de, Post.class);
+ Post serde = mapper.readValue(de, Post.class);
- assertEquals(ser, serde);
+ assertEquals(ser, serde);
- LOGGER.debug(mapper.writeValueAsString(serde));
+ LOGGER.debug(mapper.writeValueAsString(serde));
- Activity activity = new Activity();
- FacebookActivityUtil.updateActivity(ser, activity);
+ Activity activity = new Activity();
+ FacebookActivityUtil.updateActivity(ser, activity);
- assertNotNull(activity);
- assertNotNull(activity.getActor().getId());
- assertNotNull(activity.getActor().getDisplayName());
- assertNotNull(activity.getId());
- assert(activity.getVerb().equals("post"));
- assertNotNull(activity.getObject());
- assertNotNull(activity.getUpdated());
- assertNotNull(activity.getPublished());
- assertEquals(activity.getProvider().getId(), "id:providers:facebook");
- assertEquals(activity.getProvider().getDisplayName(), "Facebook");
- assertEquals(activity.getLinks().size(), 1);
- assertNotNull(activity.getAdditionalProperties().get("facebook"));
+ assertNotNull(activity);
+ assertNotNull(activity.getActor().getId());
+ assertNotNull(activity.getActor().getDisplayName());
+ assertNotNull(activity.getId());
+ assert(activity.getVerb().equals("post"));
+ assertNotNull(activity.getObject());
+ assertNotNull(activity.getUpdated());
+ assertNotNull(activity.getPublished());
+ assertEquals(activity.getProvider().getId(), "id:providers:facebook");
+ assertEquals(activity.getProvider().getDisplayName(), "Facebook");
+ assertEquals(activity.getLinks().size(), 1);
+ assertNotNull(activity.getAdditionalProperties().get("facebook"));
- } catch( Exception e ) {
- LOGGER.error("Exception: ", e);
- Assert.fail();
- }
+ } catch( Exception e ) {
+ LOGGER.error("Exception: ", e);
+ Assert.fail();
}
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java
index b280eae..1abdb3f 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java
@@ -21,14 +21,17 @@ package org.apache.streams.facebook.test.providers.page;
import org.apache.streams.facebook.provider.page.FacebookPageProvider;
import com.google.common.collect.Lists;
-import org.junit.Test;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.FileReader;
import java.io.LineNumberReader;
+import static org.testng.Assert.assertTrue;
+
public class FacebookPageProviderIT {
private static final Logger LOGGER = LoggerFactory.getLogger(FacebookPageProviderIT.class);
@@ -56,16 +59,16 @@ public class FacebookPageProviderIT {
FacebookPageProvider.main(Lists.newArrayList(configfile, outfile).toArray(new String[2]));
File out = new File(outfile);
- assert (out.exists());
- assert (out.canRead());
- assert (out.isFile());
+ assertTrue (out.exists());
+ assertTrue (out.canRead());
+ assertTrue (out.isFile());
FileReader outReader = new FileReader(out);
LineNumberReader outCounter = new LineNumberReader(outReader);
while(outCounter.readLine() != null) {}
- assert (outCounter.getLineNumber() >= 1);
+ assertTrue (outCounter.getLineNumber() >= 1);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/pagefeed/FacebookPageFeedProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/pagefeed/FacebookPageFeedProviderIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/pagefeed/FacebookPageFeedProviderIT.java
index 0aa4ad3..2c22d46 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/pagefeed/FacebookPageFeedProviderIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/pagefeed/FacebookPageFeedProviderIT.java
@@ -20,14 +20,16 @@ package org.apache.streams.facebook.test.providers.pagefeed;
import org.apache.streams.facebook.provider.pagefeed.FacebookPageFeedProvider;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.FileReader;
import java.io.LineNumberReader;
+import static org.testng.Assert.assertTrue;
+
public class FacebookPageFeedProviderIT {
private static final Logger LOGGER = LoggerFactory.getLogger(FacebookPageFeedProviderIT.class);
@@ -53,16 +55,16 @@ public class FacebookPageFeedProviderIT {
testThread.join(60000);
File out = new File(outfile);
- assert (out.exists());
- assert (out.canRead());
- assert (out.isFile());
+ assertTrue (out.exists());
+ assertTrue (out.canRead());
+ assertTrue (out.isFile());
FileReader outReader = new FileReader(out);
LineNumberReader outCounter = new LineNumberReader(outReader);
while(outCounter.readLine() != null) {}
- assert (outCounter.getLineNumber() >= 1000);
+ assertTrue (outCounter.getLineNumber() >= 1000);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java
index c3e026f..780ab87 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java
@@ -30,9 +30,11 @@ import com.google.api.services.plus.model.Comment;
import com.google.gplus.serializer.util.GPlusCommentDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
import org.apache.commons.lang.StringUtils;
-import org.junit.Before;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -40,9 +42,9 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
/**
* Tests conversion of gplus inputs to Activity.
@@ -55,8 +57,8 @@ public class GooglePlusCommentSerDeIT {
/**
* setup.
*/
- @Before
- public void setup() {
+ @BeforeClass
+ public void setupTestCommentObjects() {
objectMapper = StreamsJacksonMapper.getInstance();
SimpleModule simpleModule = new SimpleModule();
simpleModule.addDeserializer(Comment.class, new GPlusCommentDeserializer());
@@ -66,7 +68,7 @@ public class GooglePlusCommentSerDeIT {
googlePlusActivityUtil = new GooglePlusActivityUtil();
}
- @org.junit.Test
+ @Test
public void testCommentObjects() {
InputStream is = GooglePlusCommentSerDeIT.class.getResourceAsStream("/google_plus_comments_jsons.txt");
InputStreamReader isr = new InputStreamReader(is);
@@ -110,7 +112,7 @@ public class GooglePlusCommentSerDeIT {
}
}
- @org.junit.Test
+ @Test
public void testEmptyComments() {
Activity activity = new Activity();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
index ab5f8cb..6bb2f57 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
@@ -31,17 +31,18 @@ import com.google.api.services.plus.model.Person;
import com.google.gplus.serializer.util.GPlusPersonDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
import org.apache.commons.lang.StringUtils;
-import org.junit.Before;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
/**
* Tests conversion of gplus inputs to Activity.
@@ -54,7 +55,7 @@ public class GooglePlusPersonSerDeIT {
/**
* setup.
*/
- @Before
+ @BeforeClass
public void setup() {
objectMapper = StreamsJacksonMapper.getInstance();
SimpleModule simpleModule = new SimpleModule();
@@ -84,7 +85,7 @@ public class GooglePlusPersonSerDeIT {
LOGGER.info("activity: {}", activity);
assertNotNull(activity);
- assert (activity.getId().contains("id:googleplus:update"));
+ assertTrue (activity.getId().contains("id:googleplus:update"));
assertEquals(activity.getVerb(), "update");
Provider provider = activity.getProvider();
@@ -93,7 +94,7 @@ public class GooglePlusPersonSerDeIT {
ActivityObject actor = activity.getActor();
assertNotNull(actor.getImage());
- assert (actor.getId().contains("id:googleplus:"));
+ assertTrue (actor.getId().contains("id:googleplus:"));
assertNotNull(actor.getUrl());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
index 7b1d71d..b75021c 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
@@ -31,18 +31,18 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.gplus.serializer.util.GPlusActivityDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
import org.apache.commons.lang.StringUtils;
-import org.junit.Before;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
/**
* Tests conversion of gplus inputs to Activity.
@@ -54,7 +54,7 @@ public class GooglePlusActivitySerDeIT {
/**
* setup.
*/
- @Before
+ @BeforeClass
public void setup() {
objectMapper = StreamsJacksonMapper.getInstance();
SimpleModule simpleModule = new SimpleModule();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java
index 664cd85..e92aa7e 100644
--- a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java
+++ b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java
@@ -27,10 +27,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import org.apache.commons.lang.StringUtils;
import org.jinstagram.entity.users.feed.MediaFeedData;
-import org.junit.Assert;
-import org.junit.Test;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramUserInfoDataConverterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramUserInfoDataConverterIT.java b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramUserInfoDataConverterIT.java
index 61035d8..b46e2f9 100644
--- a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramUserInfoDataConverterIT.java
+++ b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramUserInfoDataConverterIT.java
@@ -27,10 +27,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import org.apache.commons.lang.StringUtils;
import org.jinstagram.entity.users.basicinfo.UserInfoData;
-import org.junit.Assert;
-import org.junit.Test;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramRecentMediaProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramRecentMediaProviderIT.java b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramRecentMediaProviderIT.java
index c5a4f77..660469b 100644
--- a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramRecentMediaProviderIT.java
+++ b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramRecentMediaProviderIT.java
@@ -20,9 +20,9 @@ package org.apache.streams.instagram.test.providers;
import org.apache.streams.instagram.provider.recentmedia.InstagramRecentMediaProvider;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.FileReader;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramUserInfoProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramUserInfoProviderIT.java b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramUserInfoProviderIT.java
index 866b254..f8f0ce3 100644
--- a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramUserInfoProviderIT.java
+++ b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/providers/InstagramUserInfoProviderIT.java
@@ -20,14 +20,16 @@ package org.apache.streams.instagram.test.providers;
import org.apache.streams.instagram.provider.userinfo.InstagramUserInfoProvider;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.FileReader;
import java.io.LineNumberReader;
+import static org.testng.Assert.assertTrue;
+
/**
* Created by sblackmon on 10/12/16.
*/
@@ -56,16 +58,16 @@ public class InstagramUserInfoProviderIT {
testThread.join(60000);
File out = new File(outfile);
- assert (out.exists());
- assert (out.canRead());
- assert (out.isFile());
+ assertTrue (out.exists());
+ assertTrue (out.canRead());
+ assertTrue (out.isFile());
FileReader outReader = new FileReader(out);
LineNumberReader outCounter = new LineNumberReader(outReader);
while (outCounter.readLine() != null) {}
- assert (outCounter.getLineNumber() >= 1);
+ assertTrue (outCounter.getLineNumber() >= 1);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverJsonActivitySerializerIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverJsonActivitySerializerIT.java b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverJsonActivitySerializerIT.java
index b7ae076..40a46c2 100644
--- a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverJsonActivitySerializerIT.java
+++ b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverJsonActivitySerializerIT.java
@@ -27,8 +27,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.InputStream;
import java.io.StringWriter;
@@ -47,7 +47,7 @@ public class MoreoverJsonActivitySerializerIT {
* Before.
* @throws Exception Exception
*/
- @Before
+ @BeforeClass
public void setup() throws Exception {
StringWriter writer = new StringWriter();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java
index 0422f7f..4c69c4f 100644
--- a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java
+++ b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java
@@ -24,8 +24,8 @@ import org.apache.streams.moreover.MoreoverXmlActivitySerializer;
import org.apache.streams.pojo.json.Activity;
import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.io.IOException;
import java.io.InputStream;
@@ -41,7 +41,7 @@ public class MoreoverXmlActivitySerializerIT {
ActivitySerializer serializer;
private String xml;
- @Before
+ @BeforeClass
public void setup() throws IOException {
serializer = new MoreoverXmlActivitySerializer();
xml = loadXml();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java
index f5b61bf..4d00075 100644
--- a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java
+++ b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java
@@ -23,10 +23,9 @@ import org.apache.streams.moreover.MoreoverProvider;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
-import org.junit.Ignore;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.FileReader;
@@ -34,19 +33,19 @@ import java.io.LineNumberReader;
/**
* Integration test for MoreoverProviderIT.
+ * @Ignore this is ignored because the project doesn't have credentials to test it with during CI
*/
-@Ignore("this is ignored because the project doesn't have credentials to test it with during CI")
public class MoreoverProviderIT {
private static final Logger LOGGER = LoggerFactory.getLogger(MoreoverProviderIT.class);
private ObjectMapper mapper = StreamsJacksonMapper.getInstance();
- @Test
- public void testRssStreamProvider() throws Exception {
+ @Test(enabled = false)
+ public void testMoreoverProvide() throws Exception {
- String configfile = "./target/test-classes/RssStreamProviderIT.conf";
- String outfile = "./target/test-classes/RssStreamProviderIT.stdout.txt";
+ String configfile = "./target/test-classes/MoreoverProviderIT.conf";
+ String outfile = "./target/test-classes/MoreoverProviderIT.stdout.txt";
MoreoverProvider.main(Lists.newArrayList(configfile, outfile).toArray(new String[2]));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTaskIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTaskIT.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTaskIT.java
index 6722f3c..87ff8fc 100644
--- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTaskIT.java
+++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTaskIT.java
@@ -22,16 +22,16 @@ import org.apache.streams.core.StreamsDatum;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
import java.net.URL;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
/**
* Unit tests for {@link org.apache.streams.rss.provider.RssStreamProviderTask}
@@ -41,7 +41,7 @@ public class RssStreamProviderTaskIT {
/**
* clearPreviouslySeen.
*/
- @Before
+ @BeforeClass
public void clearPreviouslySeen() {
//some test runners run in parallel so needs to be synchronized
//if tests are run in parallel test will have undetermined results.
@@ -60,12 +60,12 @@ public class RssStreamProviderTaskIT {
BlockingQueue<StreamsDatum> queue = new LinkedBlockingQueue<>();
RssStreamProviderTask task = new RssStreamProviderTask(queue, "fake url");
Set<String> batch = task.queueFeedEntries(new URL("resource:///test_rss_xml/economist1.xml"));
- assertEquals("Expected batch size to be the same as amount of queued datums", batch.size(), queue.size());
+ assertEquals(batch.size(), queue.size(), "Expected batch size to be the same as amount of queued datums");
RssStreamProviderTask.PREVIOUSLY_SEEN.put("fake url", batch);
//Test that it will out previously seen articles
queue.clear();
batch = task.queueFeedEntries(new URL("resource:///test_rss_xml/economist1.xml"));
- assertEquals("Expected batch size to be the same as amount of queued datums", batch.size(), queue.size());
+ assertEquals(batch.size(), queue.size(), "Expected batch size to be the same as amount of queued datums");
}
/**
@@ -78,20 +78,20 @@ public class RssStreamProviderTaskIT {
BlockingQueue<StreamsDatum> queue = new LinkedBlockingQueue<>();
RssStreamProviderTask task = new RssStreamProviderTask(queue, "fake url", new DateTime().minusYears(5), 10000, true);
Set<String> batch = task.queueFeedEntries(new URL("resource:///test_rss_xml/economist1.xml"));
- assertEquals("Expected batch size to be the same as amount of queued datums", batch.size(), queue.size());
+ assertEquals(batch.size(), queue.size(), "Expected batch size to be the same as amount of queued datums");
RssStreamProviderTask.PREVIOUSLY_SEEN.put("fake url", batch);
//Test that it will not out previously seen articles
queue.clear();
batch = task.queueFeedEntries(new URL("resource:///test_rss_xml/economist1.xml"));
- assertEquals("Expected queue size to be 0", 0, queue.size());
- assertEquals("Expected batch size to be 20", 20, batch.size());
+ assertEquals(0, queue.size(), "Expected queue size to be 0");
+ assertEquals(20, batch.size(), "Expected batch size to be 20");
RssStreamProviderTask.PREVIOUSLY_SEEN.put("fake url", batch);
//Test that not seen urls aren't blocked.
queue.clear();
batch = task.queueFeedEntries(new URL("resource:///test_rss_xml/economist2.xml"));
assertEquals(batch.size(), queue.size());
- assertEquals("Expected queue size to be 25", 25, queue.size());
- assertEquals("Expected batch size to be 25", 25, batch.size());
+ assertEquals(25, queue.size(), "Expected queue size to be 25");
+ assertEquals(25, batch.size(), "Expected batch size to be 25");
}
/**
@@ -142,8 +142,8 @@ public class RssStreamProviderTaskIT {
batch = task.queueFeedEntries(new URL("resource:///test_rss_xml/economist2.xml"));
assertTrue( queue.size() < batch.size());
- assertEquals("Expected queue size to be 0", 3, queue.size());
- assertEquals("Expected batch size to be 0", 25, batch.size());
+ assertEquals(3, queue.size(), "Expected queue size to be 0");
+ assertEquals(25, batch.size(), "Expected batch size to be 0");
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java
index c3f10f9..c9ded9d 100644
--- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java
+++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java
@@ -27,10 +27,10 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang.StringUtils;
-import org.junit.Assert;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -78,7 +78,7 @@ public class RssStreamProviderIT {
Assert.fail();
}
- Assert.assertThat(configuration.getFeeds().size(), greaterThan(70));
+ org.junit.Assert.assertThat(configuration.getFeeds().size(), greaterThan(70));
OutputStream os = new FileOutputStream(configfile);
OutputStreamWriter osw = new OutputStreamWriter(os);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-sysomos/src/test/java/com/sysomos/test/SysomosJsonSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/test/java/com/sysomos/test/SysomosJsonSerDeIT.java b/streams-contrib/streams-provider-sysomos/src/test/java/com/sysomos/test/SysomosJsonSerDeIT.java
index 7efffcc..ab1c2a4 100644
--- a/streams-contrib/streams-provider-sysomos/src/test/java/com/sysomos/test/SysomosJsonSerDeIT.java
+++ b/streams-contrib/streams-provider-sysomos/src/test/java/com/sysomos/test/SysomosJsonSerDeIT.java
@@ -21,10 +21,10 @@ package com.sysomos.test;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sysomos.json.Sysomos;
-import org.junit.Assert;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
import java.io.BufferedReader;
import java.io.InputStream;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/899bb84f/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java b/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java
index a088726..e5b5400 100644
--- a/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java
+++ b/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java
@@ -23,10 +23,9 @@ import org.apache.streams.sysomos.provider.SysomosProvider;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
-import org.junit.Ignore;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.FileReader;
@@ -34,19 +33,20 @@ import java.io.LineNumberReader;
/**
* Integration test for SysomosProviderIT.
+ *
+ * @Ignore this is ignored because the project doesn't have credentials to test it with during CI
*/
-@Ignore("this is ignored because the project doesn't have credentials to test it with during CI")
public class SysomosProviderIT {
private static final Logger LOGGER = LoggerFactory.getLogger(SysomosProviderIT.class);
private ObjectMapper mapper = StreamsJacksonMapper.getInstance();
- @Test
- public void testRssStreamProvider() throws Exception {
+ @Test(enabled = false)
+ public void testSysomosProvider() throws Exception {
- String configfile = "./target/test-classes/RssStreamProviderIT.conf";
- String outfile = "./target/test-classes/RssStreamProviderIT.stdout.txt";
+ String configfile = "./target/test-classes/SysomosProviderIT.conf";
+ String outfile = "./target/test-classes/SysomosProviderIT.stdout.txt";
SysomosProvider.main(Lists.newArrayList(configfile, outfile).toArray(new String[2]));