From 945e38ae163d58bd6e08c06ce02278584ee22f2d Mon Sep 17 00:00:00 2001
From: acolyer <acolyer>
Date: Mon, 8 Dec 2003 22:08:55 +0000
Subject: Merge of dependent tests (only shows up under IBM 131 JVM)

---
 .../testing/drivers/HarnessSelectionTest.java      | 39 +++++++++++-----------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'testing-drivers')

diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
index dcd1d3dd3..94cc99985 100644
--- a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
@@ -266,26 +266,25 @@ public class HarnessSelectionTest extends TestCase {
         Exp exp = new Exp(17, 1, 16, 1, 0, 0, 16);
         checkSelection(SELECT, options, TITLE_LIST_ONE, exp);
     }
-    
-    public void testTitleListFileSelectionPlural() {
-        String[] options = new String[] 
-            { "-ajctestTitleList=" + TITLE_LIST_PLURAL,
-                "-eclipse"
-            };
-        Exp exp = new Exp(17, 2, 15, 2, 0, 0, 15);
-        checkSelection(SELECT, options, TITLE_LIST_PLURAL, exp);
-    }
-    
-    public void testTitleListFileSelectionPluralFailOnly() {
-        String[] options = new String[] 
-            { "-ajctestTitleFailList=" + TITLE_LIST_PLURAL,
-                "-eclipse"
-            };
-        // 1 messages skipped when run under 1.4 for other reasons,
-        // so count "skip" instead of TITLE_LIST_PLURAL
-        Exp exp = new Exp(17, 2, 15, 2, 0, 0, 15);
-        checkSelection(SELECT, options, "skip", exp);
-    }
+
+   public void testTitleListFileSelectionPlural() {
+       String[] options = new String[] 
+           { "-ajctestTitleList=" + TITLE_LIST_PLURAL,
+               "-eclipse"
+           };
+       Exp exp = new Exp(17, 2, 15, 2, 0, 0, 15);
+       checkSelection(SELECT, options, TITLE_LIST_PLURAL, exp);
+       
+       // Now check the "fail only" path 
+       options = new String[] 
+           { "-ajctestTitleFailList=" + TITLE_LIST_PLURAL,
+               "-eclipse"
+           };
+       // 1 messages skipped when run under 1.4 for other reasons,
+       // so count "skip" instead of TITLE_LIST_PLURAL
+       exp = new Exp(17, 2, 15, 2, 0, 0, 15);
+       checkSelection(SELECT, options, "skip", exp);
+   }
 
     /** 
      * Run the static test suite with the given options.
-- 
cgit v1.2.3