Index: ssts-web/src/test/java/test/forgon/tools/IPAddressValidatorTests.java
===================================================================
diff -u -r16799 -r21807
--- ssts-web/src/test/java/test/forgon/tools/IPAddressValidatorTests.java	(.../IPAddressValidatorTests.java)	(revision 16799)
+++ ssts-web/src/test/java/test/forgon/tools/IPAddressValidatorTests.java	(.../IPAddressValidatorTests.java)	(revision 21807)
@@ -1,6 +1,7 @@
 package test.forgon.tools;
 
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 import org.testng.annotations.Test;
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java
===================================================================
diff -u -r16891 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java	(.../SterileLoadingManagerTests.java)	(revision 16891)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java	(.../SterileLoadingManagerTests.java)	(revision 21807)
@@ -3,7 +3,6 @@
 import static org.testng.Assert.assertNull;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
Index: ssts-web/src/test/java/test/forgon/tools/format/FormatStringTest.java
===================================================================
diff -u -r12335 -r21807
--- ssts-web/src/test/java/test/forgon/tools/format/FormatStringTest.java	(.../FormatStringTest.java)	(revision 12335)
+++ ssts-web/src/test/java/test/forgon/tools/format/FormatStringTest.java	(.../FormatStringTest.java)	(revision 21807)
@@ -1,6 +1,9 @@
 package test.forgon.tools.format;
 
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Date;
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/review/ComboTousseInstanceReviewTests.java
===================================================================
diff -u -r16891 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/review/ComboTousseInstanceReviewTests.java	(.../ComboTousseInstanceReviewTests.java)	(revision 16891)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/review/ComboTousseInstanceReviewTests.java	(.../ComboTousseInstanceReviewTests.java)	(revision 21807)
@@ -5,7 +5,6 @@
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.Rollback;
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/waitrecycling/action/InvoicePlanGeneratorAction.java
===================================================================
diff -u -r20797 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/waitrecycling/action/InvoicePlanGeneratorAction.java	(.../InvoicePlanGeneratorAction.java)	(revision 20797)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/waitrecycling/action/InvoicePlanGeneratorAction.java	(.../InvoicePlanGeneratorAction.java)	(revision 21807)
@@ -5,8 +5,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
@@ -16,11 +14,9 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
-import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
-import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager;
 import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.vo.TousseItemVo;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/SerialNumManagerTests.java
===================================================================
diff -u -r16909 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/SerialNumManagerTests.java	(.../SerialNumManagerTests.java)	(revision 16909)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/SerialNumManagerTests.java	(.../SerialNumManagerTests.java)	(revision 21807)
@@ -1,5 +1,5 @@
 package test.forgon.disinfectsystem.serialNumber.service;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
 
 import java.util.List;
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerTests.java
===================================================================
diff -u -r19155 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerTests.java	(.../TousseTransitionPlanManagerTests.java)	(revision 19155)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerTests.java	(.../TousseTransitionPlanManagerTests.java)	(revision 21807)
@@ -1,20 +1,22 @@
 package test.forgon.disinfectsystem.toussetransition.service;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import org.testng.annotations.Test;
 
+import test.forgon.constant.Constants;
+
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionPlan;
 import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionPlanItem;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
 
-import test.forgon.constant.Constants;
-import static org.testng.Assert.*;
-
 public class TousseTransitionPlanManagerTests extends TousseTransitionModelTestsBase {
 	
 	@Test
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java
===================================================================
diff -u -r19718 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java	(.../SterilizationRecordManagerTests.java)	(revision 19718)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java	(.../SterilizationRecordManagerTests.java)	(revision 21807)
@@ -1,12 +1,10 @@
 package test.forgon.disinfectsystem.packing;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,9 +14,7 @@
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
-import com.forgon.directory.model.OrgUnit;
 import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager;
-import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation;
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManagerTests.java
===================================================================
diff -u -r12331 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManagerTests.java	(.../RecyclingRecordTableManagerTests.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManagerTests.java	(.../RecyclingRecordTableManagerTests.java)	(revision 21807)
@@ -3,7 +3,6 @@
 import java.lang.Thread.State;
 
 import org.apache.log4j.Logger;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.testng.annotations.Test;
 
 import test.forgon.disinfectsystem.AbstractCSSDTest;
Index: ssts-web/src/test/java/test/forgon/tools/date/DateToolsTests.java
===================================================================
diff -u -r12331 -r21807
--- ssts-web/src/test/java/test/forgon/tools/date/DateToolsTests.java	(.../DateToolsTests.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/tools/date/DateToolsTests.java	(.../DateToolsTests.java)	(revision 21807)
@@ -1,13 +1,12 @@
 package test.forgon.tools.date;
 
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-
-
 import org.testng.annotations.Test;
 
 import com.forgon.tools.date.DateTools;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java
===================================================================
diff -u -r17704 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java	(.../ServiceManagerTests.java)	(revision 17704)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/service/ServiceManagerTests.java	(.../ServiceManagerTests.java)	(revision 21807)
@@ -1,10 +1,13 @@
 package test.forgon.disinfectsystem.webservice.service;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import net.sf.json.JSONObject;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
-import net.sf.json.JSONObject;
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
Index: ssts-web/src/test/java/test/forgon/tools/MathToolsTest.java
===================================================================
diff -u -r12331 -r21807
--- ssts-web/src/test/java/test/forgon/tools/MathToolsTest.java	(.../MathToolsTest.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/tools/MathToolsTest.java	(.../MathToolsTest.java)	(revision 21807)
@@ -1,6 +1,6 @@
 package test.forgon.tools;
 
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
 
 import org.testng.annotations.Test;
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/TestSerialNumManager.java
===================================================================
diff -u -r12331 -r21807
--- ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/TestSerialNumManager.java	(.../TestSerialNumManager.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/TestSerialNumManager.java	(.../TestSerialNumManager.java)	(revision 21807)
@@ -1,5 +1,5 @@
 package test.forgon.disinfectsystem.serialNumber.service;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
 
 import java.lang.Thread.State;