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/10/19 18:39:09 UTC
[1/2] incubator-streams-examples git commit: fix last 2 tests
Repository: incubator-streams-examples
Updated Branches:
refs/heads/master 717e250c6 -> 6fa84b721
fix last 2 tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/commit/29f2ea5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/29f2ea5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/29f2ea5f
Branch: refs/heads/master
Commit: 29f2ea5fb8371bbbdc03f9119459601a797194f4
Parents: 717e250
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Wed Oct 19 13:36:17 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Wed Oct 19 13:36:17 2016 -0500
----------------------------------------------------------------------
.../org/apache/streams/example/test/TwitterFollowNeo4jIT.java | 7 +------
.../src/test/resources/TwitterHistoryElasticsearchIT.conf | 2 +-
.../example/test/TwitterUserstreamElasticsearchIT.java | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/29f2ea5f/local/twitter-follow-neo4j/src/test/java/org/apache/streams/example/test/TwitterFollowNeo4jIT.java
----------------------------------------------------------------------
diff --git a/local/twitter-follow-neo4j/src/test/java/org/apache/streams/example/test/TwitterFollowNeo4jIT.java b/local/twitter-follow-neo4j/src/test/java/org/apache/streams/example/test/TwitterFollowNeo4jIT.java
index 2813b08..0eed291 100644
--- a/local/twitter-follow-neo4j/src/test/java/org/apache/streams/example/test/TwitterFollowNeo4jIT.java
+++ b/local/twitter-follow-neo4j/src/test/java/org/apache/streams/example/test/TwitterFollowNeo4jIT.java
@@ -57,12 +57,7 @@ public class TwitterFollowNeo4jIT {
File conf_file = new File("target/test-classes/TwitterFollowGraphIT.conf");
assert(conf_file.exists());
Config testResourceConfig = ConfigFactory.parseFileAnySyntax(conf_file, ConfigParseOptions.defaults().setAllowMissing(false));
- Properties graph_properties = new Properties();
- InputStream graph_stream = new FileInputStream("neo4j.properties");
- graph_properties.load(graph_stream);
- Config graphProps = ConfigFactory.parseProperties(graph_properties);
- Config typesafe = testResourceConfig.withFallback(graphProps).withFallback(reference).resolve();
- StreamsConfiguration streams = StreamsConfigurator.detectConfiguration(typesafe);
+ Config typesafe = testResourceConfig.withFallback(reference).resolve();
testConfiguration = new ComponentConfigurator<>(TwitterFollowNeo4jConfiguration.class).detectConfiguration(typesafe);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/29f2ea5f/local/twitter-history-elasticsearch/src/test/resources/TwitterHistoryElasticsearchIT.conf
----------------------------------------------------------------------
diff --git a/local/twitter-history-elasticsearch/src/test/resources/TwitterHistoryElasticsearchIT.conf b/local/twitter-history-elasticsearch/src/test/resources/TwitterHistoryElasticsearchIT.conf
index 9035ca3..1a05e32 100644
--- a/local/twitter-history-elasticsearch/src/test/resources/TwitterHistoryElasticsearchIT.conf
+++ b/local/twitter-history-elasticsearch/src/test/resources/TwitterHistoryElasticsearchIT.conf
@@ -23,7 +23,7 @@ elasticsearch {
hosts += ${es.tcp.host}
port = ${es.tcp.port}
clusterName = elasticsearch
- index = twitter_userstream_elasticsearch_it
+ index = twitter_history_elasticsearch_it
type = activity
forceUseConfig = true
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/29f2ea5f/local/twitter-userstream-elasticsearch/src/test/java/org/apache/streams/example/test/TwitterUserstreamElasticsearchIT.java
----------------------------------------------------------------------
diff --git a/local/twitter-userstream-elasticsearch/src/test/java/org/apache/streams/example/test/TwitterUserstreamElasticsearchIT.java b/local/twitter-userstream-elasticsearch/src/test/java/org/apache/streams/example/test/TwitterUserstreamElasticsearchIT.java
index e2b5509..e4103e4 100644
--- a/local/twitter-userstream-elasticsearch/src/test/java/org/apache/streams/example/test/TwitterUserstreamElasticsearchIT.java
+++ b/local/twitter-userstream-elasticsearch/src/test/java/org/apache/streams/example/test/TwitterUserstreamElasticsearchIT.java
@@ -78,7 +78,7 @@ public class TwitterUserstreamElasticsearchIT {
}
@Test
- public void testReindex() throws Exception {
+ public void testUserstreamElasticsearch() throws Exception {
TwitterUserstreamElasticsearch stream = new TwitterUserstreamElasticsearch(testConfiguration);
[2/2] incubator-streams-examples git commit: git ignore files we don’t want checked in
Posted by sb...@apache.org.
git ignore files we don\u2019t want checked in
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/commit/6fa84b72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/6fa84b72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/6fa84b72
Branch: refs/heads/master
Commit: 6fa84b7218cb93744cdf9d1634e30f032e0f1f1f
Parents: 29f2ea5
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Wed Oct 19 13:38:37 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Wed Oct 19 13:38:37 2016 -0500
----------------------------------------------------------------------
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/6fa84b72/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 1b41e46..4ff38fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,11 @@ streams-master-pom/
# Compile directores and files #
+dist/
target/
overlays/
dependency-reduced-pom.xml
+**/src/site/resources/
# IDE directories/files #
/.idea
@@ -14,6 +16,8 @@ dependency-reduced-pom.xml
.settings/
.classpath
.project
+*.svg
+*.properties
# OS generated files #
.DS_Store