You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2018/06/18 06:36:55 UTC
svn commit: r1833680 - in /jackrabbit/commons/filevault/trunk/vault-core: ./
src/test/java/org/apache/jackrabbit/vault/packaging/impl/
src/test/java/org/apache/jackrabbit/vault/packaging/integration/
src/test/java/org/apache/jackrabbit/vault/util/
Author: tripod
Date: Mon Jun 18 06:36:55 2018
New Revision: 1833680
URL: http://svn.apache.org/viewvc?rev=1833680&view=rev
Log:
JCRVLT-293 Failing tests when building vault-core with -Doak=true
Modified:
jackrabbit/commons/filevault/trunk/vault-core/pom.xml
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerTest.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPTest.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/pom.xml?rev=1833680&r1=1833679&r2=1833680&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/pom.xml Mon Jun 18 06:36:55 2018
@@ -241,7 +241,7 @@
<!-- ====================================================================== -->
<profiles>
<profile>
- <id>oak</id>
+ <id>test-oak</id>
<build>
<plugins>
<plugin>
@@ -252,6 +252,58 @@
</plugin>
</plugins>
</build>
+ </profile>
+ <profile>
+ <id>test-jackrabbit</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Doak=true -Xmx1024m</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>test-both</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>oak</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <argLine>-Doak=true -Xmx1024m</argLine>
+ <reportNameSuffix>OAK</reportNameSuffix>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jr</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <reportNameSuffix>JR</reportNameSuffix>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerTest.java?rev=1833680&r1=1833679&r2=1833680&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerTest.java Mon Jun 18 06:36:55 2018
@@ -48,6 +48,7 @@ public class AdminPermissionCheckerTest
@After
public void after() throws RepositoryException {
JackrabbitSession jackrabbitSession = (JackrabbitSession) admin;
+ jackrabbitSession.refresh(false);
Authorizable vip = jackrabbitSession.getUserManager().getAuthorizable(TEST_USER);
if (vip != null) {
vip.remove();
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java?rev=1833680&r1=1833679&r2=1833680&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java Mon Jun 18 06:36:55 2018
@@ -36,6 +36,7 @@ import java.util.jar.JarFile;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
+import javax.jcr.Property;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -462,6 +463,18 @@ public class IntegrationTestBase {
assertFalse(path + " should not exist", admin.propertyExists(path));
}
+ public void assertPropertyMissingOrEmpty(String path) throws RepositoryException {
+ if (!admin.propertyExists(path)) {
+ return;
+ }
+ Property p = admin.getProperty(path);
+ if (p.isMultiple()) {
+ assertTrue(path + " should not exist or be empty", p.getValues().length == 0);
+ } else {
+ assertTrue(path + " should not exist or be empty", p.getString().length() == 0);
+ }
+ }
+
public void createNodes(Node parent, int maxDepth, int nodesPerFolder) throws RepositoryException {
for (int i=0; i<nodesPerFolder; i++) {
Node n = parent.addNode("n" + i, "nt:folder");
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPTest.java?rev=1833680&r1=1833679&r2=1833680&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPTest.java Mon Jun 18 06:36:55 2018
@@ -114,6 +114,7 @@ public class RCPTest extends Integration
admin.save();
// removing a mixing should remove the undeclared properties
assertPropertyMissing(SRC_TEST_NODE_PATH + "/jcr:title");
+ assertPropertyMissingOrEmpty(SRC_TEST_NODE_PATH + "/jcr:mixinTypes");
rcp = new RepositoryCopier();
rcp.setOnlyNewer(false);
@@ -121,8 +122,8 @@ public class RCPTest extends Integration
rcp.copy(admin, SRC_PATH, admin, DST_PATH, true);
assertNodeExists(DST_TEST_NODE_PATH);
- assertPropertyMissing(DST_TEST_NODE_PATH + "/jcr:mixinTypes");
assertPropertyMissing(DST_TEST_NODE_PATH + "/jcr:title");
+ assertPropertyMissingOrEmpty(DST_TEST_NODE_PATH + "/jcr:mixinTypes");
}
@Test
@@ -209,7 +210,7 @@ public class RCPTest extends Integration
// property should still be the old value, since src is not "newer"
assertProperty(DST_TEST_NODE_PATH + "/jcr:content/p0", "0");
// mixin should already be gone, since file does not have a lastModified.
- assertPropertyMissing(DST_TEST_NODE_PATH + "/jcr:mixinTypes");
+ assertPropertyMissingOrEmpty(DST_TEST_NODE_PATH + "/jcr:mixinTypes");
assertPropertyMissing(DST_TEST_NODE_PATH + "/jcr:title");
// now update last modified