Update tests

ngoanh2n · May 27, 2023 · 6d285bf · 6d285bf
1 parent ff2de0b
commit 6d285bf
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/webdriverchecker-junit5/src/test/java/com/github/ngoanh2n/wdc/BeforeAllTest.java b/webdriverchecker-junit5/src/test/java/com/github/ngoanh2n/wdc/BeforeAllTest.java
@@ -11,7 +11,7 @@
 public class BeforeAllTest extends WDCJUnit5Test {
     @BeforeAll
     static void beforeAll() {
-        Assertions.assertThrows(CheckerException.class, WebDriverChecker::getDriver);
+        Assertions.assertThrows(CheckerException.NullDriverProvided.class, WebDriverChecker::getDriver);
         createWebDriver();
         Assertions.assertNotNull(WebDriverChecker.getDriver());
     }

diff --git a/webdriverchecker-junit5/src/test/java/com/github/ngoanh2n/wdc/BeforeEachTest.java b/webdriverchecker-junit5/src/test/java/com/github/ngoanh2n/wdc/BeforeEachTest.java
@@ -11,7 +11,7 @@
 public class BeforeEachTest extends WDCJUnit5Test {
     @BeforeAll
     static void beforeAll() {
-        Assertions.assertThrows(CheckerException.class, WebDriverChecker::getDriver);
+        Assertions.assertThrows(CheckerException.NullDriverProvided.class, WebDriverChecker::getDriver);
     }
 
     @BeforeEach

diff --git a/webdriverchecker-junit5/src/test/java/com/github/ngoanh2n/wdc/WDCJUnit5Test.java b/webdriverchecker-junit5/src/test/java/com/github/ngoanh2n/wdc/WDCJUnit5Test.java
@@ -13,20 +13,21 @@
 public abstract class WDCJUnit5Test {
     protected static WebDriver driver;
 
-    @AfterEach
-    protected void afterEach() {
-        Assertions.assertNotNull(WebDriverChecker.getDriver());
-    }
-
     @AfterAll
     protected static void afterAll() {
         Assertions.assertNotNull(WebDriverChecker.getDriver());
         driver.quit();
-        Assertions.assertThrows(CheckerException.class, WebDriverChecker::getDriver);
+        Assertions.assertThrows(CheckerException.ClosedDriverProvided.class, WebDriverChecker::getDriver);
+        driver = null;
     }
 
     protected static void createWebDriver() {
         WebDriverManager.chromedriver().setup();
         driver = new ChromeDriver();
     }
+
+    @AfterEach
+    protected void afterEach() {
+        Assertions.assertNotNull(WebDriverChecker.getDriver());
+    }
 }
diff --git a/webdriverchecker-testng/src/test/java/com/github/ngoanh2n/wdc/BeforeClassTest.java b/webdriverchecker-testng/src/test/java/com/github/ngoanh2n/wdc/BeforeClassTest.java
@@ -11,7 +11,7 @@
 public class BeforeClassTest extends WDCTestNGTest {
     @BeforeClass
     protected void beforeClass() {
-        Assert.assertThrows(CheckerException.class, WebDriverChecker::getDriver);
+        Assert.assertThrows(CheckerException.NullDriverProvided.class, WebDriverChecker::getDriver);
         createWebDriver();
         Assert.assertNotNull(WebDriverChecker.getDriver());
     }

diff --git a/webdriverchecker-testng/src/test/java/com/github/ngoanh2n/wdc/BeforeMethodTest.java b/webdriverchecker-testng/src/test/java/com/github/ngoanh2n/wdc/BeforeMethodTest.java
@@ -11,7 +11,7 @@
 public class BeforeMethodTest extends WDCTestNGTest {
     @BeforeClass
     protected void beforeClass() {
-        Assert.assertThrows(CheckerException.class, WebDriverChecker::getDriver);
+        Assert.assertThrows(CheckerException.NullDriverProvided.class, WebDriverChecker::getDriver);
     }
 
     @BeforeMethod

diff --git a/webdriverchecker-testng/src/test/java/com/github/ngoanh2n/wdc/WDCTestNGTest.java b/webdriverchecker-testng/src/test/java/com/github/ngoanh2n/wdc/WDCTestNGTest.java
@@ -22,7 +22,8 @@ protected void afterMethod() {
     protected void afterClass() {
         Assert.assertNotNull(WebDriverChecker.getDriver());
         driver.quit();
-        Assert.assertThrows(CheckerException.class, WebDriverChecker::getDriver);
+        Assert.assertThrows(CheckerException.ClosedDriverProvided.class, WebDriverChecker::getDriver);
+        driver = null;
     }
 
     protected static void createWebDriver() {