directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r709252 - in /directory/studio/trunk: ./ repository/net/sf/swtbot/eclipse/finder/ repository/net/sf/swtbot/eclipse/finder/1.2.0.840/ repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/ repository/net/sf/swtbot/finder/ repository/net/sf/swtb...
Date Thu, 30 Oct 2008 21:41:13 GMT
Author: seelmann
Date: Thu Oct 30 14:41:12 2008
New Revision: 709252

URL: http://svn.apache.org/viewvc?rev=709252&view=rev
Log:
Upgraded to SWTBot 2.0.0.1084

Added:
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar
  (with props)
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1
    directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/
    directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar
  (with props)
    directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5
    directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1
    directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom
    directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5
    directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1
    directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.finder_2.0.0.1084-dev.jar
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.ui_2.0.0.1084-dev.jar
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.finder_2.0.0.1084-dev.jar
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.hamcrest_1.1.0.jar
  (with props)
Removed:
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/1.2.0.840/
    directory/studio/trunk/repository/net/sf/swtbot/finder/1.2.0.840/
    directory/studio/trunk/test-integration-ui/Studio-Integration-Test-UI.launch
    directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.finder_1.2.0.921.jar
    directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.ui_1.2.0.921.jar
    directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.finder_1.2.0.921.jar
Modified:
    directory/studio/trunk/pom.xml
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.md5
    directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.sha1
    directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml
    directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.md5
    directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.sha1
    directory/studio/trunk/test-integration-ui/pom.xml
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SWTBotUtils.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Thu Oct 30 14:41:12 2008
@@ -932,12 +932,17 @@
     <dependency>
       <groupId>net.sf.swtbot.eclipse</groupId>
       <artifactId>finder</artifactId>
-        <version>1.2.0.840</version>
+      <version>2.0.0.1084</version>
     </dependency>
     <dependency>
       <groupId>net.sf.swtbot</groupId>
       <artifactId>finder</artifactId>
-        <version>1.2.0.840</version>
+      <version>2.0.0.1084</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.1</version>
     </dependency>
     
     <!-- Documentation generation dependencies -->

Added: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar?rev=709252&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5
Thu Oct 30 14:41:12 2008
@@ -0,0 +1 @@
+56770c199ee32b6dd5c0089b836fafe1
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1
Thu Oct 30 14:41:12 2008
@@ -0,0 +1 @@
+795c4922be6dc3aa384bf8d7c6d076bc6bc4e6c7
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom
Thu Oct 30 14:41:12 2008
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf.swtbot.eclipse</groupId>
+  <artifactId>finder</artifactId>
+  <version>2.0.0.1084</version>
+</project>
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5
Thu Oct 30 14:41:12 2008
@@ -0,0 +1 @@
+e62858af0a131c2c316a6673bdea5070
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1
Thu Oct 30 14:41:12 2008
@@ -0,0 +1 @@
+26c23cfca5034ada69955dd5f6613b56c11ebe51
\ No newline at end of file

Modified: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml (original)
+++ directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml Thu
Oct 30 14:41:12 2008
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><metadata>
   <groupId>net.sf.swtbot.eclipse</groupId>
   <artifactId>finder</artifactId>
-  <version>1.2.0.840</version>
+  <version>2.0.0.1084</version>
   <versioning>
     <versions>
-      <version>1.2.0.840</version>
+      <version>2.0.0.1084</version>
     </versions>
-    <lastUpdated>20080829071816</lastUpdated>
+    <lastUpdated>20081030193744</lastUpdated>
   </versioning>
 </metadata>
\ No newline at end of file

Modified: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.md5?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.md5
(original)
+++ directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.md5
Thu Oct 30 14:41:12 2008
@@ -1 +1 @@
-6b04c71ac51361e4eef439855354fac6
\ No newline at end of file
+3c8b205a8aea1dbaae93d253ca35b2f0
\ No newline at end of file

