From 0ea6b4b476885356bcdecbb9129b766385e5510e Mon Sep 17 00:00:00 2001 From: Miguel Reboiro Jato Date: Fri, 22 Sep 2023 18:28:23 +0200 Subject: [PATCH] Improves format of HTTPRequest tests The request has been reformated for a better readibility. --- .../week1/HTTPBadRequestsTest.java | 33 ++++++++++++++----- .../week1/HTTPRequestGETParametersTest.java | 6 ++-- .../week1/HTTPRequestGETResourceTest.java | 3 +- .../week1/HTTPRequestGETResourcesTest.java | 3 +- .../week1/HTTPRequestGETRootTest.java | 3 +- .../week1/HTTPRequestPOSTEncodedTest.java | 12 ++++--- ...HTTPRequestPOSTMultipleParametersTest.java | 6 ++-- .../HTTPRequestPOSTOneParameterTest.java | 6 ++-- 8 files changed, 50 insertions(+), 22 deletions(-) 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 d7063cd..6b290c0 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 436ba2e..d920445 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 e1d083e..52b074e 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 232c5d1..aedd2bb 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 250bb0e..3636621 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 d2ac5b2..fceabd5 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 4383b9f..b2a714b 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 6a32a04..67b7b24 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)); -- 2.18.1