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:30:36 UTC
svn commit: r1682230 -
/sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinterTest.java
Author: bdelacretaz
Date: Thu May 28 12:30:36 2015
New Revision: 1682230
URL: http://svn.apache.org/r1682230
Log:
SLING-4735 - use less fragile regexp for testing web console printer (forgot a few cases)
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=1682230&r1=1682229&r2=1682230&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:30:36 2015
@@ -62,11 +62,11 @@ public class WebConsolePrinterTest {
final BufferedReader reader = new BufferedReader(new FileReader(f));
try {
- assertEquals("Apache Sling Scheduler", reader.readLine());
+ assertRegexp(reader.readLine(), ".*Apache Sling Scheduler.*");
reader.readLine();
- assertEquals("Status : active", reader.readLine());
- assertEquals("Name : ApacheSling", reader.readLine());
- assertTrue(reader.readLine().startsWith("Id : "));
+ assertRegexp(reader.readLine(), ".*Status.*active.*");
+ assertRegexp(reader.readLine(), ".*Name.*ApacheSling.*");
+ assertRegexp(reader.readLine(), ".*Id.*");
reader.readLine();
assertRegexp(reader.readLine(), "^Job.*testName3.*");
assertRegexp(reader.readLine(), "^Trigger.*Trigger.*DEFAULT.testName3.*");