You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/08/25 15:17:49 UTC
svn commit: r989091 - in
/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src:
main/java/org/apache/geronimo/testsuite/servlet30/main/LoginServlet.java
test/java/org/apache/geronimo/testsuite/servlets/ServletsTest.java
Author: xiaming
Date: Wed Aug 25 13:17:49 2010
New Revision: 989091
URL: http://svn.apache.org/viewvc?rev=989091&view=rev
Log:
GERONIMO-5542 correct test logic provided by LiWenQin
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/main/java/org/apache/geronimo/testsuite/servlet30/main/LoginServlet.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/test/java/org/apache/geronimo/testsuite/servlets/ServletsTest.java
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/main/java/org/apache/geronimo/testsuite/servlet30/main/LoginServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/main/java/org/apache/geronimo/testsuite/servlet30/main/LoginServlet.java?rev=989091&r1=989090&r2=989091&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/main/java/org/apache/geronimo/testsuite/servlet30/main/LoginServlet.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/main/java/org/apache/geronimo/testsuite/servlet30/main/LoginServlet.java Wed Aug 25 13:17:49 2010
@@ -63,21 +63,21 @@ public class LoginServlet extends javax.
out.println("<tr><th>Value/Status</th><th>BeforeLogin</th><th>AfterLogin</th><th>AfterLogout</th></tr>");
out.println("<tr>");
- out.println("<th>getRemoteUser</th>");
+ out.println("<th>isUserInRole</th>");
out.println("<td id=\"bli1\">"+bli1+"</td>");
out.println("<td id=\"ali1\">"+ali1+"</td>");
out.println("<td id=\"alo1\">"+alo1+"</td>");
out.println("</tr>");
out.println("<tr>");
- out.println("<th>isUserInRole</th>");
+ out.println("<th>getRemoteUser</th>");
out.println("<td id=\"bli2\">"+bli2+"</td>");
out.println("<td id=\"ali2\">"+ali2+"</td>");
out.println("<td id=\"alo2\">"+alo2+"</td>");
out.println("</tr>");
out.println("<tr>");
- out.println("<th>isUserInRole</th>");
+ out.println("<th>getUserPrincipal</th>");
out.println("<td id=\"bli3\">"+bli3+"</td>");
out.println("<td id=\"ali3\">"+ali3+"</td>");
out.println("<td id=\"alo3\">"+alo3+"</td>");
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/test/java/org/apache/geronimo/testsuite/servlets/ServletsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/test/java/org/apache/geronimo/testsuite/servlets/ServletsTest.java?rev=989091&r1=989090&r2=989091&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/test/java/org/apache/geronimo/testsuite/servlets/ServletsTest.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-security-test/src/test/java/org/apache/geronimo/testsuite/servlets/ServletsTest.java Wed Aug 25 13:17:49 2010
@@ -206,10 +206,10 @@ public class ServletsTest extends Seleni
Assert.assertEquals("true", selenium.getText("//*[@id=\"ali1\"]"));
Assert.assertEquals("false", selenium.getText("//*[@id=\"alo1\"]"));
Assert.assertEquals("null", selenium.getText("//*[@id=\"bli2\"]"));
- Assert.assertEquals("RoleB", selenium.getText("//*[@id=\"ali2\"]"));
+ Assert.assertEquals("george", selenium.getText("//*[@id=\"ali2\"]"));
Assert.assertEquals("null", selenium.getText("//*[@id=\"alo2\"]"));
Assert.assertEquals("null", selenium.getText("//*[@id=\"bli3\"]"));
- Assert.assertEquals("RoleB", selenium.getText("//*[@id=\"ali3\"]"));
+ Assert.assertEquals("george", selenium.getText("//*[@id=\"ali3\"]"));
Assert.assertEquals("null", selenium.getText("//*[@id=\"alo3\"]"));
}