modified SourceForge auto-population to allow sf.net URL hosts, and

"/p/project-name" style API identification strings.
Signed-off-by: Neal Ensor <[email protected]>

Author: nensor

src/main/java/gov/osti/connectors/SourceForge.java

@@ -30,7 +30,7 @@ public class SourceForge implements ConnectorInterface {
     // the logger implementation
     private static final Logger log = LoggerFactory.getLogger(SourceForge.class);
     // pattern to match for PROJECT NAME
-    private static final Pattern PROJECT_NAME_PATTERN = Pattern.compile("/projects/(.*)$");
+    private static final Pattern PROJECT_NAME_PATTERN = Pattern.compile("/(?:p|projects)/([a-zA-Z0-9_-]+).*$");
 
     /**
      * initialize this Connector
@@ -46,6 +46,8 @@ public void init() throws IOException {
      * 
      * Assumes it contains "sourceforge.net" and the PATH contains the
      * "project/project-name" value.
+     * SF might also be of the form: sourceforge.net/p/project-name or sf.net/p/project-name
+     * for example.
      * 
      * @param url the URL to process
      * @return the PROJECT NAME if possible, or null if not
@@ -58,7 +60,8 @@ protected static String getProjectNameFromUrl(String url) {
 
             // protection against bad URL input
             if (null!=uri.getHost()) {
-                if (uri.getHost().contains("sourceforge.net")) {
+                if (uri.getHost().contains("sourceforge.net") ||
+                    uri.getHost().contains("sf.net")) {
                     // assume SourceForge path is formed by "/projects/project-name"
                     if (null==uri.getPath())
                         return null;

src/test/java/gov/osti/connectors/SourceForgeTest.java

@@ -36,10 +36,11 @@ public void tearDown() {
     }
 
     /**
-     * Test of getProjectNameFromUrl method, of class SourceForge.
+     * Test extraction of the project name from various SOURCEFORGE repository URLs.
      */
     @Test
     public void testGetProjectNameFromUrl() {
+        // these aren't recognized
         String[] badvalues = {
             "/projects/url",
             "sourceforge.com/projects/me",
@@ -52,8 +53,13 @@ public void testGetProjectNameFromUrl() {
             assertNull ("Found acceptable: " + value, SourceForge.getProjectNameFromUrl(value));
         }
 
+        assertEquals("arpa project name wrong", "arpa_project_x", SourceForge.getProjectNameFromUrl("https://svn.code.sf.net/p/arpa_project_x/code/trunk"));
+        
+        assertEquals("wrong niceproject", "niceproject", SourceForge.getProjectNameFromUrl("http://svn.code.sf.net/p/niceproject/code"));
+        assertEquals("Not ats", "ats-automatedtestingsystem", SourceForge.getProjectNameFromUrl("https://svn.code.sf.net/p/ats-automatedtestingsystem/code/"));
+        
         assertEquals("Matcher failed", "doecode", SourceForge.getProjectNameFromUrl("https://sourceforge.net/projects/doecode"));
-        assertEquals("Matcher failed", "doecode/", SourceForge.getProjectNameFromUrl("http://sourceforge.net/projects/doecode/"));
+        assertEquals("Matcher failed", "doecode", SourceForge.getProjectNameFromUrl("http://sourceforge.net/projects/doecode/"));
     }
 
 }