Author: vmpn
Date: Sun Dec 23 05:52:44 2012
New Revision: 1425413
URL: http://svn.apache.org/viewvc?rev=1425413&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with JavaHL changes on trunk@1354652
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1354627-1354652
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1425413&r1=1425412&r2=1425413&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Sun Dec 23 05:52:44 2012
@@ -1983,6 +1983,11 @@ public class BasicTests extends SVNTests
assertEquals("wrong date with getTimeMillis()",
lm[0].getDate(),
new java.util.Date(lm[0].getTimeMillis()));
+
+ // Ensure that targets get canonicalized
+ String non_canonical = thisTest.getUrl().toString() + "/";
+ LogMessage lm2[] = collectLogMessages(non_canonical, null,
+ ranges, false, true, false, 0);
}
/**
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1425413&r1=1425412&r2=1425413&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
Sun Dec 23 05:52:44 2012
@@ -1963,6 +1963,11 @@ public class BasicTests extends SVNTests
assertEquals("wrong date with getTimeMillis()",
lm[0].getDate(),
new java.util.Date(lm[0].getTimeMillis()));
+
+ // Ensure that targets get canonicalized
+ String non_canonical = thisTest.getUrl().toString() + "/";
+ LogMessage lm2[] = client.logMessages(non_canonical, null,
+ null, false, true);
}
/**