Author: brett
Date: Fri Feb 12 13:36:08 2010
New Revision: 909402
URL: http://svn.apache.org/viewvc?rev=909402&view=rev
Log:
make sure we always use a valid path in the upload form
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java?rev=909402&r1=909401&r2=909402&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
Fri Feb 12 13:36:08 2010
@@ -48,10 +48,6 @@
@Test(groups = {"requiresUpload"})
public void testCorrectRepositoryInBrowse()
{
- File artifact =
- new File( getBasedir(),
-
"/src/test/it-resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar"
);
-
String releasesRepo = getProperty( "RELEASES_REPOSITORY" );
// create releases repository first
@@ -64,10 +60,10 @@
String snapshotsRepo = getProperty( "SNAPSHOTS_REPOSITORY" );
+ String path =
"src/test/it-resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
// TODO: do this differently as uploading doesn't work on browsers
other than *chrome (below as well)
// upload a snapshot artifact to repository 'releases'
- addArtifact( "archiva", "archiva-webapp", "1.0-SNAPSHOT", "jar",
artifact.getPath(),
- releasesRepo );
+ addArtifact( "archiva", "archiva-webapp", "1.0-SNAPSHOT", "jar", path,
releasesRepo );
assertTextPresent( "Artifact 'archiva:archiva-webapp:1.0-SNAPSHOT' was
successfully deployed to repository '" + releasesRepo + "'" );
goToBrowsePage();
@@ -77,8 +73,7 @@
assertArtifactInfoPage( "1.0-SNAPSHOT/", releasesRepo, "archiva",
"archiva-webapp", "1.0-SNAPSHOT", "jar" );
// upload a snapshot artifact to repository 'snapshots'
- addArtifact( "continuum", "continuum-core", "1.0-SNAPSHOT", "jar",
artifact.getPath(),
- snapshotsRepo );
+ addArtifact( "continuum", "continuum-core", "1.0-SNAPSHOT", "jar",
path, snapshotsRepo );
assertTextPresent( "Artifact 'continuum:continuum-core:1.0-SNAPSHOT'
was successfully deployed to repository '" + snapshotsRepo + "'" );
goToBrowsePage();
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=909402&r1=909401&r2=909402&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
Fri Feb 12 13:36:08 2010
@@ -1,6 +1,7 @@
package org.apache.archiva.web.test.parent;
import java.io.File;
+import java.io.IOException;
import org.apache.archiva.web.test.XPathExpressionUtil;
@@ -495,7 +496,25 @@
checkField( "generatePom" );
}
- setFieldValue( "artifact", artifactFilePath );
+ String path;
+ if ( artifactFilePath != null && artifactFilePath.trim().length() > 0 )
+ {
+ File f = new File( artifactFilePath );
+ try
+ {
+ path = f.getCanonicalPath();
+ }
+ catch ( IOException e )
+ {
+ path = f.getAbsolutePath();
+ }
+ }
+ else
+ {
+ path = artifactFilePath;
+ }
+
+ setFieldValue( "artifact", path );
setFieldValue( "repositoryId", repositoryId );
clickButtonWithValue( "Submit" );
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java?rev=909402&r1=909401&r2=909402&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
Fri Feb 12 13:36:08 2010
@@ -1,8 +1,6 @@
package org.apache.archiva.web.test.parent;
-import java.io.*;
-
-public abstract class AbstractArtifactManagementTest
+public abstract class AbstractArtifactManagementTest
extends AbstractArchivaTest
{
@@ -32,15 +30,7 @@
public String getArtifactFilePath()
{
- File f = new File(
"src/test/it-resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar"
);
- try
- {
- return f.getCanonicalPath();
- }
- catch ( IOException e )
- {
- return f.getAbsolutePath();
- }
+ return
"src/test/it-resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
}
public String getRepositoryId()
