From: <ssk...@vh...> - 2005-09-02 10:22:44
|
Author: sskracic Date: 2005-09-02 12:13:54 +0200 (Fri, 02 Sep 2005) New Revision: 738 Modified: ccm-core/trunk/test/src/com/redhat/persistence/ProtoTest.java ccm-core/trunk/test/src/com/redhat/persistence/SessionSuite.java ccm-core/trunk/test/src/com/redhat/persistence/oql/IdentityAdapter.java ccm-core/trunk/test/src/com/redhat/persistence/oql/MultiSet.java ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java ccm-core/trunk/test/src/com/redhat/persistence/oql/SelectParser.java Log: NFC: first pass at dropping wildcard import in tests. Modified: ccm-core/trunk/test/src/com/redhat/persistence/ProtoTest.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/ProtoTest.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/ProtoTest.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,18 +18,24 @@ */ package com.redhat.persistence; -import junit.framework.TestCase; -//import com.arsdigita.tools.junit.framework.BaseTestCase; - -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.engine.rdbms.*; -import com.redhat.persistence.pdl.PDL; import com.arsdigita.db.ConnectionManager; import com.arsdigita.db.DbHelper; -import java.util.*; -import java.math.*; -import java.sql.*; -import java.io.*; +import com.redhat.persistence.engine.rdbms.ConnectionSource; +import com.redhat.persistence.engine.rdbms.OracleWriter; +import com.redhat.persistence.engine.rdbms.PostgresWriter; +import com.redhat.persistence.engine.rdbms.RDBMSEngine; +import com.redhat.persistence.engine.rdbms.SQLWriter; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.pdl.PDL; +import java.io.FileReader; +import java.math.BigInteger; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.HashSet; +import junit.framework.TestCase; /** * ProtoTest Modified: ccm-core/trunk/test/src/com/redhat/persistence/SessionSuite.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/SessionSuite.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/SessionSuite.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,12 +18,22 @@ */ package com.redhat.persistence; -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.pdl.PDL; import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import java.util.*; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Model; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Role; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.pdl.PDL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import junit.framework.Test; import junit.framework.TestResult; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/IdentityAdapter.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/IdentityAdapter.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/IdentityAdapter.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,8 +18,9 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.PropertyMap; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.ObjectType; /** * IdentityAdapter Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/MultiSet.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/MultiSet.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/MultiSet.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,7 +18,10 @@ */ package com.redhat.persistence.oql; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; /** * MultiSet Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,27 +18,44 @@ */ package com.redhat.persistence.oql; -import com.arsdigita.db.*; -import com.arsdigita.util.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; -import com.redhat.persistence.*; -import com.redhat.persistence.common.*; -import com.redhat.persistence.engine.rdbms.*; -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.pdl.*; - +import com.arsdigita.db.DbHelper; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.util.Classes; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.jdbc.Connections; +import com.arsdigita.xml.XML; +import com.redhat.persistence.Engine; +import com.redhat.persistence.PropertyMap; +import com.redhat.persistence.QuerySource; +import com.redhat.persistence.Session; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.engine.rdbms.ConnectionSource; +import com.redhat.persistence.engine.rdbms.PostgresWriter; +import com.redhat.persistence.engine.rdbms.RDBMSEngine; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.pdl.PDL; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; +import java.util.Set; +import junit.extensions.*; +import junit.framework.*; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; -import junit.framework.*; -import junit.extensions.*; - -import java.math.*; -import java.sql.*; -import java.util.*; - /** * QuerySuite * Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java 2005-09-02 10:13:54 UTC (rev 738) @@ -19,14 +19,19 @@ package com.redhat.persistence.oql; import com.arsdigita.db.DbHelper; -import com.redhat.persistence.metadata.*; - +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Root; +import java.io.StringReader; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import junit.framework.*; - -import java.io.*; -import java.sql.*; -import java.util.*; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/SelectParser.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/SelectParser.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/SelectParser.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,16 +18,11 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.util.Assert; - -import java.util.Arrays; -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLParser; +import com.redhat.persistence.common.SQLToken; import java.io.StringReader; - import org.apache.log4j.Logger; /** |