[jboss-svn-commits] JBoss Portal SVN: r5299 - in trunk/cms: . src/main/org/jboss/portal/test/cms/commands src/resources/test

[jboss-svn-commits at lists.jboss.org]

Author: sohil.shah at jboss.com
Date: 2006-09-29 19:45:48 -0400 (Fri, 29 Sep 2006)
New Revision: 5299

Modified:
   trunk/cms/build.xml
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java
   trunk/cms/src/resources/test/pm-cache.xml
Log:
re-enabled cms tests.

Modified: trunk/cms/build.xml
===================================================================
--- trunk/cms/build.xml	2006-09-29 22:18:44 UTC (rev 5298)
+++ trunk/cms/build.xml	2006-09-29 23:45:48 UTC (rev 5299)
@@ -347,17 +347,14 @@
    </target>
    <target name="tests" depends="init">
       <execute-tests>
-         <x-test>
+         <x-test>	
 			<!-- general cms setup related tests -->
-            <!--test todir="${test.reports}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/>
-			<test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRegEx"/-->
+	        <test todir="${test.reports}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/>
+	        <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/>
+			<test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRegEx"/>
+			<test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryUtil"/>
 	
-	        <!-- repository utility tests -->
-            <!--test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryUtil"/-->
-	
-	        <!-- cms file command tests -->
-      		<!--test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileDelete"/>			
+	        <!-- cms file command tests -->      		
       		<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreate"/>
       		<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileUpdate"/>
       		<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileArchiveUpload"/>			
@@ -365,14 +362,15 @@
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetVersion"/>
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetList"/>
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCopy"/>			
-			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreateFailed"/-->
+			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreateFailed"/>
+			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileDelete"/>			
 	
 	        <!-- cms folder command tests -->
-			<!--test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCopy"/>            
+			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCopy"/>            
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCreate"/>            
             <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/>            			
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/>            			
-			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/--> 		        
+			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/> 		        
          </x-test>
          <x-classpath>
             <path refid="apache.logging.classpath"/>

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java	2006-09-29 22:18:44 UTC (rev 5298)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java	2006-09-29 23:45:48 UTC (rev 5299)
@@ -55,8 +55,6 @@
     {       
        super.setUp();
        
-       
-
        LoaderResource res = new CLLoader().getResource("jcr/repository.xml");
        Document config = res.asDocument(XML.getDocumentBuilderFactory().newDocumentBuilder());
 
@@ -68,7 +66,7 @@
        service.setConfig(config.getDocumentElement());
        service.setRepositoryName("repo");
        service.setHomeDir("repotest");
-       service.start();
+       service.startService();
     }
 
     /**
@@ -76,7 +74,7 @@
      */
     public void tearDown() throws Exception
     {
-       service.stop();      
+       service.stopService();      
        super.tearDown();
     }
 }

Modified: trunk/cms/src/resources/test/pm-cache.xml
===================================================================
--- trunk/cms/src/resources/test/pm-cache.xml	2006-09-29 22:18:44 UTC (rev 5298)
+++ trunk/cms/src/resources/test/pm-cache.xml	2006-09-29 23:45:48 UTC (rev 5299)
@@ -85,8 +85,7 @@
                     being broken with multicast (even after disabling media sense)
                     set the loopback attribute to true -->
                    <UDP mcast_addr="228.1.2.3" mcast_port="48866"
-                       ip_ttl="64" ip_mcast="true" 
-                       receive_on_all_interfaces="true"
+                       ip_ttl="64" ip_mcast="true"                       
                        mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
                        ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
                        loopback="false"/>