svn commit: r925149 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test: resources/testng.properties testng/org/apache/archiva/web/test/ArtifactManagementTest.java

[mbaclay]

Author: mbaclay
Date: Fri Mar 19 09:13:31 2010
New Revision: 925149

URL: http://svn.apache.org/viewvc?rev=925149&view=rev
Log:
- modified the scripts to use a property file(testng.properties) for dotnet 
artifact's groupId, artifactId and version

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties?rev=925149&r1=925148&r2=925149&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
 Fri Mar 19 09:13:31 2010
@@ -85,6 +85,10 @@ PACKAGING1=jar
 ARTIFACTFILEPATH1=test
 REPOSITORYID1=internal
 
+GROUPID_DOTNETARTIFACT=dotNetTypes
+ARTIFACTID_DOTNETARTIFACT=dotNetTypes
+PACKAGING_DOTNETARTIFACT=library
+
 SNAPSHOT_GROUPID=org.apache.archiva
 SNAPSHOT_ARTIFACTID=archiva-test
 SNAPSHOT_VERSION=1.0-SNAPSHOT

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java?rev=925149&r1=925148&r2=925149&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
 Fri Mar 19 09:13:31 2010
@@ -96,15 +96,19 @@ public class ArtifactManagementTest
     @Test( groups = "requiresUpload" )
     public void testDotNetTypes()
     {
-        addArtifact( "dotNetTypes", "dotNetTypes", getVersion(), "library", 
getArtifactFilePath(),
+               String groupId = getProperty( "GROUPID_DOTNETARTIFACT" );
+               String artifactId = getProperty( "ARTIFACTID_DOTNETARTIFACT" );
+               String packaging = getProperty ( "PACKAGING_DOTNETARTIFACT" );
+               
+        addArtifact( groupId, artifactId, getVersion(), packaging, 
getArtifactFilePath(),
                      getRepositoryId() );
-        assertTextPresent( "Artifact 'dotNetTypes:dotNetTypes:1.0' was 
successfully deployed to repository 'internal'" );
-        getSelenium().open( baseUrl + "/browse/" + "dotNetTypes" + 
"/dotNetTypes/" + getVersion() );
+        assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + 
getVersion() + "' was successfully deployed to repository 'internal'" );
+        getSelenium().open( baseUrl + "/browse/" + groupId + "/" + artifactId 
+ "/" + getVersion() );
         waitPage();
 
         assertTextPresent( "<type>library</type>" );
         String basePath =
-            "/archiva/repository/internal/" + "dotNetTypes" + "/dotNetTypes/" 
+ getVersion() + "/dotNetTypes-" +
+            "/archiva/repository/internal/" + groupId + "/" + artifactId + "/" 
+ getVersion() + "/dotNetTypes-" +
                 getVersion();
         assertLinkPresent( ".NET Library" );
         assertElementPresent( "//a...@href='" + basePath + ".dll']" );