svn commit: r1635907 - in /ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools: EntityXmlAssertTest.java JunitSuiteWrapper.java TestListContainer.java TestRunContainer.java

[adrianc]

Author: adrianc
Date: Sat Nov  1 09:31:51 2014
New Revision: 1635907

URL: http://svn.apache.org/r1635907
Log:
Remove Javolution from the trsttools component.

Modified:
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java

Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java?rev=1635907&r1=1635906&r2=1635907&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java Sat Nov  1 09:31:51 2014
@@ -19,9 +19,9 @@
 package org.ofbiz.testtools;
 
 import java.net.URL;
+import java.util.LinkedList;
 import java.util.List;
 
-import javolution.util.FastList;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestResult;
 
@@ -72,7 +72,7 @@ public class EntityXmlAssertTest extends
 
         try {
             URL entityXmlURL = FlexibleLocation.resolveLocation(entityXmlUrlString);
-            List<Object> errorMessages = FastList.newInstance();
+            List<Object> errorMessages = new LinkedList<Object>();
 
             if ("assert".equals(this.action)) {
                 EntityDataAssert.assertData(entityXmlURL, delegator, errorMessages);

Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java?rev=1635907&r1=1635906&r2=1635907&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JunitSuiteWrapper.java Sat Nov  1 09:31:51 2014
@@ -18,9 +18,9 @@
  *******************************************************************************/
 package org.ofbiz.testtools;
 
+import java.util.LinkedList;
 import java.util.List;
 
-import javolution.util.FastList;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -38,7 +38,7 @@ public class JunitSuiteWrapper {
 
     public static final String module = JunitSuiteWrapper.class.getName();
 
-    protected List<ModelTestSuite> modelTestSuiteList = FastList.newInstance();
+    protected List<ModelTestSuite> modelTestSuiteList = new LinkedList<ModelTestSuite>();
 
     public JunitSuiteWrapper(String componentName, String suiteName, String testCase) {
         for (ComponentConfig.TestSuiteInfo testSuiteInfo: ComponentConfig.getAllTestSuiteInfos(componentName)) {
@@ -79,7 +79,7 @@ public class JunitSuiteWrapper {
     }
 
     public List<Test> getAllTestList() {
-        List<Test> allTestList = FastList.newInstance();
+        List<Test> allTestList = new LinkedList<Test>();
 
         for (ModelTestSuite modelTestSuite: this.modelTestSuiteList) {
             for (Test tst: modelTestSuite.getTestList()) {

Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java?rev=1635907&r1=1635906&r2=1635907&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java Sat Nov  1 09:31:51 2014
@@ -22,11 +22,9 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.lang.String;
+import java.util.LinkedList;
 import java.util.List;
 
-import javolution.util.FastList;
-
 import org.ofbiz.base.component.ComponentConfig;
 import org.ofbiz.base.config.GenericConfigException;
 import org.ofbiz.base.config.ResourceHandler;
@@ -72,7 +70,7 @@ public class TestListContainer implement
     }
 
     public boolean start() throws ContainerException {
-        List<FoundTest> foundTests = FastList.newInstance();
+        List<FoundTest> foundTests = new LinkedList<FoundTest>();
         for (ComponentConfig.TestSuiteInfo testSuiteInfo: ComponentConfig.getAllTestSuiteInfos(null)) {
             String componentName = testSuiteInfo.getComponentConfig().getComponentName();
             ResourceHandler testSuiteResource = testSuiteInfo.createResourceHandler();

Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java?rev=1635907&r1=1635906&r2=1635907&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Sat Nov  1 09:31:51 2014
@@ -22,11 +22,10 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
-import java.lang.String;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Map;
 
-import javolution.util.FastMap;
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -205,7 +204,7 @@ public class TestRunContainer implements
 
     class JunitXmlListener extends XMLJUnitResultFormatter {
 
-        Map<String, Long> startTimes = FastMap.newInstance();
+        Map<String, Long> startTimes = new HashMap<String, Long>();
 
         public JunitXmlListener(OutputStream out) {
             this.setOutput(out);