Author: brane
Date: Wed Jul 3 12:26:38 2013
New Revision: 1499361
URL: http://svn.apache.org/r1499361
Log:
Followup to r1499308: Fix some failing JavaHL tests.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(acquireMergeinfoAndAssertEquals): Ignore the merge range inheritance flag.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/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=1499361&r1=1499360&r2=1499361&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
Wed Jul 3 12:26:38 2013
@@ -2317,10 +2317,12 @@ public class BasicTests extends SVNTests
assertTrue("Missing merge info for source '" + mergeSrc + "' on '" +
targetPath + '\'', ranges != null && !ranges.isEmpty());
RevisionRange range = (RevisionRange) ranges.get(0);
- String expectedMergedRevs = expectedMergeStart + "-" +
expectedMergeEnd;
- assertEquals("Unexpected first merged revision range for '" +
- mergeSrc + "' on '" + targetPath + '\'',
- expectedMergedRevs, range.toString());
+ RevisionRange expected =
+ new RevisionRange(Revision.getInstance(expectedMergeStart),
+ Revision.getInstance(expectedMergeEnd));
+ assertTrue("Unexpected first merged revision range for '" +
+ mergeSrc + "' on '" + targetPath + '\'',
+ 0 == range.compareTo(expected));
// Verify expected available merges.
if (expectedAvailableStart > 0)
