JBoss Portal SVN: r12440 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium and 1 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-01-07 07:31:42 -0500 (Wed, 07 Jan 2009)
New Revision: 12440
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
Log:
making screenshots optional
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-01-07 10:31:21 UTC (rev 12439)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-01-07 12:31:42 UTC (rev 12440)
@@ -57,7 +57,7 @@
<target name="init">
<echo message="Browser : ${browser}" />
- <echo message="Workspace : ${workspace}" />
+ <echo message="Screenshot : ${screenshot}" />
<echo message="Deleting testng report directory"/>
<delete dir="${testng.output.dir}"/>
</target>
@@ -128,6 +128,7 @@
<!--classfileset dir="${test.build.dir}"
includes="org/jboss/portal/test/selenium/*Test.class" / -->
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
<jvmarg value="-ea" />
</testng>
@@ -143,6 +144,7 @@
<classfileset dir="${test.build.dir}"
includes="${testname}" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
<jvmarg value="-ea" />
</testng>
@@ -159,6 +161,7 @@
<xmlfileset dir="." includes="testng.xml" />
<sysproperty key="browser" value="${browser}" />
+ <sysproperty key="screenshot" value="${screenshot}" />
<sysproperty key="workspace" value="${workspace}"/>
<jvmarg value="-ea" />
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-01-07 10:31:21 UTC (rev 12439)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-01-07 12:31:42 UTC (rev 12440)
@@ -23,6 +23,13 @@
protected static int count;
protected static boolean screenshot = false;
+ static {
+ String ss = System.getProperty("screenshot");
+ if("true".equals(ss)){
+ screenshot = true;
+ }
+ }
+
@Override
public void onTestFailure(ITestResult tr) {
String name = "F_" + tr.getName() + "-" + count;
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2009-01-07 10:31:21 UTC (rev 12439)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2009-01-07 12:31:42 UTC (rev 12440)
@@ -71,7 +71,7 @@
selenium.type(INPUT_INSTANCE_NAME, "str.nge.n.me");
selenium.click(SUBMIT_CREATE_INST);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("littleAdmin portlet details"));
+ Assert.assertTrue(selenium.isTextPresent("str.nge.n.me"+" portlet details"));
}
@Test(enabled = true)
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-07 10:31:21 UTC (rev 12439)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-07 12:31:42 UTC (rev 12440)
@@ -13,7 +13,7 @@
private static final String SUBMIT_SECURITY_UPDATE = "//input[contains(@id,'common-edit-security-form:update')]";
private static final String SUBMIT_SECURITY_CANCEL = "//input[contains(@id,'common-edit-security-form:cancel')]";
- private static final String LINK_20_PAGE = "link=20";
+ private static final String LINK_20_PAGE = "Link=20";
private static final String LINK_PREF_WELCOMEPORT = "//a[contains(@id,'security-JSPPortletInstance')]";
private static final String TABLE_PREF_KEY = "//form[contains(@id,'common-edit-pref-form')]/table";
@@ -166,7 +166,7 @@
// then really stop the greetings portlet
goToPI();
- selenium.setSpeed("5000");
+ //selenium.setSpeed("5000");
selenium.click(LINK_20_PAGE);
selenium.waitForPageToLoad(PAGE_LOAD);
r = findTableRow(table, instance_name, 0);
17 years, 3 months
JBoss Portal SVN: r12439 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2009-01-07 05:31:21 -0500 (Wed, 07 Jan 2009)
New Revision: 12439
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
Log:
switch to identity module 1.0-SNAPSHOT
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-01-07 09:40:54 UTC (rev 12438)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-01-07 10:31:21 UTC (rev 12439)
@@ -45,7 +45,7 @@
<componentref name="jboss-portal/modules/web" version="1.2.2"/>
<componentref name="jboss-portal/modules/test" version="1.0.3"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.4"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.5"/>
+ <componentref name="jboss-portal/modules/identity" version="1.0-SNAPSHOT"/>
<componentref name="jboss-portal/modules/cms" version="1.2.2"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
17 years, 3 months
JBoss Portal SVN: r12438 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2009-01-07 04:40:54 -0500 (Wed, 07 Jan 2009)
New Revision: 12438
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPConnectionContext.java
Log:
JBPORTAL-2272 anonymous access in ldap
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPConnectionContext.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPConnectionContext.java 2009-01-07 09:39:26 UTC (rev 12437)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPConnectionContext.java 2009-01-07 09:40:54 UTC (rev 12438)
@@ -97,8 +97,10 @@
env.put(Context.INITIAL_CONTEXT_FACTORY, this.getContextFactory());
env.put(Context.PROVIDER_URL, "ldap://" + getHost() + ":" + getPort());
env.put(Context.SECURITY_AUTHENTICATION, this.getAuthentication());
- env.put(Context.SECURITY_PRINCIPAL, this.getAdminDN());
- env.put(Context.SECURITY_CREDENTIALS, this.getAdminPassword());
+ if (this.getAdminDN() != null)
+ env.put(Context.SECURITY_PRINCIPAL, this.getAdminDN());
+ if (this.getAdminPassword() != null)
+ env.put(Context.SECURITY_CREDENTIALS, this.getAdminPassword());
if (this.getProtocol() != null)
{
17 years, 3 months