From: <ssk...@vh...> - 2005-09-02 11:11:53
|
Author: sskracic Date: 2005-09-02 13:02:24 +0200 (Fri, 02 Sep 2005) New Revision: 745 Modified: ccm-core/trunk/test/src/com/arsdigita/util/EncodingTest.java ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java ccm-core/trunk/test/src/com/arsdigita/util/HtmlToTextTest.java ccm-core/trunk/test/src/com/arsdigita/util/HttpDummySession.java ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyResponse.java ccm-core/trunk/test/src/com/arsdigita/util/PriorityQueueTest.java ccm-core/trunk/test/src/com/arsdigita/util/StringUtilsTest.java ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java ccm-core/trunk/test/src/com/arsdigita/util/TreeTest.java ccm-core/trunk/test/src/com/arsdigita/util/URLRewriterTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java ccm-core/trunk/test/src/com/arsdigita/versioning/AdapterTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/EventTypeTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/IsolatedTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/LoggingListener.java ccm-core/trunk/test/src/com/arsdigita/versioning/ObjectTypeMetadataTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/ReentranceTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/TypesTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/Util.java ccm-core/trunk/test/src/com/arsdigita/versioning/VT4.java ccm-core/trunk/test/src/com/arsdigita/versioning/VersioningEventProcessorTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java ccm-core/trunk/test/src/com/arsdigita/web/TestApplication.java ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java ccm-core/trunk/test/src/com/arsdigita/web/WebSuite.java ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/ResourceRegistry.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDocument.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLException.java Log: NFC: yet more import cleanups. Modified: ccm-core/trunk/test/src/com/arsdigita/util/EncodingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/EncodingTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/EncodingTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,7 +19,6 @@ package com.arsdigita.util; import junit.framework.TestCase; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; - import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -24,7 +24,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; - import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/HtmlToTextTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/HtmlToTextTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/HtmlToTextTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,9 +18,9 @@ */ package com.arsdigita.util; -import junit.framework.TestCase; import java.io.BufferedReader; import java.io.FileReader; +import junit.framework.TestCase; /** * Verify the HTML-to-text conversion class. This unit test uses a Modified: ccm-core/trunk/test/src/com/arsdigita/util/HttpDummySession.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/HttpDummySession.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/HttpDummySession.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,10 +18,10 @@ */ package com.arsdigita.util; +import java.util.Enumeration; +import java.util.Hashtable; +import javax.servlet.ServletContext; import javax.servlet.http.HttpSessionContext; -import javax.servlet.ServletContext; -import java.util.Hashtable; -import java.util.Enumeration; public class HttpDummySession implements javax.servlet.http.HttpSession { Modified: ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,12 +19,6 @@ package com.arsdigita.util; import com.arsdigita.dispatcher.DispatcherHelper; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.io.UnsupportedEncodingException; import java.util.Enumeration; import java.util.HashMap; @@ -34,6 +28,11 @@ import java.util.Map; import java.util.Set; import java.util.Vector; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletInputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import org.apache.cactus.ServletURL; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyResponse.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyResponse.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyResponse.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,10 +18,10 @@ */ package com.arsdigita.util; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Cookie; import java.io.PrintStream; import java.io.PrintWriter; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletResponse; public class HttpServletDummyResponse implements HttpServletResponse { Modified: ccm-core/trunk/test/src/com/arsdigita/util/PriorityQueueTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/PriorityQueueTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/PriorityQueueTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,8 +18,8 @@ */ package com.arsdigita.util; +import java.util.NoSuchElementException; import junit.framework.TestCase; -import java.util.NoSuchElementException; public class PriorityQueueTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/util/StringUtilsTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/StringUtilsTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/StringUtilsTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,10 +18,8 @@ */ package com.arsdigita.util; -import junit.framework.TestCase; - import java.util.HashMap; - +import junit.framework.TestCase; import org.apache.log4j.Logger; public class StringUtilsTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,13 +18,13 @@ */ package com.arsdigita.util; +import java.io.IOException; +import java.util.HashMap; +import java.util.StringTokenizer; +import javax.servlet.*; import org.apache.cactus.ServletURL; import org.apache.log4j.Logger; -import javax.servlet.*; -import java.io.IOException; -import java.util.HashMap; -import java.util.StringTokenizer; /* * Created by IntelliJ IDEA. * User: jorris Modified: ccm-core/trunk/test/src/com/arsdigita/util/TreeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/TreeTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/TreeTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; - import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/URLRewriterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/URLRewriterTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/URLRewriterTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,12 +18,12 @@ */ package com.arsdigita.util; -import junit.framework.TestCase; -import java.util.Set; import java.util.HashSet; +import java.util.Iterator; import java.util.Map; -import java.util.Iterator; +import java.util.Set; import javax.servlet.http.HttpServletRequest; +import junit.framework.TestCase; public class URLRewriterTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,10 +18,9 @@ package com.arsdigita.util.url; -import junit.framework.TestCase; import com.arsdigita.util.StringUtils; - import java.util.Collection; +import junit.framework.TestCase; /** * URLCacheTest Modified: ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,14 +18,12 @@ package com.arsdigita.util.url; -import junit.framework.TestCase; - import java.io.FileInputStream; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.Reader; +import junit.framework.TestCase; - /** * URLPoolTest * Modified: ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,9 +18,9 @@ package com.arsdigita.util.url; -import com.arsdigita.tools.junit.framework.PackageTestSuite; import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; +import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; import org.apache.log4j.BasicConfigurator; Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/AdapterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/AdapterTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/AdapterTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,12 +20,10 @@ import com.arsdigita.persistence.OID; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Timestamp; import java.util.Date; - import org.apache.log4j.Logger; public class AdapterTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/EventTypeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/EventTypeTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/EventTypeTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -21,7 +21,6 @@ import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; import com.arsdigita.tools.junit.framework.BaseTestCase; - import org.apache.log4j.Logger; public class EventTypeTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/IsolatedTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/IsolatedTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/IsolatedTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -25,9 +25,7 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TestTransaction; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigInteger; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/LoggingListener.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/LoggingListener.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/LoggingListener.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,7 +19,6 @@ package com.arsdigita.versioning; import com.arsdigita.persistence.OID; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/ObjectTypeMetadataTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/ObjectTypeMetadataTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/ObjectTypeMetadataTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,11 +18,9 @@ */ package com.arsdigita.versioning; -import com.redhat.persistence.pdl.VersioningMetadata; import com.arsdigita.versioning.ObjectTypeMetadata; - +import com.redhat.persistence.pdl.VersioningMetadata; import junit.framework.TestCase; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,7 +20,6 @@ import java.util.Iterator; import java.util.NoSuchElementException; - import junit.framework.TestCase; public class QueueMapTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/ReentranceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/ReentranceTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/ReentranceTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -22,7 +22,6 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TestTransaction; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigInteger; import java.util.ArrayList; import java.util.List; Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/TypesTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/TypesTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/TypesTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -21,9 +21,7 @@ import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigInteger; - import org.apache.log4j.Logger; public class TypesTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/Util.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/Util.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/Util.java 2005-09-02 11:02:24 UTC (rev 745) @@ -23,8 +23,6 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.Assert; - - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/VT4.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/VT4.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/VT4.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,12 +20,10 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.SessionManager; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; - /** * A wrapper for the "VT4" object type. * Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/VersioningEventProcessorTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/VersioningEventProcessorTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/VersioningEventProcessorTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -26,14 +26,12 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TestTransaction; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.Arrays; import java.util.Date; import java.util.HashSet; import java.util.Set; - import org.apache.log4j.Logger; public class VersioningEventProcessorTest extends BaseTestCase Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java 2005-09-02 11:02:24 UTC (rev 745) @@ -22,7 +22,6 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import com.arsdigita.util.Assert; - import junit.framework.Test; /** Modified: ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,18 +20,17 @@ import com.arsdigita.domain.DomainObject; import com.arsdigita.kernel.ACSObjectInstantiator; -import com.arsdigita.web.Application; -import com.arsdigita.web.ApplicationSetup; import com.arsdigita.kernel.security.UserContext; import com.arsdigita.persistence.DataObject; import com.arsdigita.util.DummyServletConfig; -import org.apache.log4j.Logger; - +import com.arsdigita.web.Application; +import com.arsdigita.web.ApplicationSetup; +import java.io.IOException; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; +import org.apache.log4j.Logger; /** * Tests Application dispatching Modified: ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,11 +18,11 @@ package com.arsdigita.web; +import java.io.IOException; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import java.io.IOException; /** * Class DummyServlet Modified: ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -21,7 +21,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.tools.junit.framework.BaseTestCase; - public class HostTest extends BaseTestCase { public static final String TEST_HOST1 = "test-app01.example.com"; Modified: ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,14 +20,12 @@ import com.arsdigita.web.PathMapCache.LongestMatch; import com.arsdigita.web.PathMapCache.LongestMatchException; - -import junit.framework.TestCase; - import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import junit.framework.TestCase; /** * @author Vadim Nasardinov (va...@re...) Modified: ccm-core/trunk/test/src/com/arsdigita/web/TestApplication.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/TestApplication.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/TestApplication.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,9 +19,9 @@ package com.arsdigita.web; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.web.Application; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; +import com.arsdigita.web.Application; /* * Created by IntelliJ IDEA. Modified: ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,15 +18,13 @@ */ package com.arsdigita.web; -import junit.framework.TestCase; - -import java.util.HashMap; -import java.util.Map; - import com.arsdigita.kernel.security.UserContext; import com.arsdigita.util.HttpServletDummyRequest; import com.arsdigita.util.HttpServletDummyResponse; import com.arsdigita.util.StringUtils; +import java.util.HashMap; +import java.util.Map; +import junit.framework.TestCase; /** * Created by IntelliJ IDEA. Modified: ccm-core/trunk/test/src/com/arsdigita/web/WebSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/WebSuite.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/WebSuite.java 2005-09-02 11:02:24 UTC (rev 745) @@ -17,16 +17,10 @@ * */ package com.arsdigita.web; -/* -* Created by IntelliJ IDEA. -* User: jorris -* Date: Oct 14, 2002 -* Time: 5:30:26 PM -* To change this template use Options | File Templates. -*/ -import com.arsdigita.tools.junit.framework.PackageTestSuite; + import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; +import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; public class WebSuite extends PackageTestSuite { Modified: ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,13 +19,12 @@ package com.arsdigita.web; import com.arsdigita.tools.junit.framework.BaseTestCase; -import com.arsdigita.util.TestServletContainer; -import com.arsdigita.util.HttpServletDummyRequest; -import com.arsdigita.util.HttpServletDummyResponse; import com.arsdigita.util.DummyServletConfig; import com.arsdigita.util.DummyServletContext; +import com.arsdigita.util.HttpServletDummyRequest; +import com.arsdigita.util.HttpServletDummyResponse; +import com.arsdigita.util.TestServletContainer; - public class WebTestCase extends BaseTestCase { DispatcherServlet m_dispatcher; Modified: ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,11 +19,11 @@ package com.arsdigita.xml; import java.io.ByteArrayOutputStream; -import junit.framework.*; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.*; import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.*; import javax.xml.transform.stream.*; +import junit.framework.*; public class ACSJDOMTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,22 +18,21 @@ */ package com.arsdigita.xmlutil; -import org.jdom.JDOMException; -import org.jdom.Element; -import org.jdom.Document; -import org.jdom.output.XMLOutputter; -import org.jdom.input.SAXBuilder; -import org.jdom.input.JDOMFactory; -import org.apache.log4j.Logger; - -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import org.apache.log4j.Logger; +import org.jdom.Document; +import org.jdom.Element; +import org.jdom.JDOMException; +import org.jdom.input.JDOMFactory; +import org.jdom.input.SAXBuilder; +import org.jdom.output.XMLOutputter; public class DocImporter { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,12 +18,12 @@ */ package com.arsdigita.xmlutil; -import org.jdom.Namespace; +import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.KernelExcursion; -import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.Party; import com.arsdigita.kernel.PartyCollection; -import com.arsdigita.kernel.Party; import com.arsdigita.util.UncheckedWrapperException; +import org.jdom.Namespace; public abstract class PermissionsAction extends TestAction { public PermissionsAction(String name) { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/ResourceRegistry.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/ResourceRegistry.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/ResourceRegistry.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,9 +18,9 @@ */ package com.arsdigita.xmlutil; +import java.util.Iterator; +import java.util.LinkedList; import java.util.List; -import java.util.LinkedList; -import java.util.Iterator; public class ResourceRegistry { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,18 +18,16 @@ */ package com.arsdigita.xmlutil; +import com.arsdigita.util.StringUtils; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import org.apache.log4j.Logger; +import org.jdom.Document; import org.jdom.Element; import org.jdom.Namespace; -import org.jdom.Document; import org.jdom.input.JDOMFactory; -import org.apache.log4j.Logger; -import java.util.List; -import java.util.Iterator; -import java.util.LinkedList; - -import com.arsdigita.util.StringUtils; - public class TestDefinition extends Element { private static Logger s_log = Logger.getLogger(TestDefinition.class); Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDocument.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDocument.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDocument.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,9 +18,9 @@ */ package com.arsdigita.xmlutil; +import org.jdom.DocType; import org.jdom.Document; import org.jdom.Element; -import org.jdom.DocType; import org.jdom.input.JDOMFactory; /** Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,14 +18,13 @@ */ package com.arsdigita.xmlutil; -import org.jdom.input.DefaultJDOMFactory; -import org.jdom.*; -import org.apache.log4j.Logger; - -import java.util.Map; import java.util.HashMap; -import java.util.List; import java.util.Iterator; +import java.util.List; +import java.util.Map; +import org.apache.log4j.Logger; +import org.jdom.*; +import org.jdom.input.DefaultJDOMFactory; public abstract class TestJDOMFactory extends DefaultJDOMFactory { public TestJDOMFactory() throws JDOMException { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,17 +18,15 @@ */ package com.arsdigita.xmlutil; -import org.jdom.Namespace; -import org.jdom.Element; -import org.apache.log4j.Logger; - -import java.util.List; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.Iterator; import java.util.LinkedList; -import java.io.StringWriter; -import java.io.PrintWriter; +import java.util.List; +import org.apache.log4j.Logger; +import org.jdom.Element; +import org.jdom.Namespace; - public class TestSet extends Element { public static final String NAME = "test_set"; private static Logger s_log = Logger.getLogger(TestSet.class); Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLException.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLException.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLException.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,8 +18,8 @@ */ package com.arsdigita.xmlutil; +import org.jdom.Element; import org.jdom.JDOMException; -import org.jdom.Element; import org.jdom.output.XMLOutputter; public class XMLException extends JDOMException { |