You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by di...@apache.org on 2013/09/28 21:30:05 UTC
git commit: revise IdentityAssertionHttpServletRequestWrapperTest in
the context of changes done for KNOX-163
Updated Branches:
refs/heads/master 58fbc94e3 -> f7d10cde8
revise IdentityAssertionHttpServletRequestWrapperTest in the context of changes done for KNOX-163
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/f7d10cde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/f7d10cde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/f7d10cde
Branch: refs/heads/master
Commit: f7d10cde8d8f38823adffb1fee8cda7d70436920
Parents: 58fbc94
Author: Dilli Dorai Arumugam <da...@hortonworks.com>
Authored: Sat Sep 28 12:30:01 2013 -0700
Committer: Dilli Dorai Arumugam <da...@hortonworks.com>
Committed: Sat Sep 28 12:30:01 2013 -0700
----------------------------------------------------------------------
...yAssertionHttpServletRequestWrapperTest.java | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/f7d10cde/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java b/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
index 54e7289..079540e 100644
--- a/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
+++ b/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/hadoop/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.not;
public class IdentityAssertionHttpServletRequestWrapperTest {
@Test
- public void testInsertUserNameInFormParam() throws IOException {
+ public void testInsertUserNameInPostMethod() throws IOException {
String inputBody = "jar=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaWebHCat%2Fhadoop-examples.jar&class=org.apache.org.apache.hadoop.examples.WordCount&arg=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaTempleton%2Finput&arg=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaTempleton%2Foutput";
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -51,12 +51,12 @@ public class IdentityAssertionHttpServletRequestWrapperTest {
= new IdentityAsserterHttpServletRequestWrapper( request, "output-user" );
String outputBody = IOUtils.toString( wrapper.getInputStream(), wrapper.getCharacterEncoding() );
-
- assertThat( outputBody, containsString( "user.name=output-user" ) );
+ String output = wrapper.getQueryString();
+ assertThat( output, containsString( "user.name=output-user" ) );
}
@Test
- public void testInsertUserNameInFormParamWithoutEncoding() throws IOException {
+ public void testInsertUserNameInPostMethodWithoutEncoding() throws IOException {
String inputBody = "jar=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaWebHCat%2Fhadoop-examples.jar&class=org.apache.org.apache.hadoop.examples.WordCount&arg=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaTempleton%2Finput&arg=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaTempleton%2Foutput";
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -68,12 +68,12 @@ public class IdentityAssertionHttpServletRequestWrapperTest {
= new IdentityAsserterHttpServletRequestWrapper( request, "output-user" );
String outputBody = IOUtils.toString( wrapper.getInputStream(), wrapper.getCharacterEncoding() );
-
- assertThat( outputBody, containsString( "user.name=output-user" ) );
+ String output = wrapper.getQueryString();
+ assertThat( output, containsString( "user.name=output-user" ) );
}
@Test
- public void testInsertUserNameInFormParamWithIso88591Encoding() throws IOException {
+ public void testInsertUserNameInPostMethodWithIso88591Encoding() throws IOException {
String inputBody = "jar=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaWebHCat%2Fhadoop-examples.jar&class=org.apache.org.apache.hadoop.examples.WordCount&arg=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaTempleton%2Finput&arg=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaTempleton%2Foutput";
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -86,12 +86,12 @@ public class IdentityAssertionHttpServletRequestWrapperTest {
= new IdentityAsserterHttpServletRequestWrapper( request, "output-user" );
String outputBody = IOUtils.toString( wrapper.getInputStream(), wrapper.getCharacterEncoding() );
-
- assertThat( outputBody, containsString( "user.name=output-user" ) );
+ String output = wrapper.getQueryString();
+ assertThat( output, containsString( "user.name=output-user" ) );
}
@Test
- public void testOverwriteUserNameInFormParam() throws IOException {
+ public void testOverwriteUserNameInPostMethod() throws IOException {
String inputBody = "user.name=input-user&jar=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaWebHCat%2Fhadoop-examples.jar&class=org.apache.org.apache.hadoop.examples.WordCount&arg=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaTempleton%2Finput&arg=%2Ftmp%2FGatewayWebHdfsFuncTest%2FtestJavaMapReduceViaTempleton%2Foutput";
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -104,9 +104,9 @@ public class IdentityAssertionHttpServletRequestWrapperTest {
= new IdentityAsserterHttpServletRequestWrapper( request, "output-user" );
String outputBody = IOUtils.toString( wrapper.getInputStream(), wrapper.getCharacterEncoding() );
-
- assertThat( outputBody, containsString( "user.name=output-user" ) );
- assertThat( outputBody, not( containsString( "input-user" ) ) );
+ String output = wrapper.getQueryString();
+ assertThat( output, containsString( "user.name=output-user" ) );
+ assertThat( output, not( containsString( "input-user" ) ) );
}
@Test
@@ -173,7 +173,7 @@ public class IdentityAssertionHttpServletRequestWrapperTest {
}
@Test
- public void testNoInsertUserNameInNullQueryStringForPOST() {
+ public void testInsertUserNameInQueryStringForPOST() {
String input = null;
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -185,7 +185,7 @@ public class IdentityAssertionHttpServletRequestWrapperTest {
String output = wrapper.getQueryString();
- assertThat( output, not(containsString( "user.name=output-user" ) ) );
+ assertThat( output, containsString( "user.name=output-user" ) );
}
@Test