jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r650325 - in /jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version: RestoreTest.java VersionIteratorImplTest.java
Date Mon, 21 Apr 2008 23:55:01 GMT
Author: jukka
Date: Mon Apr 21 16:54:59 2008
New Revision: 650325

URL: http://svn.apache.org/viewvc?rev=650325&view=rev
Log:
1.4: Merged revisions 637108 and 638303 (tests) (JCR-1476)

Added:
    jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java
      - copied, changed from r637108, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java
Modified:
    jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java

Copied: jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java
(from r637108, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java?p2=jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java&p1=jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java&r1=637108&r2=650325&rev=650325&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RestoreTest.java
Mon Apr 21 16:54:59 2008
@@ -34,7 +34,9 @@
         UserTransactionImpl tx = new UserTransactionImpl(superuser);
         tx.begin();
         Version v10 = n.checkin();
+        String versionName = v10.getName();
         n.restore(v10, true);
+        assertEquals("Wrong version restored", versionName, n.getBaseVersion().getName());
         tx.commit();
     }
 }

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java?rev=650325&r1=650324&r2=650325&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java
Mon Apr 21 16:54:59 2008
@@ -48,6 +48,7 @@
 
         public Calendar getCreated() {return null;}
         public InternalFrozenNode getFrozenNode() {return null;}
+        public NodeId getFrozenNodeId() {return null;}
         public Name[] getLabels() {return null;}
         public Name getName() {return null;}
         public InternalVersion[] getPredecessors() {return null;}



Mime
View raw message