Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 99D021872B for ; Fri, 8 Jan 2016 21:05:24 +0000 (UTC) Received: (qmail 69205 invoked by uid 500); 8 Jan 2016 21:05:24 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 69156 invoked by uid 500); 8 Jan 2016 21:05:24 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 69147 invoked by uid 99); 8 Jan 2016 21:05:24 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jan 2016 21:05:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 168251A036B for ; Fri, 8 Jan 2016 21:05:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.246 X-Spam-Level: * X-Spam-Status: No, score=1.246 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id XXwWu4fyPU5T for ; Fri, 8 Jan 2016 21:05:21 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id D19B520511 for ; Fri, 8 Jan 2016 21:05:20 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id EA8BDE0354 for ; Fri, 8 Jan 2016 21:05:19 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E9D853A07DF for ; Fri, 8 Jan 2016 21:05:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1723793 - /directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ Date: Fri, 08 Jan 2016 21:05:19 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160108210519.E9D853A07DF@svn01-us-west.apache.org> Author: seelmann Date: Fri Jan 8 21:05:19 2016 New Revision: 1723793 URL: http://svn.apache.org/viewvc?rev=1723793&view=rev Log: Fix tests on Jenkins Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Constants.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java?rev=1723793&r1=1723792&r2=1723793&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDsUtils.java Fri Jan 8 21:05:19 2016 @@ -21,6 +21,8 @@ package org.apache.directory.studio.test.integration.ui; +import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST; + import java.util.Hashtable; import javax.naming.Context; @@ -46,7 +48,7 @@ public class ApacheDsUtils { Hashtable env = new Hashtable(); env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" ); - env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() ); + env.put( Context.PROVIDER_URL, "ldap://" + LOCALHOST + ":" + ldapServer.getPort() ); env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" ); env.put( Context.SECURITY_CREDENTIALS, "secret" ); env.put( Context.SECURITY_AUTHENTICATION, "simple" ); Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java?rev=1723793&r1=1723792&r2=1723793&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java Fri Jan 8 21:05:19 2016 @@ -21,6 +21,8 @@ package org.apache.directory.studio.test.integration.ui; +import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST; +import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST_ADDRESS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -357,7 +359,7 @@ public class BrowserTest extends Abstrac public void testRefreshSearchContinuation() throws Exception { // preparation: add referral entry and set referral handling - String url = "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system"; + String url = "ldap://" + LOCALHOST + ":" + ldapServer.getPort() + "/ou=users,ou=system"; Entry refEntry = new DefaultEntry( service.getSchemaManager() ); refEntry.setDn( new Dn( "cn=referral,ou=system" ) ); refEntry.add( "objectClass", "top", "referral", "extensibleObject" ); @@ -483,15 +485,16 @@ public class BrowserTest extends Abstrac // create entry with multi-valued RDN containing an IP address value Entry entry = new DefaultEntry( service.getSchemaManager() ); - entry.setDn( new Dn( "cn=loopback+ipHostNumber=127.0.0.1,ou=users,ou=system" ) ); + entry.setDn( new Dn( "cn=loopback+ipHostNumber=" + LOCALHOST_ADDRESS + ",ou=users,ou=system" ) ); entry.add( "objectClass", "top", "device", "ipHost" ); entry.add( "cn", "loopback" ); - entry.add( "ipHostNumber", "127.0.0.1" ); + entry.add( "ipHostNumber", LOCALHOST_ADDRESS ); ldapServer.getDirectoryService().getAdminSession().add( entry ); assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "ou=system", "ou=users", - "cn=loopback+ipHostNumber=127.0.0.1" ) ); - browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "ou=users", "cn=loopback+ipHostNumber=127.0.0.1" ); + "cn=loopback+ipHostNumber=" + LOCALHOST_ADDRESS ) ); + browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "ou=users", + "cn=loopback+ipHostNumber=" + LOCALHOST_ADDRESS ); } Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Constants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Constants.java?rev=1723793&r1=1723792&r2=1723793&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Constants.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Constants.java Fri Jan 8 21:05:19 2016 @@ -41,4 +41,19 @@ public final class Constants } } + public static final String LOCALHOST_ADDRESS = getLocalHostAddress(); + + + private static String getLocalHostAddress() + { + try + { + return InetAddress.getLocalHost().getHostAddress(); + } + catch ( UnknownHostException e ) + { + return "localhost"; + } + } + } Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java?rev=1723793&r1=1723792&r2=1723793&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java Fri Jan 8 21:05:19 2016 @@ -22,6 +22,7 @@ package org.apache.directory.studio.test import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST; +import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST_ADDRESS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -390,7 +391,7 @@ public class NewConnectionWizardTest ext assertNull( "Expected OK", result1 ); // enter connection parameter with IPv4 address - wizardBot.typeHost( InetAddress.getLocalHost().getHostAddress() ); + wizardBot.typeHost( LOCALHOST_ADDRESS ); wizardBot.typePort( ldapServer.getPort() ); // click "Check Network Parameter" button Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java?rev=1723793&r1=1723792&r2=1723793&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java Fri Jan 8 21:05:19 2016 @@ -21,6 +21,8 @@ package org.apache.directory.studio.test.integration.ui; +import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST; +import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST_ADDRESS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -80,7 +82,7 @@ public class NewEntryWizardTest extends entry.setDn( new Dn( "cn=referral,ou=system" ) ); entry.add( "objectClass", "top", "referral", "extensibleObject" ); entry.add( "cn", "referralDialogTest" ); - entry.add( "ref", "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system" ); + entry.add( "ref", "ldap://"+LOCALHOST+":" + ldapServer.getPort() + "/ou=users,ou=system" ); service.getAdminSession().add( entry ); studioBot = new StudioBot(); @@ -414,12 +416,13 @@ public class NewEntryWizardTest extends wizardBot.setRdnType( 1, "cn" ); wizardBot.setRdnValue( 1, "loopback" ); wizardBot.setRdnType( 2, "ipHostNumber" ); - wizardBot.setRdnValue( 2, "127.0.0.1" ); + wizardBot.setRdnValue( 2, LOCALHOST_ADDRESS ); wizardBot.clickNextButton(); wizardBot.clickFinishButton(); - assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "ou=system", "cn=loopback+ipHostNumber=127.0.0.1" ) ); - browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "cn=loopback+ipHostNumber=127.0.0.1" ); + assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "ou=system", + "cn=loopback+ipHostNumber=" + LOCALHOST_ADDRESS ) ); + browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "cn=loopback+ipHostNumber=" + LOCALHOST_ADDRESS ); } } Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java?rev=1723793&r1=1723792&r2=1723793&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java Fri Jan 8 21:05:19 2016 @@ -21,6 +21,7 @@ package org.apache.directory.studio.test.integration.ui; +import static org.apache.directory.studio.test.integration.ui.Constants.LOCALHOST; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -81,7 +82,7 @@ public class ReferralDialogTest extends entry.setDn( new Dn( "cn=referralDialogTest,ou=system" ) ); entry.add( "objectClass", "top", "referral", "extensibleObject" ); entry.add( "cn", "referralDialogTest" ); - entry.add( "ref", "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system" ); + entry.add( "ref", "ldap://" + LOCALHOST + ":" + ldapServer.getPort() + "/ou=users,ou=system" ); service.getAdminSession().add( entry ); // get paths @@ -90,7 +91,8 @@ public class ReferralDialogTest extends referralPath = new String[] { "DIT", "Root DSE", "ou=system", "cn=referralDialogTest" }; targetPath = new String[] - { "DIT", "Root DSE", "ou=system", "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system" }; + { "DIT", "Root DSE", "ou=system", + "ldap://" + LOCALHOST + ":" + ldapServer.getPort() + "/ou=users,ou=system" }; }