Commits

Jonathan Doklovic committed 58a9ea8

UI fixes and JUnit3 fixed

Comments (0)

Files changed (6)

atlassian-plugins-osgi-testrunner-bundle/pom.xml

                 <version>${amps.version}</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <extractDependencies>false</extractDependencies>
                     <instructions>
                         <Bundle-Name>${artifactId}</Bundle-Name>
                         <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName>
             </plugin>
         </plugins>
     </build>
+    
 
 </project>

atlassian-plugins-osgi-testrunner-bundle/src/main/java/com/atlassian/plugins/osgi/test/util/TestClassUtils.java

 package com.atlassian.plugins.osgi.test.util;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
         Method[] methods = testClass.getMethods();
         for(Method m : methods)
         {
-            if(m.isAnnotationPresent(Test.class) && !m.isAnnotationPresent(Ignore.class))
+            if((m.isAnnotationPresent(Test.class) && !m.isAnnotationPresent(Ignore.class)) || (m.getName().startsWith("test") && Modifier.isPublic(m.getModifiers())))
             {
                 names.add(m.getName());
             }
         Method[] methods = testClass.getMethods();
         for(Method m : methods)
         {
-            if(m.isAnnotationPresent(Test.class))
+            if(m.isAnnotationPresent(Test.class)|| (m.getName().startsWith("test") && Modifier.isPublic(m.getModifiers())))
             {
                 names.add(m.getName());
             }

atlassian-plugins-osgi-testrunner-bundle/src/main/resources/css/it-test-console.css

     margin-top: 15px;
 }
 
+#testclass
+{
+    width: 50%;
+}
+
 .testconsole-test
 {
     background-color: green;

atlassian-plugins-osgi-testrunner-bundle/src/main/resources/it-test-console.properties

 it.test.console.version=Version
 it.test.console.description=Description
 it.test.console.no-tests=No tests found for bundle
+it.test.console.check-logs=Please check your log files, as your plugin or test plugin may not have loaded properly!
 it.test.console.choose-different-plugin=Choose a different test plugin
 it.test.console.wired=wired
 it.test.console.wired-title=Wired Integration Tests
 it.test.console.test-class=Test Class
 it.test.console.duration=Duration
 it.test.console.link.label=Plugins Test Console
-it.test.console.link.tooltip=UI to run tests in product
+it.test.console.link.tooltip=UI to run tests in product

atlassian-plugins-osgi-testrunner-bundle/src/main/resources/templates/it-test-error.vm

             <span class="aui-icon icon-error"></span>
             <strong>$i18n.getText("it.test.console.no-tests"): ${bundleSymbolicName}</strong>
         </p>
-
+        
+        <p>
+            $i18n.getText("it.test.console.check-logs")
+        </p>
         <p>
             <a class="choose-plugin-link" href="${contextPath}/plugins/servlet/it-test-console">$i18n.getText("it.test.console.choose-different-plugin")</a>
         </p>
         <junit3.version>3.8.2</junit3.version>
         <felix.version>3.0.2</felix.version>
         <osgi.manifest.version>1.0.0</osgi.manifest.version>
-        <amps.version>4.0</amps.version>
+        <amps.version>4.1-rc4</amps.version>
     </properties>
 
     <distributionManagement>