Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/acorn/acorn-ws/src/test/java/ca/utoronto/sis/service/enrolment/impl/CreditNoCreditServiceImplTest.java b/acorn/acorn-ws/src/test/java/ca/utoronto/sis/service/enrolment/impl/CreditNoCreditServiceImplTest.java
- index 18bc53731..e2f5a47d0 100644
- --- a/acorn/acorn-ws/src/test/java/ca/utoronto/sis/service/enrolment/impl/CreditNoCreditServiceImplTest.java
- +++ b/acorn/acorn-ws/src/test/java/ca/utoronto/sis/service/enrolment/impl/CreditNoCreditServiceImplTest.java
- @@ -52,17 +52,7 @@ import static org.powermock.api.mockito.PowerMockito.*;
- @PowerMockIgnore({"org.apache.http.conn.ssl.*", "org.apache.log4j.*"})
- public class CreditNoCreditServiceImplTest extends AbstractJAXRSEndpointTest {
- - private static final String BODY_500 = "<html>\n" +
- - "<head>\n" +
- - "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>\n" +
- - "<title>Error 500 java.lang.RuntimeException: thrown on purpose!</title>\n" +
- - "</head>\n" +
- - "<body><h2>HTTP ERROR 500</h2>\n" +
- - "<p>Problem accessing {0}. Reason:\n" +
- - "<pre> java.lang.RuntimeException: thrown on purpose!</pre></p><hr><i><small>Powered by Jetty://</small></i><hr/>\n" +
- - "\n" +
- - "</body>\n" +
- - "</html>\n";
- + private static final String BODY_500 = "Error: 500";
- @BeforeClass
- public static void initialize () throws Exception {
- @@ -161,7 +151,7 @@ public class CreditNoCreditServiceImplTest extends AbstractJAXRSEndpointTest {
- .then()
- // validate the response
- .statusCode(INTERNAL_SERVER_ERROR.getStatusCode())
- - .contentType(equalTo("text/html; charset=ISO-8859-1"))
- + .contentType(equalTo(""))
- .extract().response();
- assertThat(response.asString(), equalTo(MessageFormat.format(BODY_500, "/enrolment/cnc/total-credits")));
- @@ -200,7 +190,7 @@ public class CreditNoCreditServiceImplTest extends AbstractJAXRSEndpointTest {
- .then()
- // validate the response
- .statusCode(INTERNAL_SERVER_ERROR.getStatusCode())
- - .contentType(equalTo("text/html; charset=ISO-8859-1"))
- + .contentType(equalTo(""))
- .extract().response();
- assertThat(response.asString(), equalTo(MessageFormat.format(BODY_500, "/enrolment/cnc/total-credits")));
- @@ -535,7 +525,7 @@ public class CreditNoCreditServiceImplTest extends AbstractJAXRSEndpointTest {
- .then()
- // validate the response
- .statusCode(INTERNAL_SERVER_ERROR.getStatusCode())
- - .contentType(equalTo("text/html; charset=ISO-8859-1"))
- + .contentType(equalTo(""))
- .extract().response();
- assertThat(response.asString(), equalTo(MessageFormat.format(BODY_500, "/enrolment/cnc/info")));
- @@ -576,7 +566,7 @@ public class CreditNoCreditServiceImplTest extends AbstractJAXRSEndpointTest {
- .then()
- // validate the response
- .statusCode(INTERNAL_SERVER_ERROR.getStatusCode())
- - .contentType(equalTo("text/html; charset=ISO-8859-1"))
- + .contentType(equalTo(""))
- .extract().response();
- assertThat(response.asString(), equalTo(MessageFormat.format(BODY_500, "/enrolment/cnc/info")));
- @@ -878,7 +868,7 @@ public class CreditNoCreditServiceImplTest extends AbstractJAXRSEndpointTest {
- .then()
- // validate the response
- .statusCode(INTERNAL_SERVER_ERROR.getStatusCode())
- - .contentType(equalTo("text/html; charset=ISO-8859-1"))
- + .contentType(equalTo(""))
- .extract().response();
- assertThat(response.asString(), equalTo(MessageFormat.format(BODY_500, "/enrolment/cnc/add-cnc")));
- @@ -1180,7 +1170,7 @@ public class CreditNoCreditServiceImplTest extends AbstractJAXRSEndpointTest {
- .then()
- // validate the response
- .statusCode(INTERNAL_SERVER_ERROR.getStatusCode())
- - .contentType(equalTo("text/html; charset=ISO-8859-1"))
- + .contentType(equalTo(""))
- .extract().response();
- assertThat(response.asString(), equalTo(MessageFormat.format(BODY_500, "/enrolment/cnc/remove-cnc")));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
