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 2014/03/22 00:20:34 UTC
[56/71] [abbrv] git commit: Fixed long-running test
Fixed long-running test
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3a192885
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3a192885
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3a192885
Branch: refs/heads/master
Commit: 3a192885a7dc13c07dabb915a7223ca748fc1e59
Parents: f916512
Author: sblackmon <sb...@w2odigital.com>
Authored: Wed Mar 19 14:00:19 2014 -0500
Committer: sblackmon <sb...@w2odigital.com>
Committed: Wed Mar 19 14:00:19 2014 -0500
----------------------------------------------------------------------
provision/provision.iml | 4 ++--
.../streams-components-test/streams-components-test.iml | 12 +++++-------
.../streams/core/builders/LocalStreamBuilder.java | 2 +-
.../streams/core/builders/LocalStreamBuilderTest.java | 10 +++++-----
4 files changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3a192885/provision/provision.iml
----------------------------------------------------------------------
diff --git a/provision/provision.iml b/provision/provision.iml
index fb87ba5..b1475a5 100644
--- a/provision/provision.iml
+++ b/provision/provision.iml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MAVEN_REPOSITORY$/org/apache/streams/streams-master/0.2-incubating-SNAPSHOT/target/classes" />
+ <output-test url="file://$MAVEN_REPOSITORY$/org/apache/streams/streams-master/0.2-incubating-SNAPSHOT/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3a192885/streams-contrib/streams-components-test/streams-components-test.iml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-components-test/streams-components-test.iml b/streams-contrib/streams-components-test/streams-components-test.iml
index 0fcef34..7bc994e 100644
--- a/streams-contrib/streams-components-test/streams-components-test.iml
+++ b/streams-contrib/streams-components-test/streams-components-test.iml
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MAVEN_REPOSITORY$/org/apache/streams/streams-master/0.2-incubating-SNAPSHOT/target/classes" />
+ <output-test url="file://$MAVEN_REPOSITORY$/org/apache/streams/streams-master/0.2-incubating-SNAPSHOT/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="streams-core (3)" />
+ <orderEntry type="module" module-name="streams-core" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.2" level="project" />
- <orderEntry type="module" module-name="streams-util (3)" />
+ <orderEntry type="module" module-name="streams-util" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.0.9" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.0.9" level="project" />
- <orderEntry type="module" module-name="streams-pojo (3)" />
+ <orderEntry type="module" module-name="streams-pojo" />
<orderEntry type="library" name="Maven: org.jsonschema2pojo:jsonschema2pojo-core:0.4.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.2.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.2.1" level="project" />
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3a192885/streams-core/src/main/java/org/apache/streams/core/builders/LocalStreamBuilder.java
----------------------------------------------------------------------
diff --git a/streams-core/src/main/java/org/apache/streams/core/builders/LocalStreamBuilder.java b/streams-core/src/main/java/org/apache/streams/core/builders/LocalStreamBuilder.java
index 7744be7..3e99827 100644
--- a/streams-core/src/main/java/org/apache/streams/core/builders/LocalStreamBuilder.java
+++ b/streams-core/src/main/java/org/apache/streams/core/builders/LocalStreamBuilder.java
@@ -152,7 +152,7 @@ public class LocalStreamBuilder implements StreamBuilder{
isRunning = isRunning || task.isRunning();
}
if(isRunning) {
- Thread.sleep(100000);
+ Thread.sleep(3000);
}
}
this.executor.shutdown();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3a192885/streams-core/src/test/java/org/apache/streams/core/builders/LocalStreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/streams-core/src/test/java/org/apache/streams/core/builders/LocalStreamBuilderTest.java b/streams-core/src/test/java/org/apache/streams/core/builders/LocalStreamBuilderTest.java
index cc10938..9177459 100644
--- a/streams-core/src/test/java/org/apache/streams/core/builders/LocalStreamBuilderTest.java
+++ b/streams-core/src/test/java/org/apache/streams/core/builders/LocalStreamBuilderTest.java
@@ -75,7 +75,7 @@ public class LocalStreamBuilderTest {
@Test
public void testBasicLinearStream2() {
- int numDatums = 1000;
+ int numDatums = 100;
StreamBuilder builder = new LocalStreamBuilder();
PassthroughDatumCounterProcessor processor = new PassthroughDatumCounterProcessor();
SystemOutWriter writer = new SystemOutWriter();
@@ -94,8 +94,8 @@ public class LocalStreamBuilderTest {
@Test
public void testParallelLinearStream1() {
- int numDatums = 10000;
- int parallelHint = 40;
+ int numDatums = 1000;
+ int parallelHint = 20;
PassthroughDatumCounterProcessor.sawData = new HashSet<Integer>();
PassthroughDatumCounterProcessor.claimedNumber = new HashSet<Integer>();
StreamBuilder builder = new LocalStreamBuilder();
@@ -119,7 +119,7 @@ public class LocalStreamBuilderTest {
@Test
public void testBasicMergeStream() {
int numDatums1 = 1;
- int numDatums2 = 1000;
+ int numDatums2 = 100;
PassthroughDatumCounterProcessor processor1 = new PassthroughDatumCounterProcessor();
PassthroughDatumCounterProcessor processor2 = new PassthroughDatumCounterProcessor();
SystemOutWriter writer = new SystemOutWriter();
@@ -141,7 +141,7 @@ public class LocalStreamBuilderTest {
@Test
public void testBasicBranch() {
- int numDatums = 1000;
+ int numDatums = 100;
StreamBuilder builder = new LocalStreamBuilder();
builder.newReadCurrentStream("prov1", new NumericMessageProvider(numDatums))
.addStreamsProcessor("proc1", new PassthroughDatumCounterProcessor(), 1, "prov1")