svn commit: r1740470 - in /tomcat/tc7.0.x/trunk/test/org/apache: catalina/connector/TestMapperListener.java catalina/startup/TestTomcat.java tomcat/util/http/mapper/TestMapperWebapps.java

[remm]

Author: remm
Date: Fri Apr 22 09:06:20 2016
New Revision: 1740470

URL: http://svn.apache.org/viewvc?rev=1740470&view=rev
Log:
59365: Avoid basing the test on the only portion of the output that is 
internationalized. (part 2)

Modified:
    
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java
    tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
    
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java?rev=1740470&r1=1740469&r2=1740470&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMapperListener.java 
Fri Apr 22 09:06:20 2016
@@ -55,7 +55,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<ListenersInfo>();
         populateListenersInfo(listenersFirst, tomcat.getEngine());
@@ -66,7 +66,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<ListenersInfo>();
         populateListenersInfo(listenersSecond, tomcat.getEngine());

Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1740470&r1=1740469&r2=1740470&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri 
Apr 22 09:06:20 2016
@@ -273,7 +273,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

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java?rev=1740470&r1=1740469&r2=1740470&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
 Fri Apr 22 09:06:20 2016
@@ -105,7 +105,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");
@@ -139,7 +139,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");



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org