Modified: directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.sha1?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.sha1
(original)
+++ directory/studio/trunk/repository/net/sf/swtbot/eclipse/finder/maven-metadata.xml.sha1
Thu Oct 30 14:41:12 2008
@@ -1 +1 @@
-2a65dae67802f7a7e15451272a45edecd3f43b3e
\ No newline at end of file
+fd6c2b877119126afc771297c86aad8e6a6bb1a8
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar?rev=709252&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.md5
Thu Oct 30 14:41:12 2008
@@ -0,0 +1 @@
+b4aa47888e2e109e74a776eb85f76400
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.jar.sha1
Thu Oct 30 14:41:12 2008
@@ -0,0 +1 @@
+2ac5c9e0136efe100d0ec1659b52c12132a9d9f3
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom
Thu Oct 30 14:41:12 2008
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sf.swtbot</groupId>
+  <artifactId>finder</artifactId>
+  <version>2.0.0.1084</version>
+</project>
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.md5
Thu Oct 30 14:41:12 2008
@@ -0,0 +1 @@
+b7404b38ff758fa80b007737023edf7b
\ No newline at end of file

Added: directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1?rev=709252&view=auto
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1
(added)
+++ directory/studio/trunk/repository/net/sf/swtbot/finder/2.0.0.1084/finder-2.0.0.1084.pom.sha1
Thu Oct 30 14:41:12 2008
@@ -0,0 +1 @@
+ffb659eaa17396991d27846cdc4b56ef2ca2c1a8
\ No newline at end of file

Modified: directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml (original)
+++ directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml Thu Oct 30 14:41:12
2008
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><metadata>
   <groupId>net.sf.swtbot</groupId>
   <artifactId>finder</artifactId>
-  <version>1.2.0.840</version>
+  <version>2.0.0.1084</version>
   <versioning>
     <versions>
-      <version>1.2.0.840</version>
+      <version>2.0.0.1084</version>
     </versions>
-    <lastUpdated>20080829080406</lastUpdated>
+    <lastUpdated>20081030193808</lastUpdated>
   </versioning>
 </metadata>
\ No newline at end of file

Modified: directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.md5
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.md5?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.md5 (original)
+++ directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.md5 Thu Oct
30 14:41:12 2008
@@ -1 +1 @@
-3cf61cd763b73615f2d896316623a032
\ No newline at end of file
+2910404a592a29007010d87600dad68a
\ No newline at end of file

Modified: directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.sha1
URL: http://svn.apache.org/viewvc/directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.sha1?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.sha1 (original)
+++ directory/studio/trunk/repository/net/sf/swtbot/finder/maven-metadata.xml.sha1 Thu Oct
30 14:41:12 2008
@@ -1 +1 @@
-0c21707e87e345cc57f1d0b3a4933822eff85ff9
\ No newline at end of file
+43a918af7b299329f95794ab218483216e13b057
\ No newline at end of file

Modified: directory/studio/trunk/test-integration-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/pom.xml?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/pom.xml (original)
+++ directory/studio/trunk/test-integration-ui/pom.xml Thu Oct 30 14:41:12 2008
@@ -297,7 +297,8 @@
  org.apache.directory.studio.ldapbrowser.ui,
  org.junit,
  net.sf.swtbot.finder,
- net.sf.swtbot.eclipse.finder
+ net.sf.swtbot.eclipse.finder,
+ org.hamcrest
             </Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
@@ -385,6 +386,11 @@
       <artifactId>finder</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>provided</scope>
+    </dependency>
     
     <dependency>
       <groupId>org.eclipse</groupId>

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.finder_2.0.0.1084-dev.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.finder_2.0.0.1084-dev.jar?rev=709252&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.finder_2.0.0.1084-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.ui_2.0.0.1084-dev.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.ui_2.0.0.1084-dev.jar?rev=709252&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.eclipse.ui_2.0.0.1084-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.finder_2.0.0.1084-dev.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.finder_2.0.0.1084-dev.jar?rev=709252&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/net.sf.swtbot.finder_2.0.0.1084-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.hamcrest_1.1.0.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.hamcrest_1.1.0.jar?rev=709252&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.hamcrest_1.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
Thu Oct 30 14:41:12 2008
@@ -111,7 +111,7 @@
         assertFalse( finishButton.isEnabled() );
 
         // ensure "Simple Authentication" is the default
-        SWTBotCombo authMethodCombo = bot.comboBoxWithLabel( "Authentication Method" );
+        SWTBotCombo authMethodCombo = bot.comboBoxInGroup( "Authentication Method" );
         assertEquals( "Simple Authentication", authMethodCombo.selection() );
 
         // enter authentication parameters

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
Thu Oct 30 14:41:12 2008
@@ -117,7 +117,7 @@
         bot.button( "Next >" ).click();
 
         // specify DN
-        SWTBotCombo typeCombo = bot.comboBoxWithLabel( "RDN:" );
+        SWTBotCombo typeCombo = bot.comboBox( "" );
         typeCombo.setText( "o" );
         SWTBotText valueText = bot.text( "" );
         valueText.setText( "testCreateOrganizationEntry" );
