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 2015/07/01 21:05:26 UTC
[4/4] incubator-streams git commit: Merge branch 'STREAMS-332'
Merge branch 'STREAMS-332'
* STREAMS-332:
changed tests without resources to ITs ITs do not run by default, must run verify -skipTests=false added retrieval and expansion of zip files containing test resources location of zip files can be overridden with -testDataBaseURL
Conflicts:
streams-contrib/streams-provider-datasift/pom.xml
streams-contrib/streams-provider-google/google-gplus/pom.xml
streams-contrib/streams-provider-instagram/pom.xml
streams-contrib/streams-provider-moreover/pom.xml
streams-contrib/streams-provider-sysomos/pom.xml
streams-contrib/streams-provider-twitter/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d982a877
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d982a877
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d982a877
Branch: refs/heads/master
Commit: d982a877b99fa9d1f5a0764423923d2ad5a068cd
Parents: bcf3d31 3f45b23
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Wed Jul 1 14:05:17 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Wed Jul 1 14:05:17 2015 -0500
----------------------------------------------------------------------
.../streams-provider-datasift/pom.xml | 35 +++++
.../DatasiftActivitySerializerIT.java | 110 ++++++++++++++
.../DatasiftActivitySerializerTest.java | 111 --------------
.../DatasiftInstagramActivitySerializerIT.java | 57 +++++++
...DatasiftInstagramActivitySerializerTest.java | 58 -------
...DatasiftInteractionActivitySerializerIT.java | 62 ++++++++
...tasiftInteractionActivitySerializerTest.java | 63 --------
.../DatasiftTwitterActivitySerializerIT.java | 57 +++++++
.../DatasiftTwitterActivitySerializerTest.java | 58 -------
.../streams-provider-facebook/pom.xml | 32 ++++
.../test/FacebookActivityActorSerDeIT.java | 67 +++++++++
.../test/FacebookActivityActorSerDeTest.java | 68 ---------
.../facebook/test/FacebookActivitySerDeIT.java | 75 ++++++++++
.../test/FacebookActivitySerDeTest.java | 76 ----------
.../facebook/test/FacebookPageSerDeIT.java | 78 ++++++++++
.../facebook/test/FacebookPageSerDeTest.java | 79 ----------
.../facebook/test/FacebookPostSerDeIT.java | 99 ++++++++++++
.../facebook/test/FacebookPostSerDeTest.java | 100 -------------
.../google-gplus/pom.xml | 34 ++++-
.../google/gplus/GooglePlusCommentSerDeIT.java | 117 +++++++++++++++
.../gplus/GooglePlusCommentSerDeTest.java | 118 ---------------
.../google/gplus/GooglePlusPersonSerDeIT.java | 101 +++++++++++++
.../google/gplus/GooglePlusPersonSerDeTest.java | 102 -------------
.../processor/GooglePlusActivitySerDeIT.java | 116 ++++++++++++++
.../processor/GooglePlusActivitySerDeTest.java | 117 ---------------
.../streams-provider-instagram/pom.xml | 34 ++++-
.../twitter/test/InstagramActivitySerDeIT.java | 134 +++++++++++++++++
.../test/InstagramActivitySerDeTest.java | 135 -----------------
.../streams-provider-moreover/pom.xml | 34 ++++-
.../data/MoreoverJsonActivitySerializerIT.java | 79 ++++++++++
.../MoreoverJsonActivitySerializerTest.java | 69 ---------
.../data/MoreoverXmlActivitySerializerIT.java | 65 ++++++++
.../data/MoreoverXmlActivitySerializerTest.java | 66 --------
streams-contrib/streams-provider-rss/pom.xml | 32 ++++
.../rss/provider/RssStreamProviderTaskIT.java | 149 ++++++++++++++++++
.../rss/provider/RssStreamProviderTaskTest.java | 150 -------------------
.../rss/test/SyndEntryActivitySerializerIT.java | 123 +++++++++++++++
.../test/SyndEntryActivitySerizlizerTest.java | 124 ---------------
.../streams-provider-sysomos/pom.xml | 36 ++++-
.../com/sysomos/test/SysomosJsonSerDeIT.java | 69 +++++++++
.../com/sysomos/test/SysomosJsonSerDeTest.java | 70 ---------
.../com/sysomos/test/SysomosXmlSerDeIT.java | 100 +++++++++++++
.../com/sysomos/test/SysomosXmlSerDeTest.java | 101 -------------
.../streams-provider-twitter/pom.xml | 32 ++++
.../twitter/test/TwitterObjectMapperIT.java | 132 ++++++++++++++++
.../twitter/test/TwitterObjectMapperTest.java | 137 -----------------
46 files changed, 2054 insertions(+), 1807 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d982a877/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-datasift/pom.xml
index 4225995,0af5eb7..8cd8bed
--- a/streams-contrib/streams-provider-datasift/pom.xml
+++ b/streams-contrib/streams-provider-datasift/pom.xml
@@@ -29,6 -29,18 +29,12 @@@
<description>Datasift Provider</description>
+ <properties>
+ <skipITs>true</skipITs>
+ <testDataBaseURl>http://streams.peoplepattern.com.s3.amazonaws.com/test-data/</testDataBaseURl>
+ </properties>
+
- <repositories>
- <repository>
- <id>boundary-site</id>
- <url>http://maven.boundary.com/artifactory/repo</url>
- </repository>
- </repositories>
+
<dependencies>
<dependency>
<groupId>com.typesafe</groupId>
@@@ -192,9 -187,32 +198,38 @@@
</executions>
</plugin>
<plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>download-it-data</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipITs}</skipTests>
+ </configuration>
+ </plugin>
++ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
++
</plugins>
++
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d982a877/streams-contrib/streams-provider-facebook/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d982a877/streams-contrib/streams-provider-google/google-gplus/pom.xml
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-google/google-gplus/pom.xml
index e0f21dd,ff8f392..d80cfd0
--- a/streams-contrib/streams-provider-google/google-gplus/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gplus/pom.xml
@@@ -200,9 -195,32 +205,36 @@@
</executions>
</plugin>
<plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>download-it-data</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipITs}</skipTests>
+ </configuration>
</plugin>
++<plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++</plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d982a877/streams-contrib/streams-provider-instagram/pom.xml
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-instagram/pom.xml
index d653900,a7c5ed7..7503514
--- a/streams-contrib/streams-provider-instagram/pom.xml
+++ b/streams-contrib/streams-provider-instagram/pom.xml
@@@ -162,9 -167,32 +167,36 @@@
</executions>
</plugin>
<plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>download-it-data</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipITs}</skipTests>
+ </configuration>
</plugin>
++<plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++</plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d982a877/streams-contrib/streams-provider-moreover/pom.xml
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-moreover/pom.xml
index 8281c57,868cfc8..785b624
--- a/streams-contrib/streams-provider-moreover/pom.xml
+++ b/streams-contrib/streams-provider-moreover/pom.xml
@@@ -176,9 -181,32 +181,36 @@@
</executions>
</plugin>
<plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>download-it-data</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipITs}</skipTests>
+ </configuration>
</plugin>
++<plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++</plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d982a877/streams-contrib/streams-provider-rss/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d982a877/streams-contrib/streams-provider-sysomos/pom.xml
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-sysomos/pom.xml
index 785b6bb,5ce4561..9531150
--- a/streams-contrib/streams-provider-sysomos/pom.xml
+++ b/streams-contrib/streams-provider-sysomos/pom.xml
@@@ -167,9 -172,32 +172,36 @@@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>download-it-data</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
+ </configuration>
+ </execution>
+ </executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipITs}</skipTests>
+ </configuration>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-resources-plugin</artifactId>
++ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d982a877/streams-contrib/streams-provider-twitter/pom.xml
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-twitter/pom.xml
index e3e1252,cbe50ec..c15ea27
--- a/streams-contrib/streams-provider-twitter/pom.xml
+++ b/streams-contrib/streams-provider-twitter/pom.xml
@@@ -176,8 -182,31 +181,35 @@@
</executions>
</plugin>
<plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>download-it-data</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>${testDataBaseURl}/${artifactId}.zip</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <!--<md5>df65b5642f33676313ebe4d5b69a3fff</md5>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipITs}</skipTests>
+ </configuration>
++ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
</plugin>
</plugins>
</build>