You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/05/28 14:20:41 UTC
svn commit: r1682225 -
/sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinterTest.java
Author: bdelacretaz
Date: Thu May 28 12:20:41 2015
New Revision: 1682225
URL: http://svn.apache.org/r1682225
Log:
SLING-4735 - use less fragile regexp for testing web console printer
Modified:
sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinterTest.java
Modified: sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinterTest.java?rev=1682225&r1=1682224&r2=1682225&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinterTest.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinterTest.java Thu May 28 12:20:41 2015
@@ -26,6 +26,7 @@ import org.quartz.SchedulerException;
import java.io.*;
import java.lang.reflect.Field;
import java.util.HashMap;
+import java.util.regex.Pattern;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -58,24 +59,31 @@ public class WebConsolePrinterTest {
consolePrinter.printConfiguration(w);
w.close();
- BufferedReader reader = new BufferedReader(new FileReader(f));
+ final BufferedReader reader = new BufferedReader(new FileReader(f));
- assertEquals("Apache Sling Scheduler", reader.readLine());
- reader.readLine();
- assertEquals("Status : active", reader.readLine());
- assertEquals("Name : ApacheSling", reader.readLine());
- assertTrue(reader.readLine().startsWith("Id : "));
- reader.readLine();
- assertTrue(reader.readLine().startsWith("Job : testName3"));
- assertTrue(reader.readLine().startsWith("Trigger : Trigger 'DEFAULT.testName3'"));
- reader.readLine();
- assertTrue(reader.readLine().startsWith("Job : testName2"));
- assertTrue(reader.readLine().startsWith("Trigger : Trigger 'DEFAULT.testName2'"));
- reader.readLine();
- assertTrue(reader.readLine().startsWith("Job : testName1"));
- assertTrue(reader.readLine().startsWith("Trigger : Trigger 'DEFAULT.testName1'"));
-
- f.delete();
+ try {
+ assertEquals("Apache Sling Scheduler", reader.readLine());
+ reader.readLine();
+ assertEquals("Status : active", reader.readLine());
+ assertEquals("Name : ApacheSling", reader.readLine());
+ assertTrue(reader.readLine().startsWith("Id : "));
+ reader.readLine();
+ assertRegexp(reader.readLine(), "^Job.*testName3.*");
+ assertRegexp(reader.readLine(), "^Trigger.*Trigger.*DEFAULT.testName3.*");
+ reader.readLine();
+ assertRegexp(reader.readLine(), "^Job.*testName2.*");
+ assertRegexp(reader.readLine(), "^Trigger.*Trigger.*DEFAULT.testName2.*");
+ reader.readLine();
+ assertRegexp(reader.readLine(), "^Job.*testName1.*");
+ assertRegexp(reader.readLine(), "^Trigger.*Trigger.*DEFAULT.testName1.*");
+ } finally {
+ reader.close();
+ f.delete();
+ }
+ }
+
+ private void assertRegexp(String input, String regexp) {
+ assertTrue("Expecting regexp match: '" + input + "' / '" + regexp + "'", Pattern.matches(regexp, input));
}
@After