Hi there,

I wanted to play with archiva, so I checked out the trunk, installed
connector and jta,
and ran 'mvn install'

It failed for me on test cases for, in order,
archiva-reports-standard, archiva-proxy and
archiva-configuration.

You devs may already be aware of that, if that's the case, well, sorry
for the no-news I bring ;-) and please excuse my laziness in using
some googles... ;-)

Some info :
java.vm.version=R26.4.0-63-63688-1.4.2_11-20060626-2259-linux-ia32
java.vm.name=BEA JRockit(R)
java.runtime.version=1.4.2_11-b06
os.name=Linux
os.version=2.6.17-11-generic
(32bit jvm running on amd64 host)

It mainly seems to me test cases are a bit too lazy... ;-)

archiva-reports-standard :
AbstractChecksumArtifactReporterTestCase doesn't create checksums file
if target directory does already exists (mkdirs returns false) in
method 'writeChecksumFile()'

ChecksumArtifactReporterTest doesn't remove
archiva-reports-standard/src/test/repository/checksumTest after
execution.

archiva-proxy :
ProxyRequestHandlerTest doesn't delete target jar in
testGetInSecondProxiedRepoFirstFailsDisabledCacheFailure and
testGetWhenInBothProxiedReposFirstHasExpiredCacheFailure. Doesn't fail
at first 'mvn install', but failed when 'mvn install' is invoked
twice, without 'mvn clean' between.

archiva-configuration :
ArchivaConfigurationTest doesn't reset
'org.apache.maven.archiva.localRepository' system property in
testGetConfigurationSystemOverride, making testGetConfiguration fail.

Joined patch made at trunk level.

Hoping it will be useful.

--
Julien.
Index: archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
===================================================================
--- archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java	(révision 509965)
+++ archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java	(copie de travail)
@@ -102,12 +102,22 @@
         ArchivaConfiguration archivaConfiguration =
             (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-configuration" );
 
-        System.setProperty( "org.apache.maven.archiva.localRepository", "system-repository" );
+        String oldLocalRepository = System.setProperty( "org.apache.maven.archiva.localRepository", "system-repository" );
 
         Configuration configuration = archivaConfiguration.getConfiguration();
 
         assertEquals( "check localRepository", "system-repository", configuration.getLocalRepository() );
         assertEquals( "check indexPath", ".index", configuration.getIndexPath() );
+
+        if (oldLocalRepository != null) 
+        {
+            System.setProperty( "org.apache.maven.archiva.localRepository", oldLocalRepository );
+        }
+        else
+        {
+            System.getProperties().remove( "org.apache.maven.archiva.localRepository" );
+        }
+
     }
 
     public void testStoreConfiguration()
Index: archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java
===================================================================
--- archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java	(révision 509965)
+++ archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java	(copie de travail)
@@ -445,7 +445,7 @@
         String path = "org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar";
         File expectedFile = new File( defaultManagedRepository.getBasedir(), path ).getAbsoluteFile();
 
-        assertFalse( expectedFile.exists() );
+        assertFalse( expectedFile.exists() && !expectedFile.delete() );
 
         proxiedRepository1 = createRepository( "proxied1", "test://..." );
         proxiedRepositories.clear();
@@ -479,7 +479,7 @@
         String path = "org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar";
         File expectedFile = new File( defaultManagedRepository.getBasedir(), path );
 
-        assertFalse( expectedFile.exists() );
+        assertFalse( expectedFile.exists() && !expectedFile.delete() );
 
         proxiedRepositories.clear();
         ProxiedArtifactRepository proxiedArtifactRepository = createProxiedRepository( proxiedRepository1 );
Index: archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java
===================================================================
--- archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java	(révision 509965)
+++ archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java	(copie de travail)
@@ -126,7 +126,7 @@
         //create the group level directory of the artifact
         File dirFiles = new File( repoUrl + relativePath + dirs );
 
-        if ( dirFiles.mkdirs() )
+        if ( dirFiles.exists() || dirFiles.mkdirs() )
         {
             // create a jar file
             String path = repoUrl + relativePath + dirs + "/" + filename + "." + type;
Index: archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java
===================================================================
--- archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java	(révision 509965)
+++ archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/ChecksumArtifactReporterTest.java	(copie de travail)
@@ -59,6 +59,13 @@
         reportingDatabase = new ReportingDatabase( reportGroup );
     }
 
+    public void tearDown() 
+        throws Exception
+    {
+        deleteTestDirectory( new File( repository.getBasedir() + "checksumTest" ) );
+        super.tearDown();
+    }
+
     /**
      * Test the ChecksumArtifactReportProcessor when the checksum files are valid.
      */

Reply via email to