jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r1511320 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java
Date Wed, 07 Aug 2013 14:04:41 GMT
Author: mreutegg
Date: Wed Aug  7 14:04:41 2013
New Revision: 1511320

URL: http://svn.apache.org/r1511320
Log:
JCR-3639: VersionLabelTest adds label to root version
- fix LabelTest in jcr2spi

Modified:
    jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java?rev=1511320&r1=1511319&r2=1511320&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java
Wed Aug  7 14:04:41 2013
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.test.api.ve
 public class LabelTest extends VersionLabelTest {
 
     public void testRemovedLabel2() throws RepositoryException {
-        vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false);
+        vHistory.addVersionLabel(version.getName(), versionLabel, false);
         vHistory.removeVersionLabel(versionLabel);
 
         List<String> labels = Arrays.asList(vHistory.getVersionLabels());
@@ -35,15 +35,15 @@ public class LabelTest extends VersionLa
     }
 
     public void testRemovedLabel3() throws RepositoryException {
-        vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false);
+        vHistory.addVersionLabel(version.getName(), versionLabel, false);
         vHistory.removeVersionLabel(versionLabel);
 
-        List<String> labels = Arrays.asList(vHistory.getVersionLabels(rootVersion));
+        List<String> labels = Arrays.asList(vHistory.getVersionLabels(version));
         assertFalse("VersionHistory.getVersionLabels(Version) must not return a removed label.",labels.contains(versionLabel));
     }
 
     public void testMoveLabel2() throws RepositoryException {
-        vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false);
+        vHistory.addVersionLabel(version.getName(), versionLabel, false);
 
         versionableNode.checkout();
         Version v = versionableNode.checkin();
@@ -57,10 +57,10 @@ public class LabelTest extends VersionLa
         versionableNode.checkout();
         Version v = versionableNode.checkin();
 
-        vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false);
+        vHistory.addVersionLabel(version.getName(), versionLabel, false);
         vHistory.addVersionLabel(v.getName(), versionLabel, true);
 
-        List<String> labels = Arrays.asList(vHistory.getVersionLabels(rootVersion));
+        List<String> labels = Arrays.asList(vHistory.getVersionLabels(version));
         assertFalse(labels.contains(versionLabel));
     }
 
@@ -68,7 +68,7 @@ public class LabelTest extends VersionLa
         versionableNode.checkout();
         Version v = versionableNode.checkin();
 
-        vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false);
+        vHistory.addVersionLabel(version.getName(), versionLabel, false);
         vHistory.addVersionLabel(v.getName(), versionLabel, true);
 
         Version v2 = vHistory.getVersionByLabel(versionLabel);



Mime
View raw message