You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/05/07 13:12:54 UTC
[1/2] incubator-tinkerpop git commit: Removed platform dependent line
feed.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 4d706e99c -> 38b2afcad
Removed platform dependent line feed.
Was preventing tests from passing on windows.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/28faffa4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/28faffa4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/28faffa4
Branch: refs/heads/master
Commit: 28faffa450448f5887db6205207355ef3dcfd3c1
Parents: 979dd24
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 7 07:08:53 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 7 07:08:53 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/util/Log4jRecordingAppenderTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/28faffa4/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/Log4jRecordingAppenderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/Log4jRecordingAppenderTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/Log4jRecordingAppenderTest.java
index b13eab5..92eb38b 100644
--- a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/Log4jRecordingAppenderTest.java
+++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/util/Log4jRecordingAppenderTest.java
@@ -34,6 +34,7 @@ import static org.junit.Assert.assertTrue;
public class Log4jRecordingAppenderTest {
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(Log4jRecordingAppenderTest.class);
private Log4jRecordingAppender recordingAppender = null;
+ private static final String lineSeparator = System.getProperty("line.separator");
@Before
public void setupForEachTest() {
@@ -55,9 +56,9 @@ public class Log4jRecordingAppenderTest {
@Test
public void shouldRecordMessages() {
assertEquals(3, recordingAppender.getMessages().size());
- assertEquals("ERROR - ERROR\n", recordingAppender.getMessages().get(0));
- assertEquals("WARN - WARN\n", recordingAppender.getMessages().get(1));
- assertEquals("INFO - INFO\n", recordingAppender.getMessages().get(2));
+ assertEquals("ERROR - ERROR" + lineSeparator, recordingAppender.getMessages().get(0));
+ assertEquals("WARN - WARN" + lineSeparator, recordingAppender.getMessages().get(1));
+ assertEquals("INFO - INFO" + lineSeparator, recordingAppender.getMessages().get(2));
}
@Test
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/38b2afca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/38b2afca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/38b2afca
Branch: refs/heads/master
Commit: 38b2afcadec035146d676f0335ede9ac4fb8e396
Parents: 28faffa 4d706e9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 7 07:12:44 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 7 07:12:44 2015 -0400
----------------------------------------------------------------------
.../IncidentToAdjacentStrategy.java | 5 ++--
.../process/traversal/util/TraversalHelper.java | 31 ++++++++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------