@@ -187,7 +187,7 @@
         bot.button( "Next >" ).click();
 
         // specify DN
-        SWTBotCombo typeCombo = bot.comboBoxWithLabel( "RDN:" );
+        SWTBotCombo typeCombo = bot.comboBox( "" );
         typeCombo.setText( "cn" );
         SWTBotText valueText = bot.text( "" );
         valueText.setText( "testCreatePersonEntry" );
@@ -268,7 +268,7 @@
         bot.button( "Next >" ).click();
 
         // specify DN
-        SWTBotCombo typeCombo = bot.comboBoxWithLabel( "RDN:" );
+        SWTBotCombo typeCombo = bot.comboBox( "" );
         typeCombo.setText( "O" );
         SWTBotText valueText = bot.text( "" );
         valueText.setText( "testCreateOrganizationEntry" );
@@ -329,7 +329,7 @@
         bot.button( "Next >" ).click();
 
         // specify DN
-        typeCombo = bot.comboBoxWithLabel( "RDN:" );
+        typeCombo = bot.comboBox( "" );
         typeCombo.setText( "O" );
         valueText = bot.text( "" );
         valueText.setText( "testCreateOrganizationEntry2" );
@@ -408,7 +408,7 @@
         bot.button( "Next >" ).click();
 
         // specify DN
-        SWTBotCombo typeCombo = bot.comboBoxWithLabel( "RDN:" );
+        SWTBotCombo typeCombo = bot.comboBox( "" );
         typeCombo.setText( "krb5PrincipalName" );
         SWTBotText valueText = bot.text( "" );
         valueText.setText( "kadmin/changepw@DOMAIN" );

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
Thu Oct 30 14:41:12 2008
@@ -23,8 +23,10 @@
 
 import net.sf.swtbot.eclipse.finder.SWTEclipseBot;
 import net.sf.swtbot.finder.UIThreadRunnable;
+import net.sf.swtbot.finder.results.VoidResult;
 import net.sf.swtbot.widgets.SWTBotTree;
 import net.sf.swtbot.widgets.SWTBotTreeItem;
+import net.sf.swtbot.widgets.WidgetNotFoundException;
 
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
@@ -88,7 +90,7 @@
             "ou=system" );
 
         // expand ou=system, that reads the referral and opens the referral dialog
