[testng] 331/355: Rework test

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit 99fe56f78e9781a1007afe8912e3581aecf5fdfb
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Tue May 12 13:04:02 2015 +0200

    Rework test
---
 src/test/java/test/enable/EnableTest.java | 32 ++++++-------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/test/java/test/enable/EnableTest.java b/src/test/java/test/enable/EnableTest.java
index a76e945..60439ea 100644
--- a/src/test/java/test/enable/EnableTest.java
+++ b/src/test/java/test/enable/EnableTest.java
@@ -1,11 +1,8 @@
 package test.enable;
 
-import org.testng.Assert;
 import org.testng.TestNG;
 import org.testng.annotations.Test;
 
-import java.util.List;
-
 import test.SimpleBaseTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -20,29 +17,12 @@ public class EnableTest extends SimpleBaseTest {
     tng.setPreserveOrder(true);
     tng.run();
 
-    List<String> invokedMethods = listener.getInvokedMethods();
-    Assert.assertEquals(invokedMethods.get(0), "beforeSuiteA");
-    Assert.assertEquals(invokedMethods.get(1), "beforeSuiteA2");
-    Assert.assertEquals(invokedMethods.get(2), "beforeSuiteNoRunA");
-    Assert.assertEquals(invokedMethods.get(3), "beforeSuiteNoRunA2");
-    Assert.assertEquals(invokedMethods.get(4), "beforeSuiteRunA");
-    Assert.assertEquals(invokedMethods.get(5), "beforeSuiteRunA2");
-    Assert.assertEquals(invokedMethods.get(6), "beforeSuiteRunB");
-    Assert.assertEquals(invokedMethods.get(7), "beforeSuiteRunB2");
-    Assert.assertEquals(invokedMethods.get(8), "beforeSuiteC");
-    Assert.assertEquals(invokedMethods.get(9), "beforeSuiteC2");
-    Assert.assertEquals(invokedMethods.get(10), "beforeSuiteNoRunC");
-    Assert.assertEquals(invokedMethods.get(11), "beforeSuiteNoRunC2");
-    Assert.assertEquals(invokedMethods.get(12), "beforeSuiteRunC");
-    Assert.assertEquals(invokedMethods.get(13), "beforeSuiteRunC2");
-    Assert.assertEquals(invokedMethods.get(14), "testA2");
-    Assert.assertEquals(invokedMethods.get(15), "testA3");
-    Assert.assertEquals(invokedMethods.get(16), "testB2");
-    Assert.assertEquals(invokedMethods.get(17), "testB3");
-    Assert.assertEquals(invokedMethods.get(18), "testC");
-    Assert.assertEquals(invokedMethods.get(19), "testC2");
-    Assert.assertEquals(invokedMethods.get(20), "testC3");
-    Assert.assertEquals(invokedMethods.size(), 21);
+    assertThat(listener.getInvokedMethods()).containsExactly(
+        "beforeSuiteA", "beforeSuiteA2", "beforeSuiteNoRunA", "beforeSuiteNoRunA2", "beforeSuiteRunA", "beforeSuiteRunA2",
+        "beforeSuiteRunB", "beforeSuiteRunB2",
+        "beforeSuiteC", "beforeSuiteC2", "beforeSuiteNoRunC", "beforeSuiteNoRunC2", "beforeSuiteRunC", "beforeSuiteRunC2",
+        "testA2", "testA3", "testB2", "testB3", "testC", "testC2", "testC3"
+    );
   }
 
   @Test(description = "https://github.com/cbeust/testng/issues/420")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git