Chromium Code Reviews| Index: javatests/org/chromium/distiller/JsTestSuiteBaseTest.java |
| diff --git a/javatests/org/chromium/distiller/JsTestSuiteBaseTest.java b/javatests/org/chromium/distiller/JsTestSuiteBaseTest.java |
| index 1cac261befdd3671e75555777da2c0d3feef666a..d60f9b6cc3605cf9f4763b86cdb35a997c746eec 100644 |
| --- a/javatests/org/chromium/distiller/JsTestSuiteBaseTest.java |
| +++ b/javatests/org/chromium/distiller/JsTestSuiteBaseTest.java |
| @@ -73,17 +73,58 @@ public class JsTestSuiteBaseTest extends JsTestCase { |
| suite.addTestCase(null, "TestClass") |
| .addTest(null, "test1") |
| .addTest(null, "test2"); |
| + suite.addTestCase(null, "Test2Class") |
| + .addTest(null, "test1"); |
| + |
| Map<String, JsTestSuiteBase.TestCaseResults> results = suite.run( |
| - new TestLogger.NullLogger(), ".*TestClass.*"); |
| + new TestLogger.NullLogger(), "TestClass.*"); |
| assertFalse(results.get("TestClass").getResults().get("test1").skipped()); |
| assertFalse(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertTrue(results.get("Test2Class").getResults().get("test1").skipped()); |
| - results = suite.run(new TestLogger.NullLogger(), ".*NotTestClass.*"); |
| + results = suite.run(new TestLogger.NullLogger(), "*NotTestClass*"); |
| assertTrue(results.get("TestClass").getResults().get("test1").skipped()); |
| assertTrue(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertTrue(results.get("Test2Class").getResults().get("test1").skipped()); |
| + |
| + results = suite.run(new TestLogger.NullLogger(), "TestClass.test1"); |
| + assertFalse(results.get("TestClass").getResults().get("test1").skipped()); |
| + assertTrue(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertTrue(results.get("Test2Class").getResults().get("test1").skipped()); |
| + |
| + results = suite.run(new TestLogger.NullLogger(), "TestClass.*-*.test1"); |
| + assertTrue(results.get("TestClass").getResults().get("test1").skipped()); |
| + assertFalse(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertTrue(results.get("Test2Class").getResults().get("test1").skipped()); |
| + |
| + results = suite.run(new TestLogger.NullLogger(), ":*.test1::*.test2:"); |
| + assertFalse(results.get("TestClass").getResults().get("test1").skipped()); |
| + assertFalse(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertFalse(results.get("Test2Class").getResults().get("test1").skipped()); |
| + |
| + results = suite.run(new TestLogger.NullLogger(), "T*C*-*tes?2"); |
| + assertFalse(results.get("TestClass").getResults().get("test1").skipped()); |
| + assertTrue(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertFalse(results.get("Test2Class").getResults().get("test1").skipped()); |
| - results = suite.run(new TestLogger.NullLogger(), ".*TestClass.test1"); |
| + results = suite.run(new TestLogger.NullLogger(), "TestClass*:*test1-*test2"); |
| assertFalse(results.get("TestClass").getResults().get("test1").skipped()); |
| assertTrue(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertFalse(results.get("Test2Class").getResults().get("test1").skipped()); |
| + |
| + results = suite.run(new TestLogger.NullLogger(), "-*1"); |
| + assertTrue(results.get("TestClass").getResults().get("test1").skipped()); |
| + assertFalse(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertTrue(results.get("Test2Class").getResults().get("test1").skipped()); |
| + |
| + results = suite.run(new TestLogger.NullLogger(), "-*.e*"); |
| + assertFalse(results.get("TestClass").getResults().get("test1").skipped()); |
| + assertFalse(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertFalse(results.get("Test2Class").getResults().get("test1").skipped()); |
| + |
| + results = suite.run(new TestLogger.NullLogger(), "-TestClass.test1:TestClass.test2"); |
|
nyquist
2015/04/01 18:27:07
Nit: If you have time and the will to do it, feel
wychen
2015/04/01 19:05:53
Done.
nyquist
2015/04/01 20:41:14
thanks!
|
| + assertTrue(results.get("TestClass").getResults().get("test1").skipped()); |
| + assertTrue(results.get("TestClass").getResults().get("test2").skipped()); |
| + assertFalse(results.get("Test2Class").getResults().get("test1").skipped()); |
| } |
| } |