Author: rhuijben
Date: Sat Jun 30 16:19:04 2012
New Revision: 1355758
URL: http://svn.apache.org/viewvc?rev=1355758&view=rev
Log:
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
(testTreeConflict): Handle the current state where the right-src of an
incoming delete is null.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1355758&r1=1355757&r2=1355758&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Sat Jun 30 16:19:04 2012
@@ -3109,10 +3109,12 @@ public class BasicTests extends SVNTests
conflict.getSrcLeftVersion().getPathInRepos(), tcTest.getUrl()
+ "/A/B/E/alpha");
assertEquals(conflict.getSrcLeftVersion().getPegRevision(), 1L);
- assertEquals(conflict.getSrcRightVersion().getNodeKind(),
NodeKind.none);
- assertEquals(conflict.getSrcRightVersion().getReposURL(),
tcTest.getUrl().toString());
- assertEquals(conflict.getSrcRightVersion().getPegRevision(), 2L);
-
+ if (conflict.getSrcRightVersion() != null)
+ {
+ assertEquals(conflict.getSrcRightVersion().getNodeKind(),
NodeKind.none);
+ assertEquals(conflict.getSrcRightVersion().getReposURL(),
tcTest.getUrl().toString());
+ assertEquals(conflict.getSrcRightVersion().getPegRevision(), 2L);
+ }
}
/**
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1355758&r1=1355757&r2=1355758&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
Sat Jun 30 16:19:04 2012
@@ -3039,10 +3039,12 @@ public class BasicTests extends SVNTests
conflict.getSrcLeftVersion().getPathInRepos(), tcTest.getUrl()
+ "/A/B/E/alpha");
assertEquals(conflict.getSrcLeftVersion().getPegRevision(), 1L);
- assertEquals(conflict.getSrcRightVersion().getNodeKind(),
NodeKind.none);
- assertEquals(conflict.getSrcRightVersion().getReposURL(),
tcTest.getUrl());
- assertEquals(conflict.getSrcRightVersion().getPegRevision(), 2L);
-
+ if (conflict.getSrcRightVersion() != null)
+ {
+ assertEquals(conflict.getSrcRightVersion().getNodeKind(),
NodeKind.none);
+ assertEquals(conflict.getSrcRightVersion().getReposURL(),
tcTest.getUrl());
+ assertEquals(conflict.getSrcRightVersion().getPegRevision(), 2L);
+ }
}
/**
