PLUTO-667 TCK: Contesting V2ResponseTests_MimeResponse_ApiRender_setC…

…ontentType4 and V2ResponseTests_RenderResponse_ApiRender_setContentType2
apache · Nov 22, 2017 · 280e273 · 280e273
1 parent 33cdbe2
commit 280e273
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 30 deletions.
diff --git a/...eTests/src/main/java/javax/portlet/tck/portlets/ResponseTests_MimeResponse_ApiRender.java b/...eTests/src/main/java/javax/portlet/tck/portlets/ResponseTests_MimeResponse_ApiRender.java
@@ -109,10 +109,22 @@ public void render(RenderRequest portletReq, RenderResponse portletResp)
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
-
       JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
 
+      /* TestCase: V2ResponseTests_MimeResponse_ApiRender_setContentType4 */
+      /* Details: "Method setContentType(String): Throws */
+      /* IllegalArgumentException if the specified MIME type is invalid" */
+      TestResult tr11 = tcd.getTestResultFailed(
+          V2RESPONSETESTS_MIMERESPONSE_APIRENDER_SETCONTENTTYPE4);
+      try {
+         portletResp.setContentType("Invalid");
+         tr11.appendTcDetail("Method did not throw Exception");
+      } catch (IllegalArgumentException iae) {
+         tr11.setTcSuccess(true);
+      }
+      PrintWriter writer = portletResp.getWriter();
+      tr11.writeTo(writer);
+
       // Create result objects for the tests
 
       ClassChecker cc = new ClassChecker(portletResp.getClass());
@@ -265,19 +277,6 @@ public void render(RenderRequest portletReq, RenderResponse portletResp)
       }
       tr10.writeTo(writer);
 
-      /* TestCase: V2ResponseTests_MimeResponse_ApiRender_setContentType4 */
-      /* Details: "Method setContentType(String): Throws */
-      /* IllegalArgumentException if the specified MIME type is invalid" */
-      TestResult tr11 = tcd.getTestResultFailed(
-            V2RESPONSETESTS_MIMERESPONSE_APIRENDER_SETCONTENTTYPE4);
-      try {
-         portletResp.setContentType("Invalid");
-         tr11.appendTcDetail("Method did not throw Exception");
-      } catch (IllegalArgumentException iae) {
-         tr11.setTcSuccess(true);
-      }
-      tr11.writeTo(writer);
-
       /*
        * TestCase: V2ResponseTests_MimeResponse_ApiRender_getCharacterEncoding
        */

diff --git a/...ests/src/main/java/javax/portlet/tck/portlets/ResponseTests_RenderResponse_ApiRender.java b/...ests/src/main/java/javax/portlet/tck/portlets/ResponseTests_RenderResponse_ApiRender.java
@@ -77,10 +77,22 @@ public void render(RenderRequest portletReq, RenderResponse portletResp)
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
-
       JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
 
+      /* TestCase: V2ResponseTests_RenderResponse_ApiRender_setContentType2 */
+      /* Details: "Method setContentType(String): Throws */
+      /* IllegalArgumentException if the content type is not valid" */
+      TestResult tr3 = tcd.getTestResultFailed(
+          V2RESPONSETESTS_RENDERRESPONSE_APIRENDER_SETCONTENTTYPE2);
+      try {
+         portletResp.setContentType("Invalid");
+         tr3.appendTcDetail("Method did not throw Exception");
+      } catch (IllegalArgumentException iae) {
+         tr3.setTcSuccess(true);
+      }
+      PrintWriter writer = portletResp.getWriter();
+      tr3.writeTo(writer);
+
       // Create result objects for the tests
 
       /* TestCase: V2ResponseTests_RenderResponse_ApiRender_setTitle2 */
@@ -112,19 +124,6 @@ public void render(RenderRequest portletReq, RenderResponse portletResp)
       tr2.setTcSuccess(true);
       tr2.writeTo(writer);
 
-      /* TestCase: V2ResponseTests_RenderResponse_ApiRender_setContentType2 */
-      /* Details: "Method setContentType(String): Throws */
-      /* IllegalArgumentException if the content type is not valid" */
-      TestResult tr3 = tcd.getTestResultFailed(
-            V2RESPONSETESTS_RENDERRESPONSE_APIRENDER_SETCONTENTTYPE2);
-      try {
-         portletResp.setContentType("Invalid");
-         tr3.appendTcDetail("Method did not throw Exception");
-      } catch (IllegalArgumentException iae) {
-         tr3.setTcSuccess(true);
-      }
-      tr3.writeTo(writer);
-
    }
 
 }