Author: bdaw Date: 2008-01-22 10:18:20 -0500 (Tue, 22 Jan 2008) New Revision: 9558 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java Log: change order of stuff in Assertion Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-01-22 15:13:40 UTC (rev 9557) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-01-22 15:18:20 UTC (rev 9558) @@ -462,15 +462,15 @@ // PLT.11 Portlet Requests - JSR286_67(new TCK(67), "PLT.11.1.1", "If a portlet receives a request from a client request targeted to the " + + JSR286_67(new TCK(67), JSR168_48, "PLT.11.1.1", "If a portlet receives a request from a client request targeted to the " + "portlet itself, the parameters must be the string parameters encoded in the URL (added when creating the " + - "PortletURL) and the string parameters sent by the client to the portlet as part of the client request.", JSR168_48), - JSR286_68(new TCK(68), "PLT.11.1.1", "The parameters the request object returns must be \"x-www-formurlencoded\" " + - "decoded.", JSR168_49), - JSR286_69(new TCK(69), "PLT.11.1.1", "The value returned from the getParameter method must be the first value in " + - "the array of String objects returned by getParameterValues", JSR168_55), - JSR286_70(new TCK(70), "PLT.11.1.1", "If there is a single parameter value associated with a parameter name the " + - "method must return is an array of size one containing the parameter value.", JSR168_56), + "PortletURL) and the string parameters sent by the client to the portlet as part of the client request."), + JSR286_68(new TCK(68), JSR168_49, "PLT.11.1.1", "The parameters the request object returns must be \"x-www-formurlencoded\" " + + "decoded."), + JSR286_69(new TCK(69), JSR168_55, "PLT.11.1.1", "The value returned from the getParameter method must be the first value in " + + "the array of String objects returned by getParameterValues"), + JSR286_70(new TCK(70), JSR168_56, "PLT.11.1.1", "If there is a single parameter value associated with a parameter name the " + + "method must return is an array of size one containing the parameter value."), JSR286_71(new TCK(71), "PLT.11.1.1", "The getParameterMap method must return an unmodifiable Map object."), JSR286_72(new TCK(72), "PLT.11.1.1", "If the request does not have any parameters, the getParameterMap must return " + "an empty Map object"), @@ -508,8 +508,8 @@ JSR286_86(new TCK(86), "PLT.11.1.2", "Portlets can access a merged set of public and private parameters via the " + "getParameter methods on the PortletRequest or separated as maps of private parameters via the " + "getPrivateParameterMap method and public parameters via the getPublicParameterMap method."), - JSR286_87(new TCK(87), "PLT.11.1.3", "Extra parameters used by the portal/portlet-container must be invisible " + - "to the portlets receiving the request.", JSR168_57), + JSR286_87(new TCK(87), JSR168_57, "PLT.11.1.3", "Extra parameters used by the portal/portlet-container must be invisible " + + "to the portlets receiving the request."), JSR286_88(new TCK(88), "PLT.11.1.4.1", "The portlet can access a map with user information attributes via the " + "request attribute PortletRequest.USER_INFO."), JSR286_89(new TCK(89), "PLT.11.1.4.2", "The PortletRequest.CCPP_PROFILE request attribute must return a " + @@ -519,14 +519,13 @@ "ACTION_PHASE if the current request is of type ActionRequest, EVENT_PHASE if the current request is of type " + "EventRequest, RENDER_PHASE if the current request is of type RenderRequest, and RESOURCE_SERVING_PHASE if the " + "current request is of type ResourceRequest."), - JSR286_91(new TCK(91), "PLT.11.1.6", "If the portlet application is rooted at the base of the web server URL " + - "namespace (also known as \"default\" context), this path must be an empty string.", JSR168_58), - JSR286_92(new TCK(92), "PLT.11.1.6", "Otherwise, it must be the path the portlet application is rooted to, the " + - "path must start with a '/' and it must not end with a '/' character.", JSR168_59), - JSR286_93(new TCK(93), "PLT.11.1.7", "If the user is not authenticated the getAuthType method must return null. ", - JSR168_60), - JSR286_94(new TCK(94), "PLT.11.1.8", "The first element of the enumeration must be the same content type returned " + - "by the getResponseContentType method.", JSR168_61), + JSR286_91(new TCK(91), JSR168_58, "PLT.11.1.6", "If the portlet application is rooted at the base of the web server URL " + + "namespace (also known as \"default\" context), this path must be an empty string."), + JSR286_92(new TCK(92), JSR168_59, "PLT.11.1.6", "Otherwise, it must be the path the portlet application is rooted to, the " + + "path must start with a '/' and it must not end with a '/' character."), + JSR286_93(new TCK(93), JSR168_60, "PLT.11.1.7", "If the user is not authenticated the getAuthType method must return null. "), + JSR286_94(new TCK(94), JSR168_61, "PLT.11.1.8", "The first element of the enumeration must be the same content type returned " + + "by the getResponseContentType method."), JSR286_95(new TCK(95), "PLT.11.1.8", "If the getResponseContentType or getResponseContentTypes methods are exposed " + "via an ActionRequest, EventRequest, or RenderRequest the following additional restrictions apply: The content " + "type must only includes the MIME type, not the character set."), @@ -536,10 +535,10 @@ "of the portlet."), JSR286_97(new TCK(97), "PLT.11.1.12", "The portlet window ID retrieved with the getWindowID method must be the " + "same as the one that is used by the portlet container for scoping the portlet-scope session attributes."), - JSR286_98(new TCK(98), "PLT.11.2.1", "Only one of the two methods, getPortletInputStream or getReader, can be " + + JSR286_98(new TCK(98), JSR168_63, "PLT.11.2.1", "Only one of the two methods, getPortletInputStream or getReader, can be " + "used during an action request. If the input stream is obtained, a call to the getReader must throw an " + "IllegalStateException. Similarly, if the reader is obtained, a call to the getPortletInputStream must throw " + - "an IllegalStateException.", JSR168_63), + "an IllegalStateException."), JSR286_99(new TCK(99), "PLT.11.2.1", "If the user request HTTP POST data is of type " + "application/x-www-form-urlencoded, this data has been already processed by the portal/portlet-container and " + "is available as request parameters. The getPortletInputStream and getReader methods must throw an " + @@ -771,9 +770,9 @@ this(ref, description, section, new Active()); } - Assertion(Ref ref, String section, String description, Assertion assertion) + Assertion(Ref ref, Assertion assertion, String section, String description) { - this(ref, description, section, new Active(), assertion); + this(ref, assertion, description, section, new Active()); } Assertion(Ref ref, String description, Status status) @@ -792,7 +791,7 @@ this.status = status; } - Assertion(Ref ref, String section, String description, Status status, Assertion assertion) + Assertion(Ref ref, Assertion assertion, String section, String description, Status status) { this.ref = ref; this.description = description;