Author: remm Date: Fri Apr 22 09:00:51 2016 New Revision: 1740468 URL: http://svn.apache.org/viewvc?rev=1740468&view=rev Log: 59365: Avoid basing the test on the only portion of the output that is internationalized. (part 2)
Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Propchange: tomcat/tc8.5.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 22 09:00:51 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465 Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java?rev=1740468&r1=1740467&r2=1740468&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperListener.java Fri Apr 22 09:00:51 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/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java?rev=1740468&r1=1740467&r2=1740468&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java Fri Apr 22 09:00:51 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/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcat.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1740468&r1=1740467&r2=1740468&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcat.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri Apr 22 09:00:51 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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org