svn commit: r1085735 - in /ofbiz/trunk/framework: base/config/test-containers.xml base/testdef/basetests.xml component-load.xml

[adrianc]

Author: adrianc
Date: Sat Mar 26 15:11:00 2011
New Revision: 1085735

URL: http://svn.apache.org/viewvc?rev=1085735&view=rev
Log:
Fix framework/base tests that were not running. Patch from Bob Morley with a few changes by me - https://issues.apache.org/jira/browse/OFBIZ-3662.

Modified:
    ofbiz/trunk/framework/base/config/test-containers.xml
    ofbiz/trunk/framework/base/testdef/basetests.xml
    ofbiz/trunk/framework/component-load.xml

Modified: ofbiz/trunk/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=1085735&r1=1085734&r2=1085735&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Sat Mar 26 15:11:00 2011
@@ -220,11 +220,11 @@ under the License.
     </container>
 
     <!-- load JUnit test container -->
+    <!-- this is now run through the new testtools stuff
     <container name="junit-container" class="org.ofbiz.base.container.JunitContainer">
         <property name="base-test" value="org.ofbiz.base.test.BaseUnitTests"/>
-        <!-- this is now run through the new testtools stuff <property name="entity-test" value="org.ofbiz.entity.test.EntityTestSuite"/> -->
-        <!-- this is now run through the new testtools stuff <property name="service-test" value="org.ofbiz.service.test.ServiceEngineTests"/> -->
     </container>
+    -->
 
     <container name="testtools-container" class="org.ofbiz.testtools.TestRunContainer"/>
 </ofbiz-containers>

Modified: ofbiz/trunk/framework/base/testdef/basetests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/testdef/basetests.xml?rev=1085735&r1=1085734&r2=1085735&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/testdef/basetests.xml (original)
+++ ofbiz/trunk/framework/base/testdef/basetests.xml Sat Mar 26 15:11:00 2011
@@ -29,9 +29,10 @@
         <junit-test-suite class-name="org.ofbiz.base.util.collections.test.FlexibleMapAccessorTests"/>
         <junit-test-suite class-name="org.ofbiz.base.util.test.TimeDurationTests"/>
         <junit-test-suite class-name="org.ofbiz.base.util.cache.test.UtilCacheTests"/>
-        <junit-test-suite class-name="org.ofbiz.base.conversion.test.DateTimeTests.java"/>
-        <junit-test-suite class-name="org.ofbiz.base.conversion.test.MiscTests.java"/>
+        <junit-test-suite class-name="org.ofbiz.base.conversion.test.DateTimeTests"/>
+        <junit-test-suite class-name="org.ofbiz.base.conversion.test.MiscTests"/>
         <junit-test-suite class-name="org.ofbiz.base.concurrent.test.DepedencyPoolTests"/>
+        <junit-test-suite class-name="org.ofbiz.base.util.test.JSONTests"/>
         <junit-test-suite class-name="org.ofbiz.base.util.test.UtilIOTests"/>
         <junit-test-suite class-name="org.ofbiz.base.test.BaseUnitTests"/>
     </test-group>

Modified: ofbiz/trunk/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=1085735&r1=1085734&r2=1085735&view=diff
==============================================================================
--- ofbiz/trunk/framework/component-load.xml (original)
+++ ofbiz/trunk/framework/component-load.xml Sat Mar 26 15:11:00 2011
@@ -20,6 +20,7 @@ under the License.
 
 <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
+    <load-component component-location="base"/>
     <load-component component-location="geronimo"/>
     <load-component component-location="sql"/>
     <load-component component-location="entity"/>