Author: sskracic Date: 2005-09-02 12:50:34 +0200 (Fri, 02 Sep 2005) New Revision: 743 Modified: ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/FilterTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/InitializerTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/LinkAttributeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java ccm-core/trunk/test/src/com/arsdigita/persistence/MetaTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/OIDTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/TransactionContextTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java ccm-core/trunk/test/src/com/arsdigita/search/ConfigTest.java ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchSuite.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBook.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java Log: NFC: more and more import tidying up. Modified: ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,20 +18,12 @@ */ package com.arsdigita.notification; - - -// ACS Core +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.OID; - -import com.arsdigita.domain.DataObjectNotFoundException; - -// JUnit classes import com.arsdigita.tools.junit.framework.BaseTestCase; - - /** * Test of RequestManager * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,12 +18,9 @@ */ package com.arsdigita.persistence; - import java.math.BigInteger; - import junit.extensions.*; import junit.framework.*; - import org.apache.log4j.varia.DenyAllFilter; import org.apache.log4j.varia.StringMatchFilter; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,6 +17,7 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.persistence.metadata.ObjectType; import junit.framework.*; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,19 +18,17 @@ */ package com.arsdigita.persistence; -import java.util.HashMap; -import java.util.Map; -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; +import com.arsdigita.persistence.metadata.Utilities; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; - -import com.arsdigita.persistence.metadata.Utilities; - +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,9 +18,9 @@ */ package com.arsdigita.persistence; +import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; -import java.math.BigDecimal; /** * DataQueryTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/FilterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/FilterTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/FilterTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,11 +18,11 @@ */ package com.arsdigita.persistence; +import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; import java.math.BigInteger; +import java.util.Iterator; import java.util.LinkedList; -import java.util.Iterator; -import com.arsdigita.persistence.metadata.ObjectType; /** * GenericDataObjectText Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/InitializerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/InitializerTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/InitializerTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,7 +19,6 @@ package com.arsdigita.persistence; import com.arsdigita.persistence.metadata.MetadataRoot; - import junit.framework.TestCase; import junit.framework.TestSuite; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/LinkAttributeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/LinkAttributeTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/LinkAttributeTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,10 +18,10 @@ */ package com.arsdigita.persistence; +import com.arsdigita.domain.DataObjectNotFoundException; import java.math.BigInteger; import java.util.Arrays; import org.apache.log4j.Logger; -import com.arsdigita.domain.DataObjectNotFoundException; /** * LinkAttributeTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,17 +18,15 @@ */ package com.arsdigita.persistence; +import com.arsdigita.db.DbHelper; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; -import com.arsdigita.db.DbHelper; - import java.io.Writer; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,16 +19,12 @@ package com.arsdigita.persistence; import com.arsdigita.logging.SecureLogFilter; - import java.io.StringWriter; -import java.io.StringWriter; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; - import junit.extensions.*; import junit.framework.*; - import org.apache.log4j.Category; import org.apache.log4j.Priority; import org.apache.log4j.TTCCLayout; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/MetaTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/MetaTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/MetaTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,6 +17,7 @@ * */ package com.arsdigita.persistence; + import junit.framework.Test; import junit.framework.TestSuite; import org.apache.log4j.Level; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,8 +21,8 @@ import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; +import com.arsdigita.persistence.pdl.PDL; import com.arsdigita.persistence.pdl.PDLException; -import com.arsdigita.persistence.pdl.PDL; import java.io.StringReader; import junit.framework.TestCase; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -20,10 +20,9 @@ import java.math.BigDecimal; import java.math.BigInteger; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; - +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/OIDTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/OIDTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/OIDTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,11 +18,10 @@ */ package com.arsdigita.persistence; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; +import junit.framework.TestCase; +import junit.framework.TestSuite; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,16 +17,16 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.persistence.metadata.DataType; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; import com.arsdigita.util.Assert; +import java.util.Iterator; +import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.Priority; -import org.apache.log4j.Level; -import java.util.Iterator; - /** * ObjectTypeValidator * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,9 +18,9 @@ */ package com.arsdigita.persistence; +import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import java.math.BigInteger; /** * ObserverTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,10 +17,11 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; +import java.util.Date; import junit.framework.*; -import java.util.Date; /* This is a utiliy class for creating an Order and a DataAssociation set of * LineItems. Used internally by testing classes. Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,10 +19,9 @@ package com.arsdigita.persistence; import java.math.BigDecimal; - +import java.sql.SQLException; import java.util.HashSet; import java.util.Set; -import java.sql.SQLException; /** * Test Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java 2005-09-02 10:50:34 UTC (rev 743) @@ -23,16 +23,13 @@ import com.arsdigita.persistence.pdl.PDL; import com.arsdigita.persistence.pdl.PDLOutputter; import com.redhat.persistence.engine.rdbms.RDBMSEngine; -import junit.framework.TestCase; - -import java.util.HashSet; -import java.util.Set; import java.io.File; import java.io.InputStream; - +import java.util.HashSet; +import java.util.Set; +import junit.framework.TestCase; import org.apache.log4j.Logger; - /** * PersistenceTestCase * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -20,9 +20,6 @@ import com.arsdigita.util.UncheckedWrapperException; import com.mockobjects.sql.*; - -import junit.framework.TestCase; - import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; @@ -33,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import junit.framework.TestCase; /** * PooledConnectionSourceTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,11 +17,11 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; - +import java.util.Iterator; import junit.framework.*; -import java.util.Iterator; import org.apache.log4j.*; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,12 +18,9 @@ */ package com.arsdigita.persistence; - import java.math.BigInteger; - import junit.extensions.*; import junit.framework.*; - import org.apache.log4j.Logger; import org.apache.log4j.varia.DenyAllFilter; import org.apache.log4j.varia.StringMatchFilter; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,7 +18,6 @@ */ package com.arsdigita.persistence; - /** * LinkAttributeTest * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,7 +18,6 @@ */ package com.arsdigita.persistence; - /** * NodeTest * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/TransactionContextTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/TransactionContextTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/TransactionContextTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,6 +17,7 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.tools.junit.framework.BaseTestCase; /* Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -22,9 +22,8 @@ import com.redhat.persistence.metadata.Constraint; import com.redhat.persistence.metadata.Table; import com.redhat.persistence.metadata.UniqueKey; - -import junit.framework.*; import java.util.ArrayList; +import junit.framework.*; public class ConstraintTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,6 +17,7 @@ * */ package com.arsdigita.persistence.metadata; + import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,8 +19,12 @@ package com.arsdigita.persistence.oql; import com.arsdigita.persistence.PersistenceTestCase; +import com.arsdigita.util.StringUtils; import com.redhat.persistence.Signature; import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; import com.redhat.persistence.oql.All; import com.redhat.persistence.oql.Define; import com.redhat.persistence.oql.Equals; @@ -31,17 +35,12 @@ import com.redhat.persistence.oql.Literal; import com.redhat.persistence.oql.Query; import com.redhat.persistence.oql.Variable; -import com.redhat.persistence.metadata.ObjectType; -import com.redhat.persistence.metadata.Root; -import com.redhat.persistence.metadata.Table; -import com.arsdigita.util.StringUtils; -import org.apache.log4j.Logger; - +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.IOException; import java.io.Reader; import java.util.StringTokenizer; +import org.apache.log4j.Logger; /** * QueryTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -23,10 +23,7 @@ import com.redhat.persistence.metadata.Role; import com.redhat.persistence.metadata.Root; import com.redhat.persistence.pdl.PDL; -import com.redhat.persistence.pdl.PDL; - import java.io.FileReader; - import junit.framework.TestCase; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,8 +19,8 @@ package com.arsdigita.persistence.pdl; import java.io.File; +import java.util.ArrayList; import java.util.Arrays; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,16 +19,16 @@ package com.arsdigita.persistence.pdl; import com.arsdigita.persistence.metadata.MetadataRoot; -import junit.framework.TestCase; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.StringTokenizer; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.io.LineNumberReader; +import junit.framework.TestCase; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -22,7 +22,6 @@ import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.util.Iterator; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,7 +18,6 @@ */ package com.arsdigita.persistence.tests.data; - import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; @@ -26,10 +25,8 @@ import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.util.Assert; - import org.apache.log4j.Logger; - /** * CRUDTestlet * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java 2005-09-02 10:50:34 UTC (rev 743) @@ -24,23 +24,21 @@ import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; +import com.arsdigita.util.Assert; +import com.arsdigita.util.UncheckedWrapperException; import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.Root; -import com.redhat.persistence.metadata.ObjectMap; import com.redhat.persistence.metadata.Column; import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.Root; import com.redhat.persistence.metadata.Value; -import com.arsdigita.util.Assert; -import com.arsdigita.util.UncheckedWrapperException; - -import org.apache.log4j.Logger; - import java.math.BigDecimal; import java.math.BigInteger; -import java.util.Date; -import java.util.Iterator; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Date; +import java.util.Iterator; +import org.apache.log4j.Logger; /** * The DataSource class will provide an arbitrary number of pseudorandom test Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,8 +21,6 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; - - import org.apache.log4j.Logger; public class DoubleUpdateTestlet extends Testlet { Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -20,7 +20,6 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; - /** * The MappingsTest class contains JUnit test cases for the various ways that * persistences supports mapping logical object hierarchy to a physical data Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,16 +18,14 @@ */ package com.arsdigita.persistence.tests.data; -import com.arsdigita.util.Assert; -import com.arsdigita.util.StringUtils; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; - +import com.arsdigita.util.Assert; +import com.arsdigita.util.StringUtils; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.Map.Entry; import java.util.Map; import java.util.Set; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,8 +21,6 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; - - import org.apache.log4j.Logger; public class PropertyIsolationTestlet extends Testlet { Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java 2005-09-02 10:50:34 UTC (rev 743) @@ -27,11 +27,9 @@ import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; import com.arsdigita.util.Assert; - +import java.util.Iterator; import org.apache.log4j.Logger; -import java.util.Iterator; - /** * Testlet * Modified: ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,12 +18,10 @@ */ package com.arsdigita.runtime; -// JUnit classes -import junit.framework.*; - import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; +import junit.framework.*; /** * RuntimeSuite Modified: ccm-core/trunk/test/src/com/arsdigita/search/ConfigTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/ConfigTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/ConfigTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,7 +21,6 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; import org.apache.log4j.Logger; - public class ConfigTest extends BaseTestCase { private static Logger s_log = Modified: ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,15 +18,13 @@ */ package com.arsdigita.search; +import com.arsdigita.persistence.metadata.MetadataRoot; +import com.arsdigita.search.filters.ObjectTypeFilterSpecification; +import com.arsdigita.search.filters.ObjectTypeFilterType; import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.util.Iterator; import org.apache.log4j.Logger; -import com.arsdigita.search.filters.ObjectTypeFilterType; -import com.arsdigita.search.filters.ObjectTypeFilterSpecification; -import com.arsdigita.persistence.metadata.MetadataRoot; - -import java.util.Iterator; - public class EngineTest extends BaseTestCase { private static Logger s_log = Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,21 +21,15 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.TransactionContext; import com.arsdigita.persistence.TestTransaction; - -import junit.framework.*; +import com.arsdigita.persistence.TransactionContext; +import java.math.BigDecimal; import java.util.Collection; import java.util.Iterator; import java.util.TreeSet; -import java.math.BigDecimal; - - - -// Support for Logging. +import junit.framework.*; import org.apache.log4j.Logger; - /** * Tests for SearchIndexHelpTest Class, used in search. * Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchSuite.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchSuite.java 2005-09-02 10:50:34 UTC (rev 743) @@ -23,8 +23,8 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; +import junit.framework.TestResult; import junit.framework.TestSuite; -import junit.framework.TestResult; /** * SearchSuite Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,16 +19,15 @@ package com.arsdigita.search.intermedia; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataObject; import com.arsdigita.domain.DomainObject; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; - /** * SearchTestAuthor class. Used to test generating XML documents * for related objects. Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBook.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBook.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBook.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,15 +19,14 @@ package com.arsdigita.search.intermedia; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObjectInstantiator; - +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; import java.math.BigDecimal; /** Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,15 +19,14 @@ package com.arsdigita.search.intermedia; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; - /** * SearchTestBookH class. Used to test generating XML documents * for related objects. |