[Jboss-svn-commits] JBL Code SVN: r1490 - in trunk/labs/kosmos: build src/test/hu/midori/kosmos/server/jira src/test/hu/midori/kosmos/server/svn

[<jbo...@li...>]

Author: aron.gombas
Date: 2005-11-03 04:30:47 -0500 (Thu, 03 Nov 2005)
New Revision: 1490

Modified:
   trunk/labs/kosmos/build/build.xml
   trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java
   trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java
Log:
Unit test hacking

Modified: trunk/labs/kosmos/build/build.xml
===================================================================
--- trunk/labs/kosmos/build/build.xml	2005-11-03 09:30:13 UTC (rev 1489)
+++ trunk/labs/kosmos/build/build.xml	2005-11-03 09:30:47 UTC (rev 1490)
@@ -31,6 +31,19 @@
   <property name="dist-bin.bin.dir" location="${dist-bin.dir}/${war.name}-expanded"/>
   <property name="dist-bin.classes.dir" location="${dist-bin.bin.dir}/WEB-INF/classes"/>
 
+  <property name="test-out.dir" location="testout"/>
+	
+  <path id="full.classpath">
+    <fileset dir="${web.dir}/WEB-INF/lib" includes="**/*.jar"/>
+  </path>
+	
+  <!-- additional tasks -->
+<!-- TODO what to do with this? now it doesn't run in Eclipse?!
+  <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+    <classpath refid="full.classpath"/>
+  </taskdef>
+-->
+	
   <!-- targets -->
   <target name="init">
     <echo message="============================================================"/>
@@ -40,15 +53,13 @@
     <tstamp>
       <format pattern="dd/MMM/yy HH:mm:ss" property="build.date"/>
     </tstamp>       
-    <path id="full.classpath">
-      <fileset dir="${web.dir}/WEB-INF/lib" includes="**/*.jar"/>
-    </path>
   </target>
 
   <target name="clean" depends="init" description="Cleans up temporary files created during previous builds">
     <delete dir="${dist.root.dir}"/>
     <delete dir="${dist-bin.root.dir}"/>
     <delete dir="${dist-src.root.dir}"/>
+    <delete dir="${test-out.dir}"/>
   </target>
 
   <target name="compile" depends="init" description="Compiles Java source files">
@@ -100,6 +111,24 @@
    
   <target name="redeploy" depends="undeploy,deploy" description="Redeploys the module to the container"/>
 	
+  <target name="junit" depends="init,clean,all" description="Runs the unit test suite">   	
+  	<mkdir dir="${test-out.dir}"/>
+    <junit printsummary="yes" haltonerror="yes" fork="yes">
+      <classpath>
+        <path refid="full.classpath"/>
+      	<path location="${dist-bin.classes.dir}"/>
+      </classpath>
+      <formatter type="plain"/>
+      <batchtest todir="${test-out.dir}">
+      	<fileset dir="${dist-bin.classes.dir}">
+      	  <include name="**/*Test.class"/>        	  
+          <exclude name="**/Abstract*Test.class"/>
+          <exclude name="**/CcTest.class"/>
+        </fileset>
+      </batchtest>
+    </junit>  	
+  </target>
+	
   <target name="dist-bin" depends="init,all" description="Prepares all binary distributables">
     <!-- pack to WAR -->
     <war destfile="${dist-bin.dir}/${war.name}" basedir="${dist-bin.bin.dir}" webxml="web-${module.name}/WEB-INF/web.xml"/>

Modified: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java
===================================================================
--- trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java	2005-11-03 09:30:13 UTC (rev 1489)
+++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java	2005-11-03 09:30:47 UTC (rev 1490)
@@ -35,7 +35,7 @@
 		assertEquals(0, service.getProjects("http://svn.jboss.com/jbossas").size());// TODO specify secured here
 		
 		// test secured with signing in
-		testDatabase("http://myusername@mypassword:xxx.yyy.zzz/myproject");// TODO
+		testDatabase("http://myusername:mypassword@xxx.yyy.zzz/myproject");// TODO
 	}
 
 	public void testApacheInstance() {		
@@ -55,7 +55,6 @@
 	}
 	
 	public void testCodeHausInstance() {		
-        testDatabase("http://jira.codehaus.org/browse/ACL");
         testDatabase("http://jira.codehaus.org/browse/ACTIVEIO");
         testDatabase("http://jira.codehaus.org/browse/AWS");
         testDatabase("http://jira.codehaus.org/browse/ASP");

Modified: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java
===================================================================
--- trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java	2005-11-03 09:30:13 UTC (rev 1489)
+++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java	2005-11-03 09:30:47 UTC (rev 1490)
@@ -31,10 +31,10 @@
 	/** Tests accessing secured repositories. */
 	public void testAuthentication() {
 		// test secured without signing in
-		assertEquals(0, service.getRepositories("http://svn.jboss.com/jbossas").size());// TODO specify secured here
+		assertEquals(0, service.getRepositories("https://svn.labs.jboss.com/trunk/labs/kosmos").size());// TODO specify secured here
 		
 		// test secured with signing in
-		testRepository("http://myusername@mypassword:xxx.yyy.zzz/myproject");// TODO
+		testRepository("https://myusername:myp...@sv.../trunk/labs/kosmos");// TODO
 	}
 
 	public void testApacheRepositories() {