You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/02/24 15:10:42 UTC
[jackrabbit-filevault] branch
feature/JCRVLT-505-separate-unit-and-integration-tests created (now
a2d1a01)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/JCRVLT-505-separate-unit-and-integration-tests
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git.
at a2d1a01 JCRVLT-505 separate ITs and Unit Tests
This branch includes the following new commits:
new a2d1a01 JCRVLT-505 separate ITs and Unit Tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-filevault] 01/01: JCRVLT-505 separate ITs and Unit Tests
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/JCRVLT-505-separate-unit-and-integration-tests
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit a2d1a0164ffc8f4fdccd3352f54a30c65957d0b1
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Feb 24 16:10:25 2021 +0100
JCRVLT-505 separate ITs and Unit Tests
execute the former with maven-failsafe-plugin with both Oak and
Jackrabbit
---
vault-core/pom.xml | 34 +++++++++++++++-------
...rmatterTest.java => DocViewSaxFormatterIT.java} | 2 +-
...ckerTest.java => AdminPermissionCheckerIT.java} | 2 +-
...plTest.java => JcrPackageDefinitionImplIT.java} | 2 +-
...rImplTest.java => JcrPackageManagerImplIT.java} | 2 +-
...PackagingImplTest.java => PackagingImplIT.java} | 2 +-
.../{TestACEsAtRoot.java => ACEsAtRootIT.java} | 2 +-
.../{TestACLAndMerge.java => ACLAndMergeIT.java} | 2 +-
.../{TestAceOrder.java => AceOrderIT.java} | 2 +-
...iveExtraction.java => ArchiveExtractionIT.java} | 4 +--
...TestAtomicCounter.java => AtomicCounterIT.java} | 29 +++---------------
...narylessExport.java => BinarylessExportIT.java} | 6 +---
...ressionExport.java => CompressionExportIT.java} | 4 +--
...ncies.java => CrossRegistryDependenciesIT.java} | 6 +---
.../{TestCugHandling.java => CugHandlingTest.java} | 3 +-
...stomPrivileges.java => CustomPrivilegesIT.java} | 2 +-
...{DumpCoverageTests.java => DumpCoverageIT.java} | 4 +--
.../{TestEmptyPackage.java => EmptyPackageIT.java} | 5 +---
...pendencies.java => EnforcedDependenciesIT.java} | 2 +-
...TestEscapedExport.java => EscapedExportIT.java} | 2 +-
...TestExecutionPlan.java => ExecutionPlanIT.java} | 3 +-
...Pattern.java => ExportWithQuotedPatternIT.java} | 2 +-
...FSInstallState.java => FSInstallStateTest.java} | 2 +-
...ckageRegistry.java => FSPackageRegistryIT.java} | 4 +--
...tyExport.java => FilteredPropertyExportIT.java} | 4 +--
...ctHandler.java => FolderArtifactHandlerIT.java} | 2 +-
...pMergePackage.java => GroupMergePackageIT.java} | 5 +---
.../{ImportTests.java => ImportIT.java} | 2 +-
.../{TestImportMode.java => ImportModeIT.java} | 2 +-
.../packaging/integration/IntegrationTestBase.java | 7 +++--
...onExport.java => ManifestCreationExportIT.java} | 5 +---
.../{TestMappedExport.java => MappedExportIT.java} | 5 +---
.../{TestMappedImport.java => MappedImportIT.java} | 2 +-
...mespaceImport.java => NamespaceImportTest.java} | 5 +++-
...AccessExport.java => NoRootAccessExportIT.java} | 2 +-
...PackageCreation.java => PackageCreationIT.java} | 5 +---
...stPackageInstall.java => PackageInstallIT.java} | 6 ++--
...PackageRegistry.java => PackageRegistryIT.java} | 3 +-
...pedInstall.java => PackageScopedInstallIT.java} | 5 +---
.../{TestPackageTypes.java => PackageTypesIT.java} | 5 +---
...incipalBasedTest.java => PrincipalBasedIT.java} | 2 +-
.../{TestResolve.java => ResolveDependencyIT.java} | 5 +---
...TestSerialization.java => SerializationIT.java} | 15 +++-------
...ge.java => SimpleFileAggregateInPackageIT.java} | 2 +-
...perties.java => SpecialDoublePropertiesIT.java} | 5 +---
.../{TestSubPackages.java => SubPackagesIT.java} | 15 +++++-----
...ntentPackage.java => UserContentPackageIT.java} | 5 +---
.../vault/util/HtmlProgressListenerTest.java | 6 ++--
.../vault/util/{RCPTest.java => RCPIT.java} | 2 +-
49 files changed, 98 insertions(+), 152 deletions(-)
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index dda48df..5f7c79a 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -297,10 +297,19 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>-Doak=true -Xmx1024m</argLine>
+ <reportNameSuffix>OAK</reportNameSuffix>
</configuration>
+ <executions>
+ <execution>
+ <id>oak</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -310,10 +319,18 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <argLine>-Doak=true -Xmx1024m</argLine>
+ <reportNameSuffix>JR</reportNameSuffix>
</configuration>
+ <executions>
+ <execution>
+ <id>jr</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -326,30 +343,25 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
+ <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<id>oak</id>
<goals>
- <goal>test</goal>
+ <goal>integration-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>
+ <goal>integration-test</goal>
</goals>
<configuration>
<reportNameSuffix>JR</reportNameSuffix>
- <skip>false</skip>
</configuration>
</execution>
</executions>
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSaxFormatterTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSaxFormatterIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSaxFormatterTest.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSaxFormatterIT.java
index 164e99c..98b3cc3 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSaxFormatterTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSaxFormatterIT.java
@@ -46,7 +46,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class DocViewSaxFormatterTest extends IntegrationTestBase {
+public class DocViewSaxFormatterIT extends IntegrationTestBase {
/**
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerTest.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerIT.java
index 2b9aab6..e04c3db 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/AdminPermissionCheckerIT.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
/**
* Testcase for {@link AdminPermissionChecker}
*/
-public class AdminPermissionCheckerTest extends IntegrationTestBase {
+public class AdminPermissionCheckerIT extends IntegrationTestBase {
private static final String TEST_USER = "testUser";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImplTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImplIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImplTest.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImplIT.java
index 3826833..aa84b84 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImplTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImplIT.java
@@ -34,7 +34,7 @@ import org.junit.Assert;
import org.junit.Test;
-public class JcrPackageDefinitionImplTest extends IntegrationTestBase {
+public class JcrPackageDefinitionImplIT extends IntegrationTestBase {
@Test
public void testUnwrapAndComparePackageProperties() throws ItemExistsException, PathNotFoundException, VersionException, ConstraintViolationException, LockException, RepositoryException, IOException {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplTest.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplIT.java
index 749ec4c..0e9fda9 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageManagerImplIT.java
@@ -56,7 +56,7 @@ import static org.mockito.Mockito.when;
/**
* Test case for {@link JcrPackageManagerImpl}
*/
-public class JcrPackageManagerImplTest extends IntegrationTestBase {
+public class JcrPackageManagerImplIT extends IntegrationTestBase {
private List<String> visitedPaths = new LinkedList<String>();
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/PackagingImplTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/PackagingImplIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/PackagingImplTest.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/PackagingImplIT.java
index 5885b54..4444b5d 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/PackagingImplTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/impl/PackagingImplIT.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import org.osgi.util.converter.Converter;
import org.osgi.util.converter.Converters;
-public class PackagingImplTest extends IntegrationTestBase {
+public class PackagingImplIT extends IntegrationTestBase {
@Test
public void testGetCompositePackageRepository() throws IOException, PackageExistsException {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACEsAtRootIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACEsAtRootIT.java
index 87acb1d..af4607e 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACEsAtRootIT.java
@@ -53,7 +53,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class TestACEsAtRoot extends IntegrationTestBase {
+public class ACEsAtRootIT extends IntegrationTestBase {
@Test
public void export() throws RepositoryException, IOException, PackageException, ConfigurationException {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACLAndMergeIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACLAndMergeIT.java
index cb8544e..90f22f2 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACLAndMerge.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACLAndMergeIT.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
/**
* AC Handling and import mode tests
*/
-public class TestACLAndMerge extends IntegrationTestBase {
+public class ACLAndMergeIT extends IntegrationTestBase {
private final static String NAME_TEST_USER = "testuser";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/AceOrderIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/AceOrderIT.java
index ad71749..f9f70c8 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAceOrder.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/AceOrderIT.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEquals;
/**
* Test if order of ACE is preserved upon import
*/
-public class TestAceOrder extends IntegrationTestBase {
+public class AceOrderIT extends IntegrationTestBase {
private final static String NAME_TEST_USER = "testuser";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestArchiveExtraction.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ArchiveExtractionIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestArchiveExtraction.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ArchiveExtractionIT.java
index 07572f2..2f5d318 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestArchiveExtraction.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ArchiveExtractionIT.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail;
* Test cases for shallow package installation
*/
@RunWith(Parameterized.class)
-public class TestArchiveExtraction extends IntegrationTestBase {
+public class ArchiveExtractionIT extends IntegrationTestBase {
@Parameterized.Parameters
public static Collection<Object[]> data() {
@@ -57,7 +57,7 @@ public class TestArchiveExtraction extends IntegrationTestBase {
private final boolean isBuffered;
- public TestArchiveExtraction(int streamBufferSize, boolean isBuffered) {
+ public ArchiveExtractionIT(int streamBufferSize, boolean isBuffered) {
this.streamBufferSize = streamBufferSize;
this.isBuffered = isBuffered;
}
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/AtomicCounterIT.java
similarity index 71%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/AtomicCounterIT.java
index 0bf6e1b..54c637d 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/AtomicCounterIT.java
@@ -17,47 +17,26 @@
package org.apache.jackrabbit.vault.packaging.integration;
-import java.io.File;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.io.IOException;
-import java.util.Properties;
import javax.jcr.Node;
-import javax.jcr.Property;
import javax.jcr.RepositoryException;
-import javax.jcr.SimpleCredentials;
import javax.jcr.nodetype.NodeType;
-import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.api.security.user.Authorizable;
-import org.apache.jackrabbit.api.security.user.Group;
-import org.apache.jackrabbit.api.security.user.User;
-import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.commons.JcrUtils;
-import org.apache.jackrabbit.core.security.principal.PrincipalImpl;
-import org.apache.jackrabbit.vault.fs.api.ImportMode;
-import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
-import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf;
-import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
-import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
import org.apache.jackrabbit.vault.fs.io.ImportOptions;
-import org.apache.jackrabbit.vault.packaging.ExportOptions;
import org.apache.jackrabbit.vault.packaging.JcrPackage;
import org.apache.jackrabbit.vault.packaging.PackageException;
-import org.apache.jackrabbit.vault.packaging.VaultPackage;
-import org.apache.jackrabbit.vault.util.Text;
import org.junit.Assume;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
/**
* {@code TestEmptyPackage}...
*/
-public class TestAtomicCounter extends IntegrationTestBase {
+public class AtomicCounterIT extends IntegrationTestBase {
/**
* Tests if installing a package with a mix:atomicCounter works
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestBinarylessExport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/BinarylessExportIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestBinarylessExport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/BinarylessExportIT.java
index 382000e..a70cfb0 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestBinarylessExport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/BinarylessExportIT.java
@@ -32,7 +32,6 @@ import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.junit.Assume;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -51,10 +50,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-/**
- * {@code TestEmptyPackage}...
- */
-public class TestBinarylessExport extends IntegrationTestBase {
+public class BinarylessExportIT extends IntegrationTestBase {
private final static String SMALL_TEXT = "Lorem ipsum";
private final static String BINARY_NODE_PATH = "/tmp/binaryless/node";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCompressionExport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CompressionExportIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCompressionExport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CompressionExportIT.java
index 4dd4521..82d433c 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCompressionExport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CompressionExportIT.java
@@ -48,12 +48,12 @@ import static org.junit.Assert.assertTrue;
* This test case requires a long time to run, thus it is disabled by default.
*/
@Ignore
-public class TestCompressionExport extends IntegrationTestBase {
+public class CompressionExportIT extends IntegrationTestBase {
/**
* default logger
*/
- private static final Logger log = LoggerFactory.getLogger(TestCompressionExport.class);
+ private static final Logger log = LoggerFactory.getLogger(CompressionExportIT.class);
private static final Random RAND = new Random();
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCrossRegistryDependencies.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CrossRegistryDependenciesIT.java
similarity index 91%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCrossRegistryDependencies.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CrossRegistryDependenciesIT.java
index 7f2e231..5d102ec 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCrossRegistryDependencies.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CrossRegistryDependenciesIT.java
@@ -26,18 +26,14 @@ import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.registry.impl.FSPackageRegistry;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Test dependencies of JCR Packages on packages registered in FS Package registry
*/
-public class TestCrossRegistryDependencies extends IntegrationTestBase {
+public class CrossRegistryDependenciesIT extends IntegrationTestBase {
private static final File DIR_REGISTRY_HOME = new File("target/registry");
- private static final Logger log = LoggerFactory.getLogger(TestCrossRegistryDependencies.class);
-
private FSPackageRegistry fsregistry;
@Override
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCugHandling.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CugHandlingTest.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCugHandling.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CugHandlingTest.java
index 460bdfb..4064ce2 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCugHandling.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CugHandlingTest.java
@@ -64,7 +64,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public final class TestCugHandling {
+/** This is more an IT but isn't derived from IntegrationTestBase, therefore doesn't need parametrization */
+public final class CugHandlingTest {
private static final String TEST_ROOT = "/testroot";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCustomPrivileges.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CustomPrivilegesIT.java
similarity index 96%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCustomPrivileges.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CustomPrivilegesIT.java
index 122076b..25ae6e9 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestCustomPrivileges.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/CustomPrivilegesIT.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
/**
* Test cases for packages with custom privileges
*/
-public class TestCustomPrivileges extends IntegrationTestBase {
+public class CustomPrivilegesIT extends IntegrationTestBase {
/**
* Installs a package that contains a custom privilege and then checks if it was installed.
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageIT.java
index 305b64c..6c7dab1 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageIT.java
@@ -42,12 +42,12 @@ import org.slf4j.LoggerFactory;
/**
* {@code ImportTests}...
*/
-public class DumpCoverageTests extends IntegrationTestBase {
+public class DumpCoverageIT extends IntegrationTestBase {
/**
* default logger
*/
- private static final Logger log = LoggerFactory.getLogger(DumpCoverageTests.class);
+ private static final Logger log = LoggerFactory.getLogger(DumpCoverageIT.class);
public static final String TEST_ROOT = "/testroot";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEmptyPackage.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EmptyPackageIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEmptyPackage.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EmptyPackageIT.java
index ce1f3ae..734ce32 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEmptyPackage.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EmptyPackageIT.java
@@ -32,10 +32,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-/**
- * {@code TestEmptyPackage}...
- */
-public class TestEmptyPackage extends IntegrationTestBase {
+public class EmptyPackageIT extends IntegrationTestBase {
/**
* Installs a package that contains /tmp/foo/bar/tobi and then installs one
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEnforcedDependencies.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EnforcedDependenciesIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEnforcedDependencies.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EnforcedDependenciesIT.java
index 677c208..84247e9 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEnforcedDependencies.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EnforcedDependenciesIT.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.fail;
/**
* Tests that cover installation and uninstallation with enforced dependency checks.
*/
-public class TestEnforcedDependencies extends IntegrationTestBase {
+public class EnforcedDependenciesIT extends IntegrationTestBase {
/**
* Test package A-1.0. Depends on B and C-1.X
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEscapedExport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EscapedExportIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEscapedExport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EscapedExportIT.java
index 447f88a..b6ffbf5 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEscapedExport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EscapedExportIT.java
@@ -39,7 +39,7 @@ import org.junit.Test;
/**
* Test export / import of specially escaped node names.
*/
-public class TestEscapedExport extends IntegrationTestBase {
+public class EscapedExportIT extends IntegrationTestBase {
private final static String[] FILE_NAMES = {
"_jcr_myfile.data",
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExecutionPlan.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExecutionPlanIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExecutionPlan.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExecutionPlanIT.java
index d613950..2a0cba2 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExecutionPlan.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExecutionPlanIT.java
@@ -20,7 +20,6 @@ package org.apache.jackrabbit.vault.packaging.integration;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.List;
import org.apache.jackrabbit.vault.packaging.CyclicDependencyException;
import org.apache.jackrabbit.vault.packaging.DependencyException;
@@ -42,7 +41,7 @@ import static org.junit.Assert.fail;
/**
* Test the Package registry interface
*/
-public class TestExecutionPlan extends IntegrationTestBase {
+public class ExecutionPlanIT extends IntegrationTestBase {
private static final PackageId TMP_PACKAGE_ID = new PackageId("my_packages", "tmp", "");
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExportWithQuotedPattern.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExportWithQuotedPatternIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExportWithQuotedPattern.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExportWithQuotedPatternIT.java
index 9d54c59..255e7a6 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestExportWithQuotedPattern.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExportWithQuotedPatternIT.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class TestExportWithQuotedPattern extends IntegrationTestBase {
+public class ExportWithQuotedPatternIT extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSInstallState.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FSInstallStateTest.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSInstallState.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FSInstallStateTest.java
index 1b9f7c6..321ec5a 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSInstallState.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FSInstallStateTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertThat;
/**
* Test the Package registry interface
*/
-public class TestFSInstallState {
+public class FSInstallStateTest {
private static final PackageId TMP_PACKAGE_ID = new PackageId("my_packages", "tmp", "");
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FSPackageRegistryIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FSPackageRegistryIT.java
index ad70108..34d9902 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FSPackageRegistryIT.java
@@ -65,11 +65,11 @@ import static org.junit.Assert.fail;
/**
* Test the Package registry interface
*/
-public class TestFSPackageRegistry extends IntegrationTestBase {
+public class FSPackageRegistryIT extends IntegrationTestBase {
private static final File DIR_REGISTRY_HOME = new File("target/registry");
- private static final Logger log = LoggerFactory.getLogger(TestFSPackageRegistry.class);
+ private static final Logger log = LoggerFactory.getLogger(FSPackageRegistryIT.class);
public static final String[] APPLICATION_PATHS = {
"/libs",
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FilteredPropertyExportIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FilteredPropertyExportIT.java
index cadb97f..710bc22 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FilteredPropertyExportIT.java
@@ -39,9 +39,9 @@ import org.junit.Before;
import org.junit.Test;
/**
- * {@code TestFilteredExport} cover testing the filtering of properties
+ * {@code FilteredPropertyExportIT} cover testing the filtering of properties
*/
-public class TestFilteredPropertyExport extends IntegrationTestBase {
+public class FilteredPropertyExportIT extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFolderArtifactHandler.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FolderArtifactHandlerIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFolderArtifactHandler.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FolderArtifactHandlerIT.java
index 8705069..17fd40c 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFolderArtifactHandler.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FolderArtifactHandlerIT.java
@@ -28,7 +28,7 @@ import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.junit.Test;
-public class TestFolderArtifactHandler extends IntegrationTestBase {
+public class FolderArtifactHandlerIT extends IntegrationTestBase {
/* JCRVLT-415 */
@Test
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/GroupMergePackageIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/GroupMergePackageIT.java
index 0e062a6..69d43a1 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/GroupMergePackageIT.java
@@ -38,10 +38,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-/**
- * {@code TestEmptyPackage}...
- */
-public class TestGroupMergePackage extends IntegrationTestBase {
+public class GroupMergePackageIT extends IntegrationTestBase {
@Override
public void tearDown() throws Exception {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportTests.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportTests.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportIT.java
index 36e7fb9..b4bd284 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportTests.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportIT.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertFalse;
/**
* {@code ImportTests}...
*/
-public class ImportTests extends IntegrationTestBase {
+public class ImportIT extends IntegrationTestBase {
public static final String TEST_ROOT = "/testroot";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestImportMode.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportModeIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestImportMode.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportModeIT.java
index c21e91e..519ecc2 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestImportMode.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ImportModeIT.java
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* {@code TestPackageInstall}...
*/
-public class TestImportMode extends IntegrationTestBase {
+public class ImportModeIT extends IntegrationTestBase {
/**
* Installs a package with the filter: "/tmp/foo", mode="replace"
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
index 35e1130..dff3ff5 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
@@ -200,9 +200,10 @@ public class IntegrationTestBase {
admin.save();
admin.logout();
} else {
- InputStream in = IntegrationTestBase.class.getResourceAsStream("repository.xml");
- RepositoryConfig cfg = RepositoryConfig.create(in, REPO_HOME);
- repository = RepositoryImpl.create(cfg);
+ try (InputStream in = IntegrationTestBase.class.getResourceAsStream("repository.xml")) {
+ RepositoryConfig cfg = RepositoryConfig.create(in, REPO_HOME);
+ repository = RepositoryImpl.create(cfg);
+ }
}
log.info("repository created: {} {}",
repository.getDescriptor(Repository.REP_NAME_DESC),
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ManifestCreationExportIT.java
similarity index 96%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ManifestCreationExportIT.java
index f1d27d9..7076418 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ManifestCreationExportIT.java
@@ -35,10 +35,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-/**
- * {@code TestEmptyPackage}...
- */
-public class TestManifestCreationExport extends IntegrationTestBase {
+public class ManifestCreationExportIT extends IntegrationTestBase {
@Test
public void exportPackageCreatesManifest() throws RepositoryException, IOException, PackageException {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedExport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedExportIT.java
similarity index 96%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedExport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedExportIT.java
index 21833a9..c06b8fd 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedExport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedExportIT.java
@@ -36,10 +36,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-/**
- * {@code TestEmptyPackage}...
- */
-public class TestMappedExport extends IntegrationTestBase {
+public class MappedExportIT extends IntegrationTestBase {
@Test
public void exportMapped() throws RepositoryException, IOException, PackageException {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedImport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedImportIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedImport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedImportIT.java
index fd5d081..8e6a81f 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestMappedImport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedImportIT.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
/**
*/
-public class TestMappedImport extends IntegrationTestBase {
+public class MappedImportIT extends IntegrationTestBase {
@Test
public void testSimple() throws RepositoryException, IOException, PackageException {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNamespaceImport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NamespaceImportTest.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNamespaceImport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NamespaceImportTest.java
index c687c41..c247c66 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNamespaceImport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NamespaceImportTest.java
@@ -42,7 +42,10 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
-public class TestNamespaceImport {
+/**
+ * Is rather an IT but not relying on {@link IntegrationTestBase}
+ */
+public class NamespaceImportTest {
private final static String PREFIX = "prefix";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNoRootAccessExport.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NoRootAccessExportIT.java
similarity index 97%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNoRootAccessExport.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NoRootAccessExportIT.java
index 68e8fab..90717f3 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNoRootAccessExport.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NoRootAccessExportIT.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertNotNull;
/**
* Test export w/o read access to the root node
*/
-public class TestNoRootAccessExport extends IntegrationTestBase {
+public class NoRootAccessExportIT extends IntegrationTestBase {
@Test
@Ignore("JCRVLT-100")
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageCreation.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageCreationIT.java
similarity index 97%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageCreation.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageCreationIT.java
index f6beb0f..be199ce 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageCreation.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageCreationIT.java
@@ -27,10 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.fail;
-/**
- * {@code TestPackageInstall}...
- */
-public class TestPackageCreation extends IntegrationTestBase {
+public class PackageCreationIT extends IntegrationTestBase {
public static String[] GROUP_NAMES = {"foo", "foo-zoo", "foo.zoo", "jcr:foo", "foo/zoo"};
public static String[] ILLEGAL_GROUP_NAMES = {"foo ", " foo", ":foo"};
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageInstallIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageInstallIT.java
index 5f06ab8..1d53d32 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageInstall.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageInstallIT.java
@@ -69,9 +69,9 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
/**
- * {@code TestPackageInstall}...
+ * {@code PackageInstallIT}...
*/
-public class TestPackageInstall extends IntegrationTestBase {
+public class PackageInstallIT extends IntegrationTestBase {
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -742,7 +742,7 @@ public class TestPackageInstall extends IntegrationTestBase {
/**
* Tests if package installation works w/o RW access to / and /tmp.
* this currently fails, due to the creation of the snapshot.
- * also see {@link TestNoRootAccessExport#exportNoRootAccess()}
+ * also see {@link NoRootAccessExportIT#exportNoRootAccess()}
*/
@Test
@Ignore("JCRVLT-100")
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageRegistry.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageRegistryIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageRegistry.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageRegistryIT.java
index 5e18acf..b41efcc 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageRegistry.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageRegistryIT.java
@@ -30,7 +30,6 @@ import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.PackageExistsException;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.registry.DependencyReport;
-import org.apache.jackrabbit.vault.packaging.registry.PackageRegistry;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
import org.apache.jackrabbit.vault.packaging.registry.impl.JcrPackageRegistry;
import org.junit.Before;
@@ -45,7 +44,7 @@ import static org.junit.Assert.fail;
/**
* Test the Package registry interface
*/
-public class TestPackageRegistry extends IntegrationTestBase {
+public class PackageRegistryIT extends IntegrationTestBase {
private JcrPackageRegistry registry;
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageScopedInstall.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageScopedInstallIT.java
similarity index 97%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageScopedInstall.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageScopedInstallIT.java
index 19965fe..93b9eb5 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageScopedInstall.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageScopedInstallIT.java
@@ -31,10 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-/**
- * {@code TestPackageInstall}...
- */
-public class TestPackageScopedInstall extends IntegrationTestBase {
+public class PackageScopedInstallIT extends IntegrationTestBase {
@Before
public void beforeEach() {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageTypes.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageTypesIT.java
similarity index 98%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageTypes.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageTypesIT.java
index 6cbed62..b96dafe 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageTypes.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageTypesIT.java
@@ -41,10 +41,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-/**
- * Test the Package registry interface
- */
-public class TestPackageTypes extends IntegrationTestBase {
+public class PackageTypesIT extends IntegrationTestBase {
private PackageRegistry registry;
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedTest.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedIT.java
index 5163e0f..50d5638 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PrincipalBasedIT.java
@@ -70,7 +70,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
-public class PrincipalBasedTest extends IntegrationTestBase {
+public class PrincipalBasedIT extends IntegrationTestBase {
private static final String INTERMEDIATE_PATH = "intermediate";
private static final String EFFECTIVE_PATH = "/testroot/secured";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestResolve.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ResolveDependencyIT.java
similarity index 97%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestResolve.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ResolveDependencyIT.java
index 0b41d49..4f74dc2 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestResolve.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ResolveDependencyIT.java
@@ -30,10 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-/**
- * {@code TestPackageInstall}...
- */
-public class TestResolve extends IntegrationTestBase {
+public class ResolveDependencyIT extends IntegrationTestBase {
/**
* Installs some packages and tests the resolve method
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSerialization.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SerializationIT.java
similarity index 92%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSerialization.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SerializationIT.java
index 06c41d4..ec407a3 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSerialization.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SerializationIT.java
@@ -17,6 +17,9 @@
package org.apache.jackrabbit.vault.packaging.integration;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.io.File;
import java.io.IOException;
import java.util.Properties;
@@ -27,25 +30,15 @@ import javax.jcr.nodetype.NodeType;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
-import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.packaging.ExportOptions;
-import org.apache.jackrabbit.vault.packaging.JcrPackage;
import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
-import org.junit.Ignore;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-/**
- * {@code TestEmptyPackage}...
- */
-public class TestSerialization extends IntegrationTestBase {
+public class SerializationIT extends IntegrationTestBase {
@Test
public void exportJcrXmlTest() throws RepositoryException, IOException, PackageException {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSimpleFileAggregateInPackage.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SimpleFileAggregateInPackageIT.java
similarity index 95%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSimpleFileAggregateInPackage.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SimpleFileAggregateInPackageIT.java
index fa87c10..3d60fc8 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSimpleFileAggregateInPackage.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SimpleFileAggregateInPackageIT.java
@@ -24,7 +24,7 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.vault.packaging.PackageException;
import org.junit.Test;
-public class TestSimpleFileAggregateInPackage extends IntegrationTestBase {
+public class SimpleFileAggregateInPackageIT extends IntegrationTestBase {
@Test
public void testSimpleFileAggregateOverwritesChildNodes()
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSpecialDoubleProperties.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SpecialDoublePropertiesIT.java
similarity index 97%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSpecialDoubleProperties.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SpecialDoublePropertiesIT.java
index 7aefc4b..7e3c2fd 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSpecialDoubleProperties.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SpecialDoublePropertiesIT.java
@@ -41,10 +41,7 @@ import org.xml.sax.InputSource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-/**
- * {@code TestEmptyPackage}...
- */
-public class TestSpecialDoubleProperties extends IntegrationTestBase {
+public class SpecialDoublePropertiesIT extends IntegrationTestBase {
@Test
public void exportDoubles() throws RepositoryException, IOException, PackageException {
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SubPackagesIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SubPackagesIT.java
index 87abfcb..bf3912a 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SubPackagesIT.java
@@ -17,6 +17,11 @@
package org.apache.jackrabbit.vault.packaging.integration;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -37,24 +42,18 @@ import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.impl.JcrPackageManagerImpl;
import org.apache.jackrabbit.vault.packaging.registry.impl.JcrPackageRegistry;
-import org.apache.jackrabbit.vault.util.DefaultProgressListener;
import org.apache.tika.io.IOUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
/**
* Tests that covers sub packages. the package "my_packages:subtest" contains 2 sub packages
* "my_packages:sub_a" and "my_packages:sub_b" which each contain 1 node /tmp/a and /tmp/b respectively.
*/
@RunWith(Parameterized.class)
-public class TestSubPackages extends IntegrationTestBase {
+public class SubPackagesIT extends IntegrationTestBase {
@Parameterized.Parameters
public static Collection<Object[]> data() {
@@ -74,7 +73,7 @@ public class TestSubPackages extends IntegrationTestBase {
private final String[] packageRoots;
- public TestSubPackages(String[] packageRoots, boolean dummy) {
+ public SubPackagesIT(String[] packageRoots, boolean dummy) {
this.packageRoots = packageRoots;
}
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/UserContentPackageIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/UserContentPackageIT.java
index 63f665c..24d7384 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/UserContentPackageIT.java
@@ -53,10 +53,7 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-/**
- * {@code TestEmptyPackage}...
- */
-public class TestUserContentPackage extends IntegrationTestBase {
+public class UserContentPackageIT extends IntegrationTestBase {
private static final String PARENT_PATH_TEST_USER_A = "/home/users/test";
private static final String ID_TEST_USER_A = "test-user-a";
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/util/HtmlProgressListenerTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/util/HtmlProgressListenerTest.java
index f0d97ba..0dc84ef 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/util/HtmlProgressListenerTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/util/HtmlProgressListenerTest.java
@@ -16,15 +16,13 @@
*/
package org.apache.jackrabbit.vault.util;
+import static org.junit.Assert.assertEquals;
+
import java.io.StringWriter;
import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
import org.junit.Test;
-import junit.framework.TestCase;
-
-import static org.junit.Assert.assertEquals;
-
/**
*
*/
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPIT.java
similarity index 99%
rename from vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPTest.java
rename to vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPIT.java
index 3ac3242..4be96bd 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/util/RCPIT.java
@@ -33,7 +33,7 @@ import org.junit.Test;
/**
* {@code RCPTest}...
*/
-public class RCPTest extends IntegrationTestBase {
+public class RCPIT extends IntegrationTestBase {
public static final String SRC_PATH = "/testroot/src";