Author: kkolinko
Date: Sun Jan 17 20:54:16 2016
New Revision: 1725126
URL: http://svn.apache.org/viewvc?rev=1725126&view=rev
Log:
Simplify diagnostics by showing response text in Assert message.
These tests depend on examples app being built and may fail when run from
Eclipse IDE.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1725126&r1=1725125&r2=1725126&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Sun Jan 17
20:54:16 2016
@@ -210,7 +210,8 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
- assertTrue(res.toString().indexOf("<h1>Hello World!</h1>") > 0);
+ String text = res.toString();
+ assertTrue(text, text.indexOf("<h1>Hello World!</h1>") > 0);
}
@Test
@@ -227,7 +228,8 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/examples/jsp/jsp2/el/basic-arithmetic.jsp");
- assertTrue(res.toString().indexOf("<td>${(1==2) ? 3 : 4}</td>") > 0);
+ String text = res.toString();
+ assertTrue(text, text.indexOf("<td>${(1==2) ? 3 : 4}</td>") > 0);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
