Author: remm
Date: Fri Apr 22 08:38:17 2016
New Revision: 1740465
URL: http://svn.apache.org/viewvc?rev=1740465&view=rev
Log:
59365: Avoid basing the test on the only portion of the output that is
internationalized. (part 2)
Modified:
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java?rev=1740465&r1=1740464&r2=1740465&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperListener.java Fri
Apr 22 08:38:17 2016
@@ -59,7 +59,7 @@ public class TestMapperListener extends
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
- Assert.assertTrue(text, text.contains("<h1>Hello World!</h1>"));
+ Assert.assertTrue(text, text.contains("<a
href=\"../helloworld.html\">"));
List<ListenersInfo> listenersFirst = new ArrayList<>();
populateListenersInfo(listenersFirst, tomcat.getEngine());
@@ -70,7 +70,7 @@ public class TestMapperListener extends
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
- Assert.assertTrue(text, text.contains("<h1>Hello World!</h1>"));
+ Assert.assertTrue(text, text.contains("<a
href=\"../helloworld.html\">"));
List<ListenersInfo> listenersSecond = new ArrayList<>();
populateListenersInfo(listenersSecond, tomcat.getEngine());
Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java?rev=1740465&r1=1740464&r2=1740465&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java Fri Apr
22 08:38:17 2016
@@ -107,7 +107,7 @@ public class TestMapperWebapps extends T
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
- Assert.assertTrue(text, text.contains("<h1>Hello World!</h1>"));
+ Assert.assertTrue(text, text.contains("<a
href=\"../helloworld.html\">"));
res = getUrl("http://localhost:"; + getPort()
+ "/examples/jsp/jsp2/el/basic-arithmetic.jsp");
@@ -141,7 +141,7 @@ public class TestMapperWebapps extends T
res = getUrl("http://localhost:"; + getPort()
+ "/examples/servlets/servlet/HelloWorldExample");
text = res.toString();
- Assert.assertTrue(text, text.contains("<h1>Hello World!</h1>"));
+ Assert.assertTrue(text, text.contains("<a
href=\"../helloworld.html\">"));
res = getUrl("http://localhost:"; + getPort()
+ "/examples/jsp/jsp2/el/basic-arithmetic.jsp");
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=1740465&r1=1740464&r2=1740465&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri Apr 22
08:38:17 2016
@@ -212,7 +212,7 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
String text = res.toString();
- assertTrue(text, text.indexOf("<h1>Hello World!</h1>") > 0);
+ assertTrue(text, text.indexOf("<a href=\"../helloworld.html\">") > 0);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
