diff --git a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPBadRequestsTest.java b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPBadRequestsTest.java index d7063cd4308c91de2327747932c121fb85c1a1e7..6b290c0acbcee7d4760581e9a0461333275912d7 100644 --- a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPBadRequestsTest.java +++ b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPBadRequestsTest.java @@ -40,39 +40,54 @@ public class HTTPBadRequestsTest { arguments( named( "Missing method", - "/hello HTTP/1.1\r\n" + "Host: localhost\r\n" + "Accept: text/html\r\n" - + "Accept-Encoding: gzip,deflate\r\n" + "/hello HTTP/1.1\r\n" + + "Host: localhost\r\n" + + "Accept: text/html\r\n" + + "Accept-Encoding: gzip,deflate\r\n" ) ), arguments( named( "Missing resource", - "GET HTTP/1.1\r\n" + "Host: localhost\r\n" + "Accept: text/html\r\n" + "Accept-Encoding: gzip,deflate\r\n" + "GET HTTP/1.1\r\n" + + "Host: localhost\r\n" + + "Accept: text/html\r\n" + + "Accept-Encoding: gzip,deflate\r\n" ) ), arguments( named( "Missing version", - "GET /hello\r\n" + "Host: localhost\r\n" + "Accept: text/html\r\n" + "Accept-Encoding: gzip,deflate\r\n" + "GET /hello\r\n" + + "Host: localhost\r\n" + + "Accept: text/html\r\n" + + "Accept-Encoding: gzip,deflate\r\n" ) ), arguments( named( - "Missing first line", "Host: localhost\r\n" + "Accept: text/html\r\n" + "Accept-Encoding: gzip,deflate\r\n" + "Missing first line", + "Host: localhost\r\n" + + "Accept: text/html\r\n" + + "Accept-Encoding: gzip,deflate\r\n" ) ), arguments( named( "Invalid header", - "GET /hello/world.html?country=Spain&province=Ourense&city=Ourense HTTP/1.1\r\n" + "Host\r\n" - + "Accept: text/html\r\n" + "Accept-Encoding: gzip,deflate\r\n" + "GET /hello/world.html?country=Spain&province=Ourense&city=Ourense HTTP/1.1\r\n" + + "Host\r\n" + + "Accept: text/html\r\n" + + "Accept-Encoding: gzip,deflate\r\n" ) ), arguments( named( "Missing new line after header", - "GET /hello/world.html?country=Spain&province=Ourense&city=Ourense HTTP/1.1" + "Host: localhost\r\n" - + "Accept: text/html\r\n" + "Accept-Encoding: gzip,deflate\r\n" + "GET /hello/world.html?country=Spain&province=Ourense&city=Ourense HTTP/1.1" + + "Host: localhost\r\n" + + "Accept: text/html\r\n" + + "Accept-Encoding: gzip,deflate\r\n" ) ) ); diff --git a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETParametersTest.java b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETParametersTest.java index 436ba2e166aaae285e5c55727a6493e3704ffbfb..d920445f7754063d64a1fced83a823cafaf93a88 100644 --- a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETParametersTest.java +++ b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETParametersTest.java @@ -26,8 +26,10 @@ public class HTTPRequestGETParametersTest { @BeforeEach public void setUp() throws Exception { - requestText = "GET /hello/world.html?country=Spain&province=Ourense&city=Ourense HTTP/1.1\r\n" - + "Host: localhost\r\n" + "Accept: text/html\r\n" + requestText = + "GET /hello/world.html?country=Spain&province=Ourense&city=Ourense HTTP/1.1\r\n" + + "Host: localhost\r\n" + + "Accept: text/html\r\n" + "Accept-Encoding: gzip,deflate\r\n"; request = new HTTPRequest(new StringReader(requestText + "\r\n")); diff --git a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETResourceTest.java b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETResourceTest.java index e1d083e779571e6e363c7603dbbfb1aff6645412..52b074e0c6d46d8535bd1f482c6080600d75cbd5 100644 --- a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETResourceTest.java +++ b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETResourceTest.java @@ -27,7 +27,8 @@ public class HTTPRequestGETResourceTest { @BeforeEach public void setUp() throws Exception { - this.requestText = "GET /hello HTTP/1.1\r\n" + this.requestText = + "GET /hello HTTP/1.1\r\n" + "Host: localhost\r\n" + "Accept: text/html\r\n" + "Accept-Encoding: gzip,deflate\r\n"; diff --git a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETResourcesTest.java b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETResourcesTest.java index 232c5d1421183f9b2ad9361e19a6fb01d3268790..aedd2bb53883ae5b268c8d6b6611c2988f7248d9 100644 --- a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETResourcesTest.java +++ b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETResourcesTest.java @@ -27,7 +27,8 @@ public class HTTPRequestGETResourcesTest { @BeforeEach public void setUp() throws Exception { - this.requestText = "GET /hello/world.html HTTP/1.1\r\n" + this.requestText = + "GET /hello/world.html HTTP/1.1\r\n" + "Host: localhost\r\n" + "Accept: text/html\r\n" + "Accept-Encoding: gzip,deflate\r\n"; diff --git a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETRootTest.java b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETRootTest.java index 250bb0ef77fcb53f87f8f88c453da3bf9745d972..363662164b9a308e15840a84e3cd20a7584800bb 100644 --- a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETRootTest.java +++ b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestGETRootTest.java @@ -27,7 +27,8 @@ public class HTTPRequestGETRootTest { @BeforeEach public void setUp() throws Exception { - this.requestText = "GET / HTTP/1.1\r\n" + this.requestText = + "GET / HTTP/1.1\r\n" + "Host: localhost\r\n"; this.request = new HTTPRequest(new StringReader(this.requestText + "\r\n")); diff --git a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTEncodedTest.java b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTEncodedTest.java index d2ac5b23c96ac8f5e5ba16faa55cda94af4bcc1c..fceabd5675380848f7747292a6e28b3cc3f9651b 100644 --- a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTEncodedTest.java +++ b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTEncodedTest.java @@ -27,16 +27,20 @@ public class HTTPRequestPOSTEncodedTest { @BeforeEach public void setUp() throws Exception { - this.requestText = "POST / HTTP/1.1\r\n" + this.requestText = + "POST / HTTP/1.1\r\n" + "Host: localhost\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" - + "Content-Length: 116\r\n\r\n" + + "Content-Length: 116\r\n" + + "\r\n" + "message=Hello world!!&mensaje=¡¡Hola mundo!!&mensaxe=Ola mundo!!&mensagem=Olá mundo!!"; - this.encodedRequestText = "POST / HTTP/1.1\r\n" + this.encodedRequestText = + "POST / HTTP/1.1\r\n" + "Host: localhost\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" - + "Content-Length: 116\r\n\r\n" + + "Content-Length: 116\r\n" + + "\r\n" + "message=Hello+world%21%21&mensaje=%C2%A1%C2%A1Hola+mundo%21%21&mensaxe=Ola+mundo%21%21&mensagem=Ol%C3%A1+mundo%21%21"; this.request = new HTTPRequest(new StringReader(this.encodedRequestText)); diff --git a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTMultipleParametersTest.java b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTMultipleParametersTest.java index 4383b9ff4e4756c86ab0f940db3ea0ff20fddfc6..b2a714b985caa5130d899ef2937235108891817f 100644 --- a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTMultipleParametersTest.java +++ b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTMultipleParametersTest.java @@ -25,9 +25,11 @@ public class HTTPRequestPOSTMultipleParametersTest { @BeforeEach public void setUp() throws Exception { - this.requestText = "POST /resource HTTP/1.1\r\n" + this.requestText = + "POST /resource HTTP/1.1\r\n" + "Host: localhost\r\n" - + "Content-Length: 85\r\n\r\n" + + "Content-Length: 85\r\n" + + "\r\n" + "message=Hello world!!&mensaje=¡¡Hola mundo!!&mensaxe=Ola mundo!!&mensagem=Olá mundo!!"; this.request = new HTTPRequest(new StringReader(this.requestText)); diff --git a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTOneParameterTest.java b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTOneParameterTest.java index 6a32a042ba2775f8c03e51e6cbc2a2c7852469d6..67b7b24e5323c54973cb871bbc4f6b66e5eb9027 100644 --- a/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTOneParameterTest.java +++ b/src/test/java/es/uvigo/esei/dai/hybridserver/week1/HTTPRequestPOSTOneParameterTest.java @@ -26,9 +26,11 @@ public class HTTPRequestPOSTOneParameterTest { @BeforeEach public void setUp() throws Exception { - this.requestText = "POST / HTTP/1.1\r\n" + this.requestText = + "POST / HTTP/1.1\r\n" + "Host: localhost\r\n" - + "Content-Length: 21\r\n\r\n" + + "Content-Length: 21\r\n" + + "\r\n" + "message=Hello world!!"; this.request = new HTTPRequest(new StringReader(this.requestText));