-        UIThreadRunnable.asyncExec( bot.getDisplay(), new UIThreadRunnable.VoidResult()
+        UIThreadRunnable.asyncExec( bot.getDisplay(), new VoidResult()
         {
             public void run()
             {
@@ -136,7 +138,7 @@
             "ou=system" );
 
         // expand ou=system, that reads the referral and opens the referral dialog
-        UIThreadRunnable.asyncExec( bot.getDisplay(), new UIThreadRunnable.VoidResult()
+        UIThreadRunnable.asyncExec( bot.getDisplay(), new VoidResult()
         {
             public void run()
             {
@@ -150,8 +152,15 @@
         SWTBotUtils.selectEntry( bot, browserTree, true, "DIT", "Root DSE", "ou=system" );
 
         // ensure that the referral URL and target is not visible
-        SWTBotTreeItem referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort()
-            + "/ou=users,ou=system" );
+        SWTBotTreeItem referralNode = null;
+        try
+        {
+            referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort()
+ "/ou=users,ou=system" );
+        }
+        catch ( WidgetNotFoundException wnfe )
+        {
+            // that is expected
+        }
         assertNull( referralNode );
     }
 
@@ -178,10 +187,25 @@
         SWTBotTreeItem systemNode = SWTBotUtils.selectEntry( bot, browserTree, true, "DIT",
"Root DSE", "ou=system" );
 
         // ensure that the referral entry is not visible
-        SWTBotTreeItem referralNode1 = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort()
-            + "/ou=users,ou=system" );
+        SWTBotTreeItem referralNode1 = null;
+        try
+        {
+            referralNode1 = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort()
+ "/ou=users,ou=system" );
+        }
+        catch ( WidgetNotFoundException wnfe )
+        {
+            // that is expected
+        }
         assertNull( referralNode1 );
-        SWTBotTreeItem referralNode2 = systemNode.getNode( "cn=referralDialogTest" );
+        SWTBotTreeItem referralNode2 = null;
+        try
+        {
+            referralNode2 = systemNode.getNode( "cn=referralDialogTest" );
+        }
+        catch ( WidgetNotFoundException wnfe )
+        {
+            // that is expected
+        }
         assertNull( referralNode2 );
     }
 

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SWTBotUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SWTBotUtils.java?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SWTBotUtils.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SWTBotUtils.java
Thu Oct 30 14:41:12 2008
@@ -21,16 +21,20 @@
 package org.apache.directory.studio.test.integration.ui;
 
 
+import static net.sf.swtbot.finder.UIThreadRunnable.syncExec;
+import static net.sf.swtbot.matcher.WidgetMatcherFactory.widgetOfType;
+import static org.hamcrest.Matchers.anything;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import net.sf.swtbot.eclipse.finder.SWTEclipseBot;
 import net.sf.swtbot.eclipse.finder.widgets.SWTBotView;
-import net.sf.swtbot.finder.ControlFinder;
+import net.sf.swtbot.eclipse.finder.widgets.SWTBotWorkbenchPart;
 import net.sf.swtbot.finder.UIThreadRunnable;
-import net.sf.swtbot.finder.UIThreadRunnable.VoidResult;
-import net.sf.swtbot.matcher.ClassMatcher;
+import net.sf.swtbot.finder.results.VoidResult;
+import net.sf.swtbot.finder.results.WidgetResult;
 import net.sf.swtbot.wait.DefaultCondition;
 import net.sf.swtbot.wait.ICondition;
 import net.sf.swtbot.widgets.SWTBotButton;
@@ -49,9 +53,14 @@
 import org.apache.directory.studio.connection.core.ConnectionParameter;
 import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
 import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IEditorPart;
+import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 
 
 /**
@@ -195,12 +204,8 @@
         SWTBotView view = bot.view( "Connections" );
         view.show();
 
-        List<Tree> findControls = new ControlFinder().findControls( view.widget, new
ClassMatcher( Tree.class ), true );
-        if ( findControls.isEmpty() )
-        {
-            throw new WidgetNotFoundException( "Could not find Connections tree" );
-        }
-        return new SWTBotTree( findControls.get( 0 ) );
+        Tree tree = ( Tree ) bot.widget( widgetOfType( Tree.class ), view.widget );
+        return new SWTBotTree( tree );
     }
 
 
@@ -218,12 +223,8 @@
         SWTBotView view = bot.view( "LDAP Browser" );
         view.show();
 
-        List<Tree> findControls = new ControlFinder().findControls( view.widget, new
ClassMatcher( Tree.class ), true );
-        if ( findControls.isEmpty() )
-        {
-            throw new WidgetNotFoundException( "Could not find LDAP Browser tree" );
-        }
-        return new SWTBotTree( findControls.get( 0 ) );
+        Tree tree = ( Tree ) bot.widget( widgetOfType( Tree.class ), view.widget );
+        return new SWTBotTree( tree );
     }
 
 
@@ -236,34 +237,59 @@
      * 
      * @throws Exception the exception
      */
-    public static SWTBotTree getEntryEditorTree( SWTEclipseBot bot ) throws Exception
+    public static SWTBotTree getEntryEditorTree( final SWTEclipseBot bot ) throws Exception
     {
-        List findEditors = SWTBotView.findEditors();
-        for ( Object object : findEditors )
+        Tree tree = UIThreadRunnable.syncExec( new WidgetResult<Tree>()
         {
-            final IEditorReference editorReference = ( IEditorReference ) object;
-            if ( editorReference.getName().equals( "Entry Editor" ) )
+            public Tree run()
             {
-                UIThreadRunnable.syncExec( new VoidResult()
+                IWorkbench workbench = PlatformUI.getWorkbench();
+                IWorkbenchWindow activeWorkbenchWindow = workbench.getActiveWorkbenchWindow();
+                IWorkbenchPage[] pages = activeWorkbenchWindow.getPages();
+                for ( int i = 0; i < pages.length; i++ )
                 {
-                    public void run()
+                    IWorkbenchPage page = pages[i];
+                    IEditorReference[] editorReferences = page.getEditorReferences();
+                    for ( int j = 0; j < editorReferences.length; j++ )
                     {
-                        IEditorPart editor = editorReference.getEditor( true );
-                        editorReference.getPage().activate( editor );
+                        IEditorReference editorReference = editorReferences[j];
+                        if ( editorReference.getName().equals( "Entry Editor" ) )
+                        {
+                            DummyEditor editor = new DummyEditor( editorReference, bot );
+                            Tree tree = ( Tree ) bot.widget( widgetOfType( Tree.class ),
editor.widget );
+                            return tree;
+
+                        }
                     }
-                } );
+                }
+                throw new WidgetNotFoundException( "Could not find Entry Editor tree" );
+            }
+        } );
+        return new SWTBotTree( tree );
+    }
+
+    static class DummyEditor extends SWTBotWorkbenchPart<IEditorReference>
+    {
+        public Widget widget;
+
+
+        public DummyEditor( IEditorReference editorReference, SWTEclipseBot bot )
+        {
+            super( editorReference, bot );
+            widget = findWidget( anything() );
+        }
+
 
-                final SWTBotView editor = new SWTBotView( editorReference );
-                List<Tree> findControls = new ControlFinder().findControls( editor.widget,
-                    new ClassMatcher( Tree.class ), true );
-                if ( findControls.isEmpty() )
+        public void setFocus()
+        {
+            syncExec( new VoidResult()
+            {
+                public void run()
                 {
-                    throw new WidgetNotFoundException( "Could not find Entry Editor tree"
);
+                    ( ( Control ) widget ).setFocus();
                 }
-                return new SWTBotTree( findControls.get( 0 ) );
-            }
+            } );
         }
