JAL-1805 test envirionment separation

[jalview.git] / test / com / stevesoft / pat / RegexWriterTest.java

diff --git a/test/com/stevesoft/pat/RegexWriterTest.java b/test/com/stevesoft/pat/RegexWriterTest.java
index ea07aa2..d91119d 100644 (file)
--- a/test/com/stevesoft/pat/RegexWriterTest.java
+++ b/test/com/stevesoft/pat/RegexWriterTest.java
@@ -5,6 +5,7 @@ import static org.testng.AssertJUnit.assertEquals;
 import java.io.IOException;
 import java.io.StringWriter;
 
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 /**
@@ -25,6 +26,9 @@ public class RegexWriterTest
    *          an input string
    * @throws Exception
    */
+
+  @Test(groups =
+  { "Functional" }, dataProvider = "testWriteParam")
   void test(String re, String inp) throws IOException
   {
     StringWriter sw = new StringWriter();
@@ -47,27 +51,50 @@ public class RegexWriterTest
     }
   }
 
-  @Test
-  public void testWrite() throws IOException
+  // @Test(groups ={ "Functional" })
+  // public void testWrite() throws IOException
+  // {
+  // for (int n = 1; n <= 1; n++)
+  // {
+  // test("s/x/y/", "-----x123456789");
+  // test("s/x/y/", "x123456789");
+  // test("s/x/y/", "-----x");
+  // test("s/x.*?x/y/", ".xx..x..x...x...x....x....x");
+  // test("s/x.*x/[$&]/", "--x........x--xx");
+  // test("s/x.*x/[$&]/", "--x........x------");
+  // test("s/.$/a/m", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbbbbbbbbbbbb");
+  // test("s/.$/a/", "123");
+  // test("s/.$/a/", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbb");
+  // test("s/^./a/", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbb");
+  // test("s/$/a/", "bbb");
+  // test("s/^/a/", "bbb");
+  // test("s/^/a/", "");
+  // test("s{.*}{N}", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+  // test("s/.{0,7}/y/", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+  // test("s/x/$&/", "xxx");
+  // }
+  // }
+
+  @DataProvider(name = "testWriteParam")
+  public Object[][] regexTestParams()
   {
-    for (int n = 1; n <= 1; n++)
+    return new Object[][]
     {
-      test("s/x/y/", "-----x123456789");
-      test("s/x/y/", "x123456789");
-      test("s/x/y/", "-----x");
-      test("s/x.*?x/y/", ".xx..x..x...x...x....x....x");
-      test("s/x.*x/[$&]/", "--x........x--xx");
-      test("s/x.*x/[$&]/", "--x........x------");
-      test("s/.$/a/m", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbbbbbbbbbbbb");
-      test("s/.$/a/", "123");
-      test("s/.$/a/", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbb");
-      test("s/^./a/", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbb");
-      test("s/$/a/", "bbb");
-      test("s/^/a/", "bbb");
-      test("s/^/a/", "");
-      test("s{.*}{N}", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-      test("s/.{0,7}/y/", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
-      test("s/x/$&/", "xxx");
-    }
+    { "s/x/y/", "-----x123456789" },
+    { "s/x/y/", "x123456789" },
+    { "s/x/y/", "-----x" },
+    { "s/x.*?x/y/", ".xx..x..x...x...x....x....x" },
+    { "s/x.*x/[$&]/", "--x........x--xx" },
+    { "s/x.*x/[$&]/", "--x........x------" },
+    { "s/.$/a/m", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbbbbbbbbbbbb" },
+    { "s/.$/a/", "123" },
+    { "s/.$/a/", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbb" },
+    { "s/^./a/", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbb" },
+    { "s/$/a/", "bbb" },
+    { "s/^/a/", "bbb" },
+    { "s/^/a/", "" },
+    { "s{.*}{N}", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" },
+    { "s/.{0,7}/y/", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" },
+    { "s/x/$&/", "xxx" } };
   }
 }