From: Brett Porter <brett@apache.org>
Date: Sat, 1 Oct 2011 15:35:40 +0000 (+0000)
Subject: correct text for dotnet-library type and re-enable Selenium test
X-Git-Tag: archiva-1.4-M1~113
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6fd8ff12c67b17a5742d40bf3205c56445855a82;p=archiva.git

correct text for dotnet-library type and re-enable Selenium test

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178020 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
index 038b0314d..b4156bb61 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
@@ -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']" );
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
index bd9e8d1f3..b5e479984 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
@@ -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>