-        throw new WidgetNotFoundException( "Could not find Entry Editor tree" );
     }
 
 
@@ -294,7 +320,7 @@
             }
         } );
 
-        UIThreadRunnable.asyncExec( bot.getDisplay(), new UIThreadRunnable.VoidResult()
+        UIThreadRunnable.asyncExec( bot.getDisplay(), new VoidResult()
         {
             public void run()
             {
@@ -322,7 +348,7 @@
     public static void asyncClick( final SWTEclipseBot bot, final SWTBotMenu menu, final
ICondition waitCondition )
         throws TimeoutException
     {
-        UIThreadRunnable.asyncExec( bot.getDisplay(), new UIThreadRunnable.VoidResult()
+        UIThreadRunnable.asyncExec( bot.getDisplay(), new VoidResult()
         {
             public void run()
             {
@@ -350,7 +376,7 @@
     public static void asyncClick( final SWTEclipseBot bot, final SWTBotTreeItem item, final
ICondition waitCondition )
         throws TimeoutException
     {
-        UIThreadRunnable.asyncExec( bot.getDisplay(), new UIThreadRunnable.VoidResult()
+        UIThreadRunnable.asyncExec( bot.getDisplay(), new VoidResult()
         {
             public void run()
             {
@@ -402,7 +428,7 @@
             }
 
             final SWTBotTreeItem tempEntry = entry;
-            UIThreadRunnable.asyncExec( bot.getDisplay(), new UIThreadRunnable.VoidResult()
+            UIThreadRunnable.asyncExec( bot.getDisplay(), new VoidResult()
             {
                 public void run()
                 {
@@ -439,7 +465,7 @@
     public static void expandEntry( final SWTEclipseBot bot, final SWTBotTreeItem entry,
final String nextName )
         throws Exception
     {
-        UIThreadRunnable.asyncExec( bot.getDisplay(), new UIThreadRunnable.VoidResult()
+        UIThreadRunnable.asyncExec( bot.getDisplay(), new VoidResult()
         {
             public void run()
             {

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java?rev=709252&r1=709251&r2=709252&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java
Thu Oct 30 14:41:12 2008
@@ -23,7 +23,7 @@
 
 import net.sf.swtbot.eclipse.finder.SWTEclipseBot;
 import net.sf.swtbot.finder.UIThreadRunnable;
-import net.sf.swtbot.finder.UIThreadRunnable.IntResult;
+import net.sf.swtbot.finder.results.IntResult;
 import net.sf.swtbot.wait.DefaultCondition;
 import net.sf.swtbot.widgets.SWTBotCombo;
 import net.sf.swtbot.widgets.SWTBotText;
@@ -113,7 +113,7 @@
     {
         return UIThreadRunnable.syncExec( bot.getDisplay(), new IntResult()
         {
-            public int run()
+            public Integer run()
             {
                 DeviceData info = bot.getDisplay().getDeviceData();
                 if ( !info.tracking )
@@ -150,7 +150,7 @@
         bot.button( "Add" ).click();
         bot.button( "Next >" ).click();
 
-        SWTBotCombo typeCombo = bot.comboBoxWithLabel( "RDN:" );
+        SWTBotCombo typeCombo = bot.comboBox( "" );
         typeCombo.setText( "o" );
         SWTBotText valueText = bot.text( "" );
         valueText.setText( name );



Mime
View raw message