[abbot-commits] SF.net SVN: abbot:[2802] abbot/branches/gdavison_update_deps

[<gda...@us...>]

Revision: 2802
          http://abbot.svn.sourceforge.net/abbot/?rev=2802&view=rev
Author:   gdavison
Date:     2011-08-26 08:55:54 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
Fix script collector to deal with commented out code.

Modified Paths:
--------------
    abbot/branches/gdavison_update_deps/projects/jdeveloper/Tests/Tests.jpr
    abbot/branches/gdavison_update_deps/src/junit/extensions/abbot/ScriptTestCollector.java

Modified: abbot/branches/gdavison_update_deps/projects/jdeveloper/Tests/Tests.jpr
===================================================================
--- abbot/branches/gdavison_update_deps/projects/jdeveloper/Tests/Tests.jpr	2011-08-25 17:27:36 UTC (rev 2801)
+++ abbot/branches/gdavison_update_deps/projects/jdeveloper/Tests/Tests.jpr	2011-08-26 08:55:54 UTC (rev 2802)
@@ -42,6 +42,8 @@
       <string v="oracle.adfdtinternal.model.ide.settings.ADFMSettings/adfmContentSet"/>
       <string v="oracle.bm.commonIde.data.project.ModelerProjectSettings/modelersContentSet"/>
       <string v="oracle.toplink.workbench.addin/toplinkContentSet"/>
+      <string v="oracle.abbot/abbotPaths"/>
+      <string v="oracle.mof.ide-tests/mofIdeTestsContentSet"/>
    </list>
    <value n="defaultPackage" v="abbot"/>
    <hash n="oracle.ide.model.DependencyConfiguration">
@@ -98,6 +100,7 @@
             <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
                <value n="tracingExclude" v="sun;sunw"/>
             </hash>
+            <url n="runDirectoryURL" path="../../../"/>
          </hash>
       </hash>
    </hash>

Modified: abbot/branches/gdavison_update_deps/src/junit/extensions/abbot/ScriptTestCollector.java
===================================================================
--- abbot/branches/gdavison_update_deps/src/junit/extensions/abbot/ScriptTestCollector.java	2011-08-25 17:27:36 UTC (rev 2801)
+++ abbot/branches/gdavison_update_deps/src/junit/extensions/abbot/ScriptTestCollector.java	2011-08-26 08:55:54 UTC (rev 2802)
@@ -138,6 +138,14 @@
 
     protected String classNameFromFile(String classFileName) {
         String name = classFileName; // super.classNameFromFile(classFileName);
-        return name.replace('/', '.');
+        String noclass;
+        if (name.endsWith(".class")) {
+            noclass = name.substring(0,name.length() - ".class".length());
+        }
+        else {
+            noclass = name;
+        }
+        String noslashes = noclass.replace('/', '.');
+        return noslashes;
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.