Repository: knox Updated Branches: refs/heads/master 9c5c6b7ef -> 3ddb28ea3
[KNOX-685] - Knox tests cleanup after Jetty 9 upgrade Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/3ddb28ea Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/3ddb28ea Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/3ddb28ea Branch: refs/heads/master Commit: 3ddb28ea3d61de8413c86eaa1c9b5126b24aed31 Parents: 9c5c6b7 Author: Kevin Minder <[email protected]> Authored: Tue Mar 8 09:45:43 2016 -0500 Committer: Kevin Minder <[email protected]> Committed: Tue Mar 8 09:45:43 2016 -0500 ---------------------------------------------------------------------- .../function/UsernameFunctionProcessorTest.java | 2 +- .../impl/ServiceRegistryFunctionsTest.java | 4 +-- .../api/UrlRewriteServletFilterTest.java | 38 ++++++++++---------- .../impl/FrontendFunctionProcessorTest.java | 4 +-- 4 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/3ddb28ea/gateway-provider-identity-assertion-common/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java index 73920e7..18ca52d 100644 --- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java +++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/hadoop/gateway/identityasserter/function/UsernameFunctionProcessorTest.java @@ -188,7 +188,7 @@ public class UsernameFunctionProcessorTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path?test-query-input-name=test-query-input-value" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "test-input-host:777" ); request.setHeader( "Content-Type", "text/xml; charset=UTF-8" ); request.setContent( input ); http://git-wip-us.apache.org/repos/asf/knox/blob/3ddb28ea/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java index 01b62d6..c7b6312 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/hadoop/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java @@ -133,7 +133,7 @@ public class ServiceRegistryFunctionsTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "test-host:42" ); request.setHeader( "Content-Type", "text/xml; charset=UTF-8" ); request.setContent( input ); @@ -165,7 +165,7 @@ public class ServiceRegistryFunctionsTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "test-host:42" ); request.setHeader( "Content-Type", "application/json; charset=UTF-8" ); request.setContent( input ); http://git-wip-us.apache.org/repos/asf/knox/blob/3ddb28ea/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java index 93bdac0..82524ee 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java @@ -126,7 +126,7 @@ public class UrlRewriteServletFilterTest { // Create the client request. request.setMethod( "GET" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); // Execute the request. response = HttpTester.parseResponse( server.getResponses( request.generate() ) ); @@ -150,7 +150,7 @@ public class UrlRewriteServletFilterTest { // Create the client request. request.setMethod( "GET" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); request.setHeader( "Location", "http://mock-host:1/test-input-path"; ); // Execute the request. @@ -174,7 +174,7 @@ public class UrlRewriteServletFilterTest { // Create the client request. request.setMethod( "GET" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); // Execute the request. response = HttpTester.parseResponse( server.getResponses( request.generate() ) ); @@ -199,7 +199,7 @@ public class UrlRewriteServletFilterTest { // Create the client request. request.setMethod( "GET" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); request.setHeader( "Cookie", "cookie-name=cookie-value; Domain=docs.foo.com; Path=/accounts; Expires=Wed, 13-Jan-2021 22:23:01 GMT; Secure; HttpOnly" ); @@ -226,7 +226,7 @@ public class UrlRewriteServletFilterTest { // Create the client request. request.setMethod( "GET" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); // Execute the request. @@ -255,7 +255,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); request.setHeader( "Content-Type", "application/json; charset=UTF-8" ); request.setContent( inputJson ); @@ -287,7 +287,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); request.setHeader( "Content-Type", "application/xml; charset=UTF-8" ); request.setContent( input ); @@ -318,7 +318,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); // Execute the request. @@ -346,7 +346,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); request.setHeader( "Content-Type", "application/html; charset=UTF-8" ); request.setContent( input ); @@ -375,7 +375,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); request.setHeader( "Content-Type", "application/x-www-form-urlencoded; charset=UTF-8" ); request.setContent( input ); @@ -408,7 +408,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:42" ); request.setHeader( "Content-Type", "text/xml; charset=UTF-8" ); request.setContent( input ); @@ -442,7 +442,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:42" ); request.setHeader( "Location", "http://mock-host:42/test-input-path-1"; ); request.setHeader( "Content-Type", "text/xml; charset=UTF-8" ); @@ -483,7 +483,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:42" ); request.setHeader( "Content-Type", "application/json; charset=UTF-8" ); request.setContent( inputJson ); @@ -516,7 +516,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:42" ); request.setHeader( "Content-Type", "text/xml; charset=UTF-8" ); request.setContent( input ); @@ -552,7 +552,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:42" ); request.setHeader( "Content-Type", "text/xml; charset=UTF-8" ); request.setContent( input ); @@ -587,7 +587,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "PUT" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:1" ); request.setHeader( "Content-Type", "application/x-www-form-urlencoded; charset=UTF-8" ); request.setContent( input ); @@ -619,7 +619,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "GET" ); request.setURI( "/test-input-path-1" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:42" ); // Execute the request. @@ -662,7 +662,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "GET" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:42" ); request.setHeader( "Content-Type", "application/json; charset=UTF-8" ); request.setContent( responseJson ); @@ -693,7 +693,7 @@ public class UrlRewriteServletFilterTest { interactions.add( interaction ); request.setMethod( "GET" ); request.setURI( "/test-input-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "mock-host:42" ); // Execute the request. http://git-wip-us.apache.org/repos/asf/knox/blob/3ddb28ea/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java index daf4101..d755514 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java @@ -189,7 +189,7 @@ public class FrontendFunctionProcessorTest { interactions.add( interaction ); request.setMethod( "GET" ); request.setURI( "/test-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "test-host:42" ); response = HttpTester.parseResponse( server.getResponses( request.generate() ) ); @@ -234,7 +234,7 @@ public class FrontendFunctionProcessorTest { interactions.add( interaction ); request.setMethod( "GET" ); request.setURI( "/test-path" ); - request.setVersion( "HTTP/1.1" ); + //request.setVersion( "HTTP/1.1" ); request.setHeader( "Host", "test-host:42" ); response = HttpTester.parseResponse( server.getResponses( request.generate() ) );
