You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/05/26 12:33:11 UTC
[4/9] incubator-quarks git commit: rebase and fix ant build
rebase and fix ant build
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/e10447ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/e10447ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/e10447ce
Branch: refs/heads/master
Commit: e10447ce7fd5c4cb9bbf8187a1b21baf8c58ed75
Parents: a808a72
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed May 11 16:46:47 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed May 18 16:03:04 2016 -0400
----------------------------------------------------------------------
.../java/quarks/oplet/plumbing/StreamScope.java | 3 ++-
api/topology/build.xml | 1 +
.../java/quarks/topology/plumbing/StreamScope.java | 2 +-
.../java/quarks/test/topology/PlumbingTest.java | 17 ++++++++---------
4 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/e10447ce/api/oplet/src/main/java/quarks/oplet/plumbing/StreamScope.java
----------------------------------------------------------------------
diff --git a/api/oplet/src/main/java/quarks/oplet/plumbing/StreamScope.java b/api/oplet/src/main/java/quarks/oplet/plumbing/StreamScope.java
index fd88d55..af97a10 100644
--- a/api/oplet/src/main/java/quarks/oplet/plumbing/StreamScope.java
+++ b/api/oplet/src/main/java/quarks/oplet/plumbing/StreamScope.java
@@ -18,6 +18,7 @@ under the License.
*/
package quarks.oplet.plumbing;
+import quarks.function.Consumer;
import quarks.oplet.functional.Peek;
/**
@@ -36,7 +37,7 @@ public class StreamScope<T> extends Peek<T> {
* Create a new instance.
* @param streamScope the consumer function
*/
- public StreamScope(quarks.topology.plumbing.StreamScope<T> streamScope) {
+ public StreamScope(Consumer<T> streamScope) {
super(streamScope);
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/e10447ce/api/topology/build.xml
----------------------------------------------------------------------
diff --git a/api/topology/build.xml b/api/topology/build.xml
index 938a9c6..8e9456f 100644
--- a/api/topology/build.xml
+++ b/api/topology/build.xml
@@ -26,6 +26,7 @@
<path id="compile.classpath">
<pathelement location="${lib}/quarks.api.execution.jar"/>
<pathelement location="${lib}/quarks.api.graph.jar"/>
+ <pathelement location="${lib}/quarks.api.oplet.jar" />
<path refid="quarks.ext.classpath"/>
</path>
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/e10447ce/api/topology/src/main/java/quarks/topology/plumbing/StreamScope.java
----------------------------------------------------------------------
diff --git a/api/topology/src/main/java/quarks/topology/plumbing/StreamScope.java b/api/topology/src/main/java/quarks/topology/plumbing/StreamScope.java
index 4cf77f8..2252e2a 100644
--- a/api/topology/src/main/java/quarks/topology/plumbing/StreamScope.java
+++ b/api/topology/src/main/java/quarks/topology/plumbing/StreamScope.java
@@ -74,7 +74,7 @@ public class StreamScope<T> implements Consumer<T> {
/**
* Capture time in msec since the epoch.
* @return the timestamp
- * @see System#currentTimeMillis();
+ * @see System#currentTimeMillis()
*/
public long timestamp() {
return ts;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/e10447ce/api/topology/src/test/java/quarks/test/topology/PlumbingTest.java
----------------------------------------------------------------------
diff --git a/api/topology/src/test/java/quarks/test/topology/PlumbingTest.java b/api/topology/src/test/java/quarks/test/topology/PlumbingTest.java
index f88da2d..0dfaa6c 100644
--- a/api/topology/src/test/java/quarks/test/topology/PlumbingTest.java
+++ b/api/topology/src/test/java/quarks/test/topology/PlumbingTest.java
@@ -1,4 +1,4 @@
-//*
+/*
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
@@ -20,7 +20,6 @@ package quarks.test.topology;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -782,8 +781,8 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
assertEquals(1, samples.size());
sample = samples.get(0);
assertEquals(100, sample.tuple().intValue());
- assertNotEquals(0, sample.timestamp());
- assertNotEquals(0, sample.nanoTime());
+ assertTrue(sample.timestamp() != 0);
+ assertTrue(sample.nanoTime() != 0);
assertEquals(0, ss.getSampleCount());
assertEquals(0, ss.getSamples().size());
@@ -793,7 +792,7 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
assertEquals(1, ss.getSampleCount());
samples = ss.getSamples();
assertEquals(101, samples.get(0).tuple().intValue());
- assertNotEquals(samples, savedSamples);
+ assertTrue(samples != savedSamples);
assertEquals(0, ss.getSampleCount());
assertEquals(0, ss.getSamples().size());
@@ -967,7 +966,7 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
assertNotNull(alias1Name);
String alias2Name = StreamScopeRegistry.nameByStreamAlias("alias2");
assertNotNull(alias2Name);
- assertNotEquals(alias1Name, alias2Name);
+ assertFalse(alias1Name.equals(alias2Name));
String alias1 = StreamScopeRegistry.streamAliasFromName(alias1Name);
assertEquals("alias1", alias1);
@@ -975,12 +974,12 @@ public abstract class PlumbingTest extends TopologyAbstractTest {
assertNotNull(id1Name);
String id2Name = StreamScopeRegistry.nameByStreamId("id2");
assertNotNull(id2Name);
- assertNotEquals(id1Name, id2Name);
+ assertFalse(id1Name.equals(id2Name));
String id1 = StreamScopeRegistry.streamIdFromName(id1Name);
assertEquals("id1", id1);
- assertNotEquals(StreamScopeRegistry.nameByStreamAlias("1"),
- StreamScopeRegistry.nameByStreamId("1"));
+ assertFalse(StreamScopeRegistry.nameByStreamAlias("1")
+ .equals(StreamScopeRegistry.nameByStreamId("1")));
// ---------- register
rgy.register(alias1Name, ss1);