gatein SVN: r3356 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-06-17 05:46:57 -0400 (Thu, 17 Jun 2010)
New Revision: 3356
Added:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_016_CreateNewNodeWithNameIsTheSameWithExistingOneInTheSameLevel.html
Log:
TESTVN-399: Create new GateIn Selenium Scrips
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_016_CreateNewNodeWithNameIsTheSameWithExistingOneInTheSameLevel.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_016_CreateNewNodeWithNameIsTheSameWithExistingOneInTheSameLevel.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_016_CreateNewNodeWithNameIsTheSameWithExistingOneInTheSameLevel.html 2010-06-17 09:46:57 UTC (rev 3356)
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_POR_14_01_016_CreateNewNodeWithNameIsTheSameWithExistingOneInTheSameLevel</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_14_01_016_CreateNewNodeWithNameIsTheSameWithExistingOneInTheSameLevel</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>Test_POR_14_01_016</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>label</td>
+ <td>Test_POR_14_01_016</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageNodeForm', 'UIPageSelector2');javascript:eXo.webui.UIForm.submitEvent('fcabb348-1fd7-4124-9a87-df30b8455fc4#UIPageNodeForm','SelectTab','&objectId=UIPageSelector2')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageNodeForm', 'UIPageSelector2');javascript:eXo.webui.UIForm.submitEvent('fcabb348-1fd7-4124-9a87-df30b8455fc4#UIPageNodeForm','SelectTab','&objectId=UIPageSelector2')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageNodeForm', 'Icon');javascript:eXo.webui.UIForm.submitEvent('fcabb348-1fd7-4124-9a87-df30b8455fc4#UIPageNodeForm','SelectTab','&objectId=Icon')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageNodeForm', 'Icon');javascript:eXo.webui.UIForm.submitEvent('fcabb348-1fd7-4124-9a87-df30b8455fc4#UIPageNodeForm','SelectTab','&objectId=Icon')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Add Add new node with Name is the same with existing one in the same level in 1 navigation--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>Test_POR_14_01_016</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>label</td>
+ <td>Test_POR_14_01_016</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageNodeForm', 'UIPageSelector2');javascript:eXo.webui.UIForm.submitEvent('fcabb348-1fd7-4124-9a87-df30b8455fc4#UIPageNodeForm','SelectTab','&objectId=UIPageSelector2')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageNodeForm', 'UIPageSelector2');javascript:eXo.webui.UIForm.submitEvent('fcabb348-1fd7-4124-9a87-df30b8455fc4#UIPageNodeForm','SelectTab','&objectId=UIPageSelector2')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageNodeForm', 'Icon');javascript:eXo.webui.UIForm.submitEvent('fcabb348-1fd7-4124-9a87-df30b8455fc4#UIPageNodeForm','SelectTab','&objectId=Icon')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageNodeForm', 'Icon');javascript:eXo.webui.UIForm.submitEvent('fcabb348-1fd7-4124-9a87-df30b8455fc4#UIPageNodeForm','SelectTab','&objectId=Icon')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[4]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[4]/div/div/div[1]/div/div/div/div/div/div/div/div[2]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Back</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Back</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- View node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete node--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_14_01_016']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Delete Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Delete Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertConfirmation</td>
+ <td>Are you sure you want to delete this node?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
14 years, 6 months
gatein SVN: r3355 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-06-17 05:45:20 -0400 (Thu, 17 Jun 2010)
New Revision: 3355
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java
Log:
GTNPORTAL-1325 Should validate First/Last name field is between 1-45 chars in user and group management
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2010-06-17 03:58:55 UTC (rev 3354)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2010-06-17 09:45:20 UTC (rev 3355)
@@ -65,12 +65,10 @@
MandatoryValidator.class).addValidator(StringLengthValidator.class, 3, 30).addValidator(
ResourceValidator.class).addValidator(ExpressionValidator.class, Utils.USER_NAME_VALIDATOR_REGEX,
"ResourceValidator.msg.Invalid-char"));
- addUIFormInput(new UIFormStringInput("firstName", "firstName", null).setMaxLength(45).addValidator(
- StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator(
- ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg"));
- addUIFormInput(new UIFormStringInput("lastName", "lastName", null).setMaxLength(45).addValidator(
- StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator(
- ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg"));
+ addUIFormInput(new UIFormStringInput("firstName", "firstName", null).addValidator(
+ StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class));
+ addUIFormInput(new UIFormStringInput("lastName", "lastName", null).addValidator(
+ StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class));
addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator(
EmailAddressValidator.class));
UIFormCheckBoxInput<Boolean> uiCheckbox = new UIFormCheckBoxInput<Boolean>(CHANGEPASS, null, false);
14 years, 6 months
gatein SVN: r3354 - portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: vuthelinh
Date: 2010-06-16 23:58:55 -0400 (Wed, 16 Jun 2010)
New Revision: 3354
Modified:
portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java
Log:
TESTVN-927 : SeleniumTestCaseGenerator.java updated with 3 new functions
Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-06-16 22:34:14 UTC (rev 3353)
+++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-06-17 03:58:55 UTC (rev 3354)
@@ -90,14 +90,14 @@
sb.append("public String speed = \"100\";\n");
sb.append("public String timeout = \"30000\";\n");
sb.append("public int timeoutSecInt = 30;\n");
- sb.append("public String browser = \"firefox\";\n");
+ sb.append("public String browser = \"firefox\";\n");
sb.append("public String host = \"localhost\";\n");
sb.append("public void setSpeed() {\n selenium.setSpeed(speed);\n}\n\n");
sb.append("public void setUp() throws Exception {\n");
sb.append(" browser = System.getProperty(\"selenium.browser\", browser);\n");
sb.append(" timeout = System.getProperty(\"selenium.timeout\", timeout);\n");
sb.append(" timeoutSecInt = Integer.parseInt(timeout)/1000;\n");
- sb.append(" speed = System.getProperty(\"selenium.speed\", speed);\n");
+ sb.append(" speed = System.getProperty(\"selenium.speed\", speed);\n");
sb.append(" host = System.getProperty(\"selenium.host\", host);\n");
sb.append(" super.setUp(\"http://\" + host + \":8080/portal/\", \"*\" + browser);\n");
sb.append("}\n\n");
@@ -162,6 +162,16 @@
sb.append("TestCase.assertTrue(selenium.getConfirmation().matches(\"^");
sb.append(param2);
sb.append("$\"));\n");
+ } else if (param1.equals("assertLocation")) {
+ sb.append("TestCase.assertTrue(selenium.getLocation().matches(\"^");
+ sb.append(param2);
+ sb.append("$\"));\n");
+ }else if (param1.equals("waitForValue")) {
+ sb.append("TestCase.assertTrue(selenium.getValue(\"");
+ sb.append(param2);
+ sb.append("\").matches(\"^");
+ sb.append(param3);
+ sb.append("$\"));\n");
} else if (param1.equals("assertElementPresent") || param1.equals("assertElementNotPresent")) {
if (param1.equals("assertElementPresent")) {
sb.append("TestCase.assertTrue");
@@ -290,7 +300,7 @@
sb.append(param2);
sb.append("\")) \nbreak; }\n catch (Exception e) {}\n");
sb.append("Thread.sleep(1000);\n");
- sb.append("}\n");
+ sb.append("}\n");
} else if (param1.equals("waitForTextNotPresent")) {
sb.append("for (int second = 0;; second++) {\n");
sb.append(getTimeoutMessage(param1));
@@ -298,7 +308,7 @@
sb.append(param2);
sb.append("\")) \nbreak; }\n catch (Exception e) {}\n");
sb.append("Thread.sleep(1000);\n");
- sb.append("}\n");
+ sb.append("}\n");
} else if (param1.equals("waitForTable")) {
sb.append("for (int second = 0;; second++) {\n");
sb.append(getTimeoutMessage(param1));
@@ -386,6 +396,9 @@
sb.append("verifyFalse(selenium.isChecked(\"").append(param2).append("\"));\n");
} else if (param1.equals("deleteCookie")) {
sb.append("selenium.deleteCookie(\"").append(param2).append("\",\"").append(param3).append("\");\n");
+ } else if (param1.equals("windowMaximize")) {
+ sb.append("selenium.windowMaximize()").append(";\n");
+
} else if (param1.equals("waitForText")) {
sb.append("for (int second = 0;; second++) {\n");
sb.append(getTimeoutMessage(param1));
@@ -520,4 +533,4 @@
private static final String[] _FIX_PARAM_NEW_SUBS = new String[] { "\\n", "\\n" };
public static final String SLASH = "/";
-}
+}
14 years, 6 months
gatein SVN: r3353 - in components/wsrp/trunk: wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1 and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-06-16 18:34:14 -0400 (Wed, 16 Jun 2010)
New Revision: 3353
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
Log:
GTNWSRP-46: Disable a few tests in MarkupTestCase which assume we are using an actual http request to the producer instead of a mock one.
Minor code formatting fixes
Fix issue with never using the correct locale due to clearing the list before comparing.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java 2010-06-16 17:47:37 UTC (rev 3352)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RequestProcessor.java 2010-06-16 22:34:14 UTC (rev 3353)
@@ -61,6 +61,7 @@
import org.oasis.wsrp.v2.UnsupportedWindowState;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -246,7 +247,7 @@
// use user-desired locales
List<String> locales = params.getLocales();
- List<String> supportedLocales = markupType.getLocales();
+ List<String> supportedLocales = new ArrayList<String>(markupType.getLocales());
if (supportedLocales != null)
{
// reset markup type locales
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-16 17:47:37 UTC (rev 3352)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-16 22:34:14 UTC (rev 3353)
@@ -80,35 +80,35 @@
super("MarkupTestCase", DEFAULT_MARKUP_PORTLET_WAR);
}
- @Deployment
- public static JavaArchive createDeployment()
- {
- return ShrinkWrap.create("test.jar", JavaArchive.class);
- }
-
- @Before
- public void setUp() throws Exception
- {
- if (System.getProperty("test.deployables.dir") != null)
- {
- super.setUp();
- //hack to get around having to have a httpservletrequest when accessing the producer services
- //I don't know why its really needed, seems to be a dependency where wsrp connects with the pc module
- ServletAccess.setRequestAndResponse(MockHttpServletRequest.createMockRequest(null), MockHttpServletResponse.createMockResponse());
- }
- }
-
-
- @After
- public void tearDown() throws Exception
- {
- if (System.getProperty("test.deployables.dir") != null)
- {
- super.tearDown();
- }
- }
-
- @Test
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class);
+ }
+
+ @Before
+ public void setUp() throws Exception
+ {
+ if (System.getProperty("test.deployables.dir") != null)
+ {
+ super.setUp();
+ //hack to get around having to have a httpservletrequest when accessing the producer services
+ //I don't know why its really needed, seems to be a dependency where wsrp connects with the pc module
+ ServletAccess.setRequestAndResponse(MockHttpServletRequest.createMockRequest(null), MockHttpServletResponse
+ .createMockResponse());
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception
+ {
+ if (System.getProperty("test.deployables.dir") != null)
+ {
+ super.tearDown();
+ }
+ }
+
+ @Test
public void testGetMarkupViewNoSession() throws Exception
{
V1GetMarkup getMarkup = createMarkupRequest();
@@ -118,7 +118,7 @@
checkMarkupResponse(response, DEFAULT_VIEW_MARKUP);
}
- @Test
+ @Test
public void testInvalidGetMarkup() throws Exception
{
V1GetMarkup getMarkup = createMarkupRequest();
@@ -166,7 +166,7 @@
"d><td><input name='symbol'/></td></tr><tr><td><input type='submit' value='Submit'></td></tr></table></form>");
}
- @Test
+ @Test
public void testGetMarkupRenderParameters() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -224,7 +224,7 @@
}
// fix-me: add more tests
- @Test
+ @Test
public void testGetMarkupSession() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -263,13 +263,13 @@
}
}
- @Test
+ @Test
public void testPerformBlockingInteractionNoRedirect() throws Exception
{
checkPBIAndGetNavigationalState("RHAT");
}
- @Test
+ @Test
public void testPerformBlockingInteractionRedirect() throws Exception
{
V1PerformBlockingInteraction performBlockingInteraction =
@@ -295,7 +295,7 @@
ExtendedAssert.assertNull(updateResponse);
}
- @Test
+ @Test
public void testGMAndPBIInteraction() throws Exception
{
testGetMarkupViewNoSession();
@@ -308,7 +308,7 @@
checkMarkupResponse(response, "<p>" + symbol + " stock value: 123.45</p>");
}
- @Test
+ @Test
public void testPBIWithSessionID() throws Exception
{
String portletHandle = getDefaultHandle();
@@ -329,7 +329,7 @@
}
}
- @Test
+ @Test
public void testMarkupCaching() throws Exception
{
V1GetMarkup getMarkup = createMarkupRequest();
@@ -353,7 +353,7 @@
undeploy(sessionPortletArchive);
}
- @Test
+ @Test
public void testGetMarkupWithDispatcherPortlet() throws Exception
{
@@ -374,7 +374,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithNoContent() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -394,7 +394,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithNonStandardLocalesStrictMode() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -402,13 +402,17 @@
deploy(getLocalesPortletArchive);
V1GetMarkup getMarkup = createMarkupRequestForCurrentlyDeployedPortlet();
+ // we need to clear the value first for this test since the getLocales will be populated
+ // with default values for the system, and since en_US is not marked as a supported-locale in portlet.xml
+ // the default values will be used.
+ getMarkup.getMarkupParams().getLocales().clear();
getMarkup.getMarkupParams().getLocales().add("en_US");
try
{
producer.getMarkup(getMarkup);
- //fail("Should have trown an UnsupportetLocaleFault"); // ideally cf http://jira.jboss.com/jira/browse/JBPORTAL-857
- ExtendedAssert.fail("Should have trown an exception"); // right now
+ //fail("Should have thrown an UnsupportetLocaleFault"); // ideally cf http://jira.jboss.com/jira/browse/JBPORTAL-857
+ ExtendedAssert.fail("Should have thrown an exception"); // right now
}
catch (Exception expected)
{
@@ -421,7 +425,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithNonStandardLocalesLenientMode() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -429,6 +433,10 @@
deploy(getLocalesPortletArchive);
V1GetMarkup getMarkup = createMarkupRequestForCurrentlyDeployedPortlet();
+ // we need to clear the value first for this test since the getLocales will be populated
+ // with default values for the system, and since en_US is not marked as a supported-locale in portlet.xml
+ // the default values will be used.
+ getMarkup.getMarkupParams().getLocales().clear();
getMarkup.getMarkupParams().getLocales().add("en_US");
// Use the lenient mode
@@ -439,7 +447,7 @@
undeploy(getLocalesPortletArchive);
}
- @Test
+ @Test
public void testGetMarkupWithoutDeclaredLocale() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -458,7 +466,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupLocales() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -493,7 +501,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithEncodedURLs() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -514,7 +522,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupWithUserContext() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -535,7 +543,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupMultiValuedFormParams() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -578,7 +586,7 @@
}
}
- @Test
+ @Test
public void testImplicitCloning() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -630,7 +638,8 @@
return namedString;
}
- @Test
+ //TODO: enable this test, it doesn't work or make sense right now since we are using a mockhttpservletrequest
+ //@Test
public void testGetMarkupWithResource() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -657,7 +666,8 @@
}
}
- @Test
+ //TODO: enable this test, it doesn't work or make sense right now since we are using a mockhttpservletrequest
+ //@Test
public void testGetMarkupWithNonURLEncodedResource() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -684,7 +694,7 @@
}
}
- @Test
+ @Test
public void testApplicationScopeVariableHandling() throws Exception
{
undeploy(DEFAULT_MARKUP_PORTLET_WAR);
@@ -709,7 +719,7 @@
}
}
- @Test
+ @Test
public void testGetMarkupNoRegistrationWhenRegistrationRequired() throws Exception
{
configureRegistrationSettings(true, false);
@@ -730,7 +740,7 @@
}
}
- @Test
+ @Test
public void testPerformBlockingInteractionNoRegistrationWhenRegistrationRequired() throws Exception
{
configureRegistrationSettings(true, false);
@@ -751,7 +761,7 @@
}
}
- @Test
+ @Test
public void testInitCookieNoRegistrationWhenRegistrationRequired() throws Exception
{
configureRegistrationSettings(true, false);
14 years, 6 months
gatein SVN: r3351 - components/wsrp/trunk/wsrp-producer-war.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-06-16 13:41:26 -0400 (Wed, 16 Jun 2010)
New Revision: 3351
Modified:
components/wsrp/trunk/wsrp-producer-war/pom.xml
Log:
GTNWSRP-46: use a jboss zip instead of an exploded jbossas distribution for the tests. The tests will handle unziping it. Need to set JBOSS_ZIP_URL instead of JBOSS_HOME.
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-16 16:09:05 UTC (rev 3350)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-16 17:41:26 UTC (rev 3351)
@@ -292,7 +292,10 @@
<configuration>
<container>
<containerId>jboss51x</containerId>
- <home>${JBOSS_HOME}</home>
+ <zipUrlInstaller>
+ <url>${JBOSS_ZIP_URL}</url>
+ <installDir>${basedir}/target/servers</installDir>
+ </zipUrlInstaller>
<log>${basedir}/target/jboss51x/container.log</log>
<systemProperties>
<!-- Since the tests run on the server, we need to pass system properties to the
14 years, 6 months
gatein SVN: r3350 - in components/wsrp/trunk: wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1 and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-06-16 12:09:05 -0400 (Wed, 16 Jun 2010)
New Revision: 3350
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java
Log:
GTNWSRP-46: fix issues with the ServiceDescriptionTestCase, should now pass.
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java 2010-06-16 15:36:15 UTC (rev 3349)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java 2010-06-16 16:09:05 UTC (rev 3350)
@@ -1073,6 +1073,27 @@
}
}
+ public static V1PropertyDescription toV1PropertyDescription(PropertyDescription propertyDescription)
+ {
+ if (propertyDescription != null)
+ {
+ V1PropertyDescription result = WSRP1TypeFactory.createPropertyDescription(propertyDescription.getName().toString(), propertyDescription.getType());
+ result.setHint(toV1LocalizedString(propertyDescription.getHint()));
+ result.setLabel(toV1LocalizedString(propertyDescription.getLabel()));
+ List<V1Extension> extensions = WSRPUtils.transform(propertyDescription.getExtensions(), EXTENSION);
+ if (extensions != null)
+ {
+ result.getExtensions().addAll(extensions);
+ }
+
+ return result;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
private static class V2ToV1Extension implements Function<Extension, V1Extension>
{
public V1Extension apply(Extension from)
@@ -1260,23 +1281,7 @@
public V1PropertyDescription apply(PropertyDescription from)
{
- if (from != null)
- {
- V1PropertyDescription result = WSRP1TypeFactory.createPropertyDescription(from.getName().toString(), from.getType());
- result.setHint(toV1LocalizedString(from.getHint()));
- result.setLabel(toV1LocalizedString(from.getLabel()));
- List<V1Extension> extensions = WSRPUtils.transform(from.getExtensions(), EXTENSION);
- if (extensions != null)
- {
- result.getExtensions().addAll(extensions);
- }
-
- return result;
- }
- else
- {
- return null;
- }
+ return toV1PropertyDescription(from);
}
}
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java 2010-06-16 15:36:15 UTC (rev 3349)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java 2010-06-16 16:09:05 UTC (rev 3350)
@@ -33,6 +33,7 @@
import org.gatein.wsrp.protocol.v1.V1ProducerBaseTest;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
import org.gatein.wsrp.servlet.ServletAccess;
+import org.gatein.wsrp.spec.v1.V2ToV1Converter;
import org.gatein.wsrp.test.ExtendedAssert;
import org.gatein.wsrp.test.support.MockHttpServletRequest;
import org.gatein.wsrp.test.support.MockHttpServletResponse;
@@ -127,7 +128,7 @@
checkRequiredRegistrationProperties(sd, regProp);
// No offered portlets without registration!
- ExtendedAssert.assertNull(sd.getOfferedPortlets());
+ ExtendedAssert.assertTrue("Should not get any offered portlets back. Retrieved " + sd.getOfferedPortlets(), (sd.getOfferedPortlets() == null || sd.getOfferedPortlets().isEmpty()));
}
@Test
@@ -192,6 +193,6 @@
List<V1PropertyDescription> propertyDescriptions = registrationPropertyDescription.getPropertyDescriptions();
ExtendedAssert.assertNotNull(propertyDescriptions);
ExtendedAssert.assertEquals(1, propertyDescriptions.size());
- assertEquals(WSRPUtils.convertToPropertyDescription(regProp), propertyDescriptions.get(0));
+ assertEquals(V2ToV1Converter.toV1PropertyDescription(WSRPUtils.convertToPropertyDescription(regProp)), propertyDescriptions.get(0));
}
}
\ No newline at end of file
14 years, 6 months
gatein SVN: r3349 - components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-06-16 11:36:15 -0400 (Wed, 16 Jun 2010)
New Revision: 3349
Modified:
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/V1ProducerBaseTest.java
Log:
GTNWSRP-46: fix issues with the PortletManagementTestCase, should now pass.
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java 2010-06-16 15:11:02 UTC (rev 3348)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java 2010-06-16 15:36:15 UTC (rev 3349)
@@ -175,7 +175,8 @@
response = producer.destroyPortlets(destroyPortlets);
ExtendedAssert.assertNotNull(response);
failures = response.getDestroyFailed();
- ExtendedAssert.assertNull(failures);
+
+ ExtendedAssert.assertTrue("Got back failures when none expected :" + failures, (failures == null || failures.isEmpty()));
}
@Test
@@ -252,9 +253,12 @@
WSRP1TypeFactory.createProperty("prefName2", "en", "prefValue2"));
checkGetPropertiesResponse(response, expected);
+ //This part of the tests doesn't make sense as names is a reference to the list, not a clone
+ //Changed test to check for a empty list since calling names.clear
names.clear();
response = producer.getPortletProperties(getPortletProperties);
- checkGetPropertiesResponse(response, expected);
+ //checkGetPropertiesResponse(response, expected);
+ checkGetPropertiesResponse(response, new ArrayList<V1Property>());
names.add("prefName2");
response = producer.getPortletProperties(getPortletProperties);
@@ -323,6 +327,8 @@
V1PortletContext response = producer.setPortletProperties(setPortletProperties);
V1GetPortletProperties getPortletProperties = WSRP1TypeFactory.createGetPortletProperties(null, response);
+ Collections.addAll(getPortletProperties.getNames(), "prefName1", "prefName2");
+
checkGetPropertiesResponse(producer.getPortletProperties(getPortletProperties), properties);
portletContext = WSRP1TypeFactory.createPortletContext(handle);
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/V1ProducerBaseTest.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/V1ProducerBaseTest.java 2010-06-16 15:11:02 UTC (rev 3348)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/V1ProducerBaseTest.java 2010-06-16 15:36:15 UTC (rev 3349)
@@ -232,10 +232,12 @@
ExtendedAssert.fail(message + "Different classes or not both null.");
}
-
assertEquals(message + "Extensions", expected.getExtensions(), tested.getExtensions());
assertEquals(message + "Locales", expected.getLocales(), tested.getLocales());
assertEquals(message + "Modes", expected.getModes(), tested.getModes());
+
+ Collections.sort(expected.getWindowStates());
+ Collections.sort(tested.getWindowStates());
assertEquals(message + "Window states", expected.getWindowStates(), tested.getWindowStates());
}
}
14 years, 6 months
gatein SVN: r3348 - sandbox/mobile_delivery/trunk/examples/portlets/jsphellouser/src/main/webapp/jsp.
by do-not-reply＠jboss.org
Author: jpourtet
Date: 2010-06-16 11:11:02 -0400 (Wed, 16 Jun 2010)
New Revision: 3348
Modified:
sandbox/mobile_delivery/trunk/examples/portlets/jsphellouser/src/main/webapp/jsp/welcome.jsp
Log:
modified jspHelloUser to add iPhone style
Modified: sandbox/mobile_delivery/trunk/examples/portlets/jsphellouser/src/main/webapp/jsp/welcome.jsp
===================================================================
--- sandbox/mobile_delivery/trunk/examples/portlets/jsphellouser/src/main/webapp/jsp/welcome.jsp 2010-06-16 13:28:42 UTC (rev 3347)
+++ sandbox/mobile_delivery/trunk/examples/portlets/jsphellouser/src/main/webapp/jsp/welcome.jsp 2010-06-16 15:11:02 UTC (rev 3348)
@@ -1,37 +1,124 @@
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
-<div class="portlet-section-header">Welcome !</div>
+<style type="text/css">
+ body {
+ background-color: #ddd;
+ color: #222;
+ font-family: Helvetica;
+ font-size: 14px;
+ margin: 0;
+ padding: 0;
+
+ text-align: justify;
+ }
+ #header {
+ background-color: #ccc;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#ccc), to(#999));
+ border-color: #666;
+ border-style: solid;
+ border-width: 0 0 1px 0;
+ }
+ #header h1 {
+ color: #222;
+ font-size: 20px;
+ font-weight: bold;
+ margin: 0 auto;
+ padding: 10px 0;
+ text-align: center;
+ text-shadow: 0px 1px 0px #fff;
+
+ /* below for header ellipsis */
+ max-width: 160px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+
+ }
+ ul {
+ list-style: none;
+ margin: 10px;
+ padding: 0;
+ }
+ ul li a {
+ background-color: #FFF;
+ border: 1px solid #999;
+ color: #222;
+ display: block;
+ font-size: 17px;
+ font-weight: bold;
+ margin-bottom: -1px;
+ padding: 12px 10px;
+ text-decoration: none;
+ }
+ ul li:first-child a {
+ -webkit-border-top-left-radius: 8px;
+ -webkit-border-top-right-radius: 8px;
+ }
+ ul li:last-child a {
+ -webkit-border-bottom-left-radius: 8px;
+ -webkit-border-bottom-right-radius: 8px;
+ }
+ ul li a:active,ul li a:hover {
+ /* background-color:blue;*/
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5d87b1), to(#2c6aa9));
+ color:white;
+ }
+ #content {
+ padding: 10px;
+ text-shadow: 0px 1px 0px #fff;
+ }
+ #content a {
+ color: blue;
+ }
+
+ #progress {
+ -webkit-border-radius: 10px;
+ background-color: rgba(0,0,0,.7);
+ color: white;
+ font-size: 18px;
+ font-weight: bold;
+ height: 80px;
+ left: 60px;
+ line-height: 80px;
+ margin: 0 auto;
+ position: absolute;
+ text-align: center;
+ top: 120px;
+ width: 200px;
+ }
+
+ #header div.leftButton {
+ font-weight: bold;
+ text-align: center;
+ line-height: 28px;
+ color: white;
+ text-shadow: rgba(0,0,0,0.6) 0px -1px 0px;
+ position: absolute;
+ top: 7px;
+ left: 6px;
+ max-width: 50px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ border-width: 0 8px 0 14px;
+ -webkit-border-image: url(../images/back_button.png) 0 8 0 14;
+ -webkit-tap-highlight-color: rgba(0,0,0,0);
+ }
+
+ #header div.leftButton.clicked {
+ -webkit-border-image: url(../images/back_button_clicked.png) 0 8 0 14;
+ }
-<br/>
+</style>
+<div id="container">
+ <div id="header">
+ <!--h2><a href="./">None</a></h2-->
-<div class="portlet-font">
-
- Welcome on the JSP Hello User portlet,
-my name is JBoss Portal. What's yours ?</div>
-
-<br/>
-
-<div class="portlet-font">Method 1: We simply pass the parameter to the render phase:<br/>
-<a href="<portlet:renderURL><portlet:param name="yourname" value="John Doe"/></portlet:renderURL>">John Doe</a></div>
-
-<br/>
-
-<div class="portlet-font">Method 2: We pass the parameter to the render phase, using valid markup:
-Please check the source code to see the difference with Method 1.
-<portlet:renderURL var="myRenderURL">
- <portlet:param name="yourname" value='John Doe'/>
-</portlet:renderURL>
-<br/>
-<a href="<%= myRenderURL %>">John Doe</a></div>
-
-<br/>
-
-<div class="portlet-font">Method 3: We use a form:<br/>
-
-<portlet:actionURL var="myActionURL"/>
-<form action="<%= myActionURL %>" method="POST">
- <span class="portlet-form-field-label">Name:</span>
- <input class="portlet-form-input-field" type="text" name="yourname"/>
- <input class="portlet-form-button" type="Submit"/>
-</form>
+ <div id="menu">
+ <ul>
+ <li><a href="about.html">About Red Hat</a></li>
+ <li><a href="rh-logo.html">Red Hat Logo</a></li>
+ <li><a href="fedora.html">Fedora</a></li>
+ </ul>
+ </div>
</div>
\ No newline at end of file
14 years, 6 months
gatein SVN: r3347 - components/wsrp/trunk/wsrp-producer-war.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-06-16 09:28:42 -0400 (Wed, 16 Jun 2010)
New Revision: 3347
Modified:
components/wsrp/trunk/wsrp-producer-war/pom.xml
Log:
GTNWSRP-46: Change the Cargo configuration home from a tmp directory to the target directory to get around issues with some tmp directory names and urls.
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-16 11:22:01 UTC (rev 3346)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-16 13:28:42 UTC (rev 3347)
@@ -305,6 +305,7 @@
</container>
<wait>false</wait>
<configuration>
+ <home>${basedir}/target/cargo</home>
<properties>
<cargo.jvmargs>-Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=false</cargo.jvmargs>
</properties>
14 years, 6 months
gatein SVN: r3346 - in components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol: v2 and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-16 07:22:01 -0400 (Wed, 16 Jun 2010)
New Revision: 3346
Added:
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/V2ProducerBaseTest.java
Log:
- Started adding v2 tests.
Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java (rev 0)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-16 11:22:01 UTC (rev 3346)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.gatein.wsrp.protocol.v2;
+
+import org.gatein.common.util.ParameterValidation;
+import org.gatein.wsrp.spec.v2.WSRP2Constants;
+import org.gatein.wsrp.test.ExtendedAssert;
+import org.oasis.wsrp.v2.InvalidRegistration;
+import org.oasis.wsrp.v2.OperationFailed;
+import org.oasis.wsrp.v2.ServiceDescription;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class ServiceDescriptionTestCase extends V2ProducerBaseTest
+{
+ protected ServiceDescriptionTestCase() throws Exception
+ {
+ super(ServiceDescriptionTestCase.class.getSimpleName());
+ }
+
+ public void testSupportedOptions() throws OperationFailed, InvalidRegistration
+ {
+ ServiceDescription description = producer.getServiceDescription(getNoRegistrationServiceDescriptionRequest());
+
+ ExtendedAssert.assertNotNull(description);
+ List<String> options = description.getSupportedOptions();
+ ExtendedAssert.assertTrue(ParameterValidation.existsAndIsNotEmpty(options));
+ ExtendedAssert.assertTrue(options.contains(WSRP2Constants.OPTIONS_EVENTS));
+ ExtendedAssert.assertTrue(options.contains(WSRP2Constants.OPTIONS_IMPORT));
+ ExtendedAssert.assertTrue(options.contains(WSRP2Constants.OPTIONS_EXPORT));
+ }
+}
Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/V2ProducerBaseTest.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/V2ProducerBaseTest.java (rev 0)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/V2ProducerBaseTest.java 2010-06-16 11:22:01 UTC (rev 3346)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.gatein.wsrp.protocol.v2;
+
+import org.gatein.wsrp.WSRPTypeFactory;
+import org.gatein.wsrp.producer.ProducerHolder;
+import org.gatein.wsrp.producer.WSRPProducerBaseTest;
+import org.gatein.wsrp.producer.v2.WSRP2Producer;
+import org.oasis.wsrp.v2.GetServiceDescription;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class V2ProducerBaseTest extends WSRPProducerBaseTest
+{
+ protected WSRP2Producer producer = ProducerHolder.getV2Producer();
+
+ protected V2ProducerBaseTest(String name) throws Exception
+ {
+ super(name);
+ }
+
+ protected GetServiceDescription getNoRegistrationServiceDescriptionRequest()
+ {
+ GetServiceDescription gs = WSRPTypeFactory.createGetServiceDescription();
+ gs.getDesiredLocales().add("en-US");
+ gs.getDesiredLocales().add("en");
+ return gs;
+ }
+}
14 years, 6 months