Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r26085 -r26131
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 26085)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 26131)
@@ -1,12 +1,16 @@
 package test.forgon.disinfectsystem.selenium;
 
+import static org.junit.Assert.fail;
+
 import java.io.File;
 import java.io.FilenameFilter;
 import java.text.SimpleDateFormat;
 import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
+import org.junit.After;
+import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
@@ -15,9 +19,6 @@
 import org.openqa.selenium.os.WindowsUtils;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.SessionId;
-import org.testng.AssertJUnit;
-import org.testng.annotations.AfterTest;
-import org.junit.Test;
 
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 import test.forgon.disinfectsystem.selenium.apply.applyConstants.DeskIconEnum;
@@ -64,8 +65,7 @@
 	private Intervene intervene = new Intervene();
 	boolean displayed = false;
 
-	// @BeforeMethod
-	private void before() {
+	public void before() {
 		try {
 			Utils.DateTime();
 			LoginUtil.loginWithClinical();
@@ -80,7 +80,7 @@
 
 		} catch (Exception e) {
 			logger.error(e, e);
-			AssertJUnit.fail(e.getMessage());
+			fail(e.getMessage());
 		}
 	}
 
@@ -112,7 +112,7 @@
 			logger.info("二级供应室一次性物品入库完成");
 		} catch (Exception e) {
 			logger.error(e, e);
-			AssertJUnit.fail(e.getMessage());
+			fail(e.getMessage());
 		}
 	}
 
@@ -678,7 +678,7 @@
 		} catch (Exception e) {
 			logger.error(e, e);
 			e.printStackTrace();
-			AssertJUnit.fail(e.getMessage());
+			fail(e.getMessage());
 		}
 	}
 
@@ -690,7 +690,7 @@
 		}
 	}
 
-	@AfterTest
+	@After
 	public void afterMethod() {
 		try {