From: <ssk...@vh...> - 2005-09-02 10:52:24
|
Author: sskracic Date: 2005-09-02 12:43:19 +0200 (Fri, 02 Sep 2005) New Revision: 742 Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/KernelSuite.java ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserMassTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/MailMessageTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java ccm-core/trunk/test/src/com/arsdigita/messaging/MessageTestCase.java ccm-core/trunk/test/src/com/arsdigita/messaging/SortKeyTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/MetadataSuite.java ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java ccm-core/trunk/test/src/com/arsdigita/notification/ManagerDispatcher.java ccm-core/trunk/test/src/com/arsdigita/notification/NotificationSuite.java Log: NFC: more import tidying. Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -24,14 +24,13 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.metadata.ObjectType; -import org.apache.log4j.Logger; - import com.arsdigita.tools.junit.framework.BaseTestCase; -import junit.framework.Test; -import junit.framework.TestSuite; import java.math.BigDecimal; import java.sql.SQLException; import java.util.HashSet; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.apache.log4j.Logger; /** * Tests basic functionality of kernel classes Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,24 +18,18 @@ */ package com.arsdigita.kernel; -// JUnit Support. -import com.arsdigita.tools.junit.framework.BaseTestCase; - -// Domain object support. +import com.arsdigita.db.Sequences; import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObject; - -// Persistence Support. -import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.OID; -import com.arsdigita.db.Sequences; +import com.arsdigita.persistence.PersistenceException; +import com.arsdigita.tools.junit.framework.BaseTestCase; import java.math.BigDecimal; - -import java.util.Collection; import java.util.ArrayList; -import java.util.List; import java.util.Arrays; +import java.util.Collection; import java.util.Iterator; +import java.util.List; /** * Tests basic functionality of kernel classes Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/KernelSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/KernelSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/KernelSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -19,8 +19,8 @@ package com.arsdigita.kernel; import com.arsdigita.tools.junit.extensions.BaseTestSetup; +import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.extensions.PermissionDecorator; -import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,11 @@ */ package com.arsdigita.kernel; -// JUnit Support. -import com.arsdigita.tools.junit.framework.BaseTestCase; - -// Persistence Support. +import com.arsdigita.dispatcher.Dispatcher; import com.arsdigita.domain.DataObjectNotFoundException; - -// Logging Support. +import com.arsdigita.tools.junit.framework.BaseTestCase; import org.apache.log4j.Logger; -// dispatcher -import com.arsdigita.dispatcher.Dispatcher; - /** * Test cases for the PackageType class. * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,22 +18,18 @@ */ package com.arsdigita.kernel; -// JUnit Support. -import com.arsdigita.tools.junit.framework.BaseTestCase; -import junit.framework.Test; -import junit.framework.TestSuite; - -// Persistence Support. +import com.arsdigita.db.Sequences; +import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.OID; -import com.arsdigita.db.Sequences; +import com.arsdigita.tools.junit.framework.BaseTestCase; import java.math.BigDecimal; +import junit.framework.Test; +import junit.framework.TestSuite; -import com.arsdigita.domain.DomainObjectFactory; - /** * Tests basic functionality of kernel classes * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,14 @@ */ package com.arsdigita.kernel; -import com.arsdigita.kernel.permissions.PrivilegeDescriptor; - import com.arsdigita.domain.DataObjectNotFoundException; - - +import com.arsdigita.kernel.permissions.PrivilegeDescriptor; import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.util.ArrayList; +import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import java.util.ArrayList; -import java.util.Iterator; - /** * Test that roles work well with the permissions system * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,15 @@ */ package com.arsdigita.kernel; -import com.arsdigita.domain.DataObjectNotFoundException; - import com.arsdigita.db.Sequences; +import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.Filter; - import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.math.BigDecimal; +import java.sql.SQLException; import junit.framework.Test; import junit.framework.TestSuite; -import java.math.BigDecimal; -import java.sql.SQLException; - /** * Basic unit tests on Roles * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,13 @@ */ package com.arsdigita.kernel; -// JUnit Support. -import com.arsdigita.tools.junit.framework.BaseTestCase; - -// Persistence Support. import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; +import com.arsdigita.tools.junit.framework.BaseTestCase; import java.math.BigDecimal; - -// Logging Support. import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,16 +18,14 @@ */ package com.arsdigita.kernel; - -import com.arsdigita.tools.junit.framework.BaseTestCase; -import org.apache.log4j.Logger; -import java.util.Set; -import java.util.HashSet; - +import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.Session; import com.arsdigita.persistence.pdl.PDL; +import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.util.HashSet; +import java.util.Set; +import org.apache.log4j.Logger; /** * Tests basic functionality of kernel classes Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,21 +18,15 @@ */ package com.arsdigita.kernel; +import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; - - -import com.arsdigita.domain.DataObjectNotFoundException; - import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.math.BigDecimal; import junit.framework.Test; import junit.framework.TestSuite; -import java.math.BigDecimal; - -// Logging Support. - /** * Tests basic functionality of the UserAuthentication class * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java 2005-09-02 10:43:19 UTC (rev 742) @@ -19,13 +19,11 @@ package com.arsdigita.kernel; import com.arsdigita.db.Sequences; - import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.sql.SQLException; import junit.framework.Test; import junit.framework.TestSuite; -import java.sql.SQLException; - /** * Tests basic functionality of the UserAuthentication class * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/UserMassTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/UserMassTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/UserMassTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -19,13 +19,11 @@ package com.arsdigita.kernel; import com.arsdigita.db.Sequences; - import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.sql.SQLException; import junit.framework.Test; import junit.framework.TestSuite; -import java.sql.SQLException; - /** * Tests that we can create and modify lots of users without running * out of memory. Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,29 +18,28 @@ */ package com.arsdigita.kernel; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.Session; -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.metadata.ObjectType; +import com.arsdigita.db.Sequences; import com.arsdigita.kernel.EmailAddress; -import com.arsdigita.kernel.GroupCollection; import com.arsdigita.kernel.Group; +import com.arsdigita.kernel.GroupCollection; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.PersonName; -import com.arsdigita.kernel.UserCollection; import com.arsdigita.kernel.User; -import com.arsdigita.db.Sequences; -import org.apache.log4j.Logger; - +import com.arsdigita.kernel.UserCollection; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.tools.junit.framework.BaseTestCase; -import junit.framework.Test; -import junit.framework.TestSuite; import java.sql.SQLException; -import java.util.List; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.apache.log4j.Logger; /** * Tests basic functionality of kernel classes Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -21,23 +21,22 @@ import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.EmailAddress; import com.arsdigita.kernel.Group; -import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.PersonName; import com.arsdigita.kernel.User; -import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; +import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.UncheckedWrapperException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.log4j.Logger; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * Tests that the permissioning service works correctly regardless of the * ordering of particular actions (such as granting to a group, adding a Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -20,31 +20,25 @@ import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.Group; -import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.kernel.GroupTest; import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.kernel.PartyCollection; -import com.arsdigita.kernel.User; import com.arsdigita.kernel.RoleTest; -import com.arsdigita.kernel.GroupTest; - - - -import com.arsdigita.persistence.PersistenceException; -import com.arsdigita.persistence.OID; +import com.arsdigita.kernel.User; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; - - import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.UncheckedWrapperException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import java.util.HashSet; -import java.util.Collection; -import java.util.Iterator; - /** * Tests basic functionality of the PermissionService class * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -21,7 +21,6 @@ import java.security.GeneralSecurityException; import java.security.SecureRandom; import javax.crypto.Mac; - import junit.framework.*; public class CredentialTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -19,7 +19,6 @@ package com.arsdigita.kernel.security; import com.arsdigita.initializer.InitializationException; - import java.util.Arrays; import java.util.List; import javax.security.auth.login.*; Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,10 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.TestCase; - -// Java Core classes -import javax.mail.*; import javax.activation.*; +import javax.mail.*; import javax.mail.internet.*; +import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,11 +18,8 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.TestCase; - import javax.mail.*; - +import junit.framework.TestCase; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,10 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.TestCase; - -// Java Core classes -import javax.mail.*; import javax.activation.*; +import javax.mail.*; import javax.mail.internet.*; +import junit.framework.TestCase; /** * Unit tests for the ACS Mail service MailQueue class. Currently Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,10 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.*; - -// aD extensions import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; +import junit.framework.*; /** * MailSuite Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,16 +18,13 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.TestCase; - -// Java Core classes +import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import java.io.File; -import javax.mail.*; import javax.activation.*; +import javax.mail.*; import javax.mail.internet.*; +import junit.framework.TestCase; /** * Unit tests for the ACS Mail service. Note that these tests only Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,10 +18,10 @@ */ package com.arsdigita.messaging; +import com.arsdigita.domain.DataObjectNotFoundException; +import java.io.File; import java.util.Iterator; -import java.io.File; import javax.activation.DataHandler; -import com.arsdigita.domain.DataObjectNotFoundException; /** * Test cases for attachments. Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MailMessageTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MailMessageTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MailMessageTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,8 @@ */ package com.arsdigita.messaging; -// ACS Mail import com.arsdigita.mail.Mail; import com.arsdigita.mail.SimpleServer; - -// ACS Core - -// Java import java.util.Iterator; /** Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,7 +18,6 @@ */ package com.arsdigita.messaging; -// Java core classes import java.net.URL; import javax.activation.*; Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,14 +18,11 @@ */ package com.arsdigita.messaging; -// JUnit classes -import junit.framework.*; - -// aD extensions import com.arsdigita.tools.junit.extensions.BaseTestSetup; -import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.extensions.CoreTestSetup; +import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.framework.PackageTestSuite; +import junit.framework.*; /** * Messaging test suite. Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MessageTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MessageTestCase.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MessageTestCase.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,10 @@ */ package com.arsdigita.messaging; -// ACS core -import com.arsdigita.kernel.Party; -import com.arsdigita.kernel.User; import com.arsdigita.kernel.EmailAddress; +import com.arsdigita.kernel.Party; import com.arsdigita.kernel.PersonName; - -// JUnit classes +import com.arsdigita.kernel.User; import com.arsdigita.tools.junit.framework.BaseTestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/SortKeyTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/SortKeyTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/SortKeyTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,7 +18,6 @@ */ package com.arsdigita.messaging; -// JUnit classes import com.arsdigita.tools.junit.framework.BaseTestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -22,8 +22,8 @@ import com.arsdigita.kernel.EmailAddress; import com.arsdigita.kernel.PersonName; import com.arsdigita.kernel.User; +import com.arsdigita.tools.junit.framework.BaseTestCase; import java.util.Date; -import com.arsdigita.tools.junit.framework.BaseTestCase; public class ThreadTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,24 +18,24 @@ */ package com.arsdigita.metadata; -import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.JoinThrough; -import com.arsdigita.persistence.metadata.ObjectType; -import com.arsdigita.persistence.metadata.Property; -import com.arsdigita.persistence.metadata.Association; -import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.DataAssociation; import com.arsdigita.persistence.DataAssociationCursor; +import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.PersistenceException; -import java.util.List; +import com.arsdigita.persistence.metadata.Association; +import com.arsdigita.persistence.metadata.MetadataRoot; +import com.arsdigita.persistence.metadata.ObjectType; +import com.arsdigita.persistence.metadata.Property; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.JoinThrough; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Iterator; -import java.math.BigDecimal; +import java.util.List; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,33 +18,33 @@ */ package com.arsdigita.metadata; -import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.Root; -import com.redhat.persistence.metadata.JoinThrough; -import com.redhat.persistence.metadata.Table; -import com.redhat.persistence.metadata.Column; -import com.redhat.persistence.metadata.ObjectMap; -import com.redhat.persistence.metadata.Mapping; -import com.redhat.persistence.metadata.Value; -import com.arsdigita.persistence.metadata.CompoundType; -import com.arsdigita.persistence.metadata.ObjectType; -import com.arsdigita.persistence.metadata.Property; -import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.metadata.Utilities; -import com.arsdigita.persistence.metadata.Model; -import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.DataAssociation; import com.arsdigita.persistence.DataAssociationCursor; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.PersistenceException; +import com.arsdigita.persistence.metadata.CompoundType; +import com.arsdigita.persistence.metadata.MetadataRoot; +import com.arsdigita.persistence.metadata.Model; +import com.arsdigita.persistence.metadata.ObjectType; +import com.arsdigita.persistence.metadata.Property; +import com.arsdigita.persistence.metadata.Utilities; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.Value; +import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Iterator; import java.util.Collection; import java.util.Date; -import java.math.BigDecimal; +import java.util.Iterator; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/MetadataSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/MetadataSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/MetadataSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -17,6 +17,7 @@ * */ package com.arsdigita.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/metadata/PersistenceTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,14 +18,13 @@ */ package com.arsdigita.metadata; -import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.pdl.PDL; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import junit.framework.*; - +import com.arsdigita.persistence.metadata.MetadataRoot; +import com.arsdigita.persistence.pdl.PDL; import java.util.HashSet; import java.util.Set; +import junit.framework.*; /** * PersistenceTestCase Modified: ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,27 +18,24 @@ */ package com.arsdigita.mimetypes; -import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.Session; +import com.arsdigita.db.DbHelper; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.mimetypes.converters.ConvertFormat; -import com.arsdigita.mimetypes.converters.PreConvertHTML; import com.arsdigita.mimetypes.converters.PostConvertHTML; - +import com.arsdigita.mimetypes.converters.PreConvertHTML; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.Session; import com.arsdigita.tools.junit.framework.BaseTestCase; -import java.math.BigDecimal; -import java.lang.Process; -import java.lang.Runtime; +import com.arsdigita.util.StringUtils; import java.io.BufferedReader; import java.io.FileInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.IOException; +import java.lang.Process; +import java.lang.Runtime; +import java.math.BigDecimal; -import com.arsdigita.util.StringUtils; -import com.arsdigita.db.DbHelper; - - /** * Test interMedia INSO filter converting of documents * to html. Modified: ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,12 @@ */ package com.arsdigita.notification; -// ACS Core import com.arsdigita.kernel.User; +import com.arsdigita.mail.SimpleServer; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; - -// JUnit classes import com.arsdigita.tools.junit.framework.BaseTestCase; -// ACS mail -import com.arsdigita.mail.SimpleServer; - - /** * Test of DigestQueueManager, similar to SimpleQueueManagerTest. * Modified: ccm-core/trunk/test/src/com/arsdigita/notification/ManagerDispatcher.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/ManagerDispatcher.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/notification/ManagerDispatcher.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,10 +18,9 @@ */ package com.arsdigita.notification; -import java.util.TimerTask; import java.util.Date; +import java.util.TimerTask; - /** * This class serves as a container for a TimerTask that can be * dispatched at any time. After creation, the first run is invoked Modified: ccm-core/trunk/test/src/com/arsdigita/notification/NotificationSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/NotificationSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/notification/NotificationSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -30,13 +30,11 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import junit.framework.Test; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.ListIterator; +import junit.framework.Test; - /** * Test Suite for Notifiction. Besides the standard jobs of the TestSuite file, this * class provides factory methods for <code>User</code>, <code>Notification</code>, |