Author: brett
Date: Sat Oct 1 15:35:40 2011
New Revision: 1178020
URL: http://svn.apache.org/viewvc?rev=1178020&view=rev
Log:
correct text for dotnet-library type and re-enable Selenium test
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
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=1178020&r1=1178019&r2=1178020&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
Sat Oct 1 15:35:40 2011
@@ -98,7 +98,7 @@ public class ArtifactManagementTest
+ "' was successfully deployed to repository
'internal'" );
}
- @Test( groups = "requiresUpload", enabled = false )
+ @Test( groups = "requiresUpload" )
public void testDotNetTypes()
{
String groupId = getProperty( "GROUPID_DOTNETARTIFACT" );
@@ -115,7 +115,6 @@ public class ArtifactManagementTest
String basePath =
"/archiva/repository/internal/" + groupId + "/" + artifactId + "/"
+ getVersion() + "/" + artifactId + "-"
+ getVersion();
- // FIXME: currently broken - is dotnet-library
assertLinkPresent( ".NET Library" );
assertElementPresent( "//a[@href='" + basePath + ".dll']" );
assertElementPresent( "//a[@href='" + basePath + ".pom']" );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp?rev=1178020&r1=1178019&r2=1178020&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
Sat Oct 1 15:35:40 2011
@@ -187,7 +187,7 @@
<c:url var="imageUrl"
value="/images/download-type-other.png"/>
<c:set var="packageName">JavaDoc Archive</c:set>
</c:when>
- <c:when test="${a.type == 'library'}">
+ <c:when test="${a.type == 'library' || a.type ==
'dotnet-library'}">
<c:url var="imageUrl"
value="/images/download-type-other.png"/>
<c:set var="packageName">.NET Library</c:set>
</c:when>
