directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r781162 - in /directory/studio/trunk/test-integration-ui: ./ resources/test-plugins/ resources/test-plugins/org.junit4_4.5.0.v20090423/ resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ src/main/java/org/apache/directory/studio/te...
Date Tue, 02 Jun 2009 20:49:44 GMT
Author: seelmann
Date: Tue Jun  2 20:49:43 2009
New Revision: 781162

URL: http://svn.apache.org/viewvc?rev=781162&view=rev
Log:
Fixed class loading issues

Added:
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.commons.collections_3.2.0.v200803061811.jar
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.log4j_1.2.13.v200806030600.jar
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.eclipse.swtbot.junit4_x_2.0.0.329-dev.jar
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.RSA
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.SF
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/MANIFEST.MF
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/eclipse.inf
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/about.html
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/junit.jar
  (with props)
    directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/plugin.properties
Removed:
    directory/studio/trunk/test-integration-ui/Studio-Integration-Test-UI.launch
Modified:
    directory/studio/trunk/test-integration-ui/pom.xml
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ContextMenuHelper.java

Modified: directory/studio/trunk/test-integration-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/pom.xml?rev=781162&r1=781161&r2=781162&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/pom.xml (original)
+++ directory/studio/trunk/test-integration-ui/pom.xml Tue Jun  2 20:49:43 2009
@@ -142,6 +142,7 @@
                     <!-- copy complete eclipse distribution to test-sandbox -->
                     <copy todir="target/test-sandbox">
                       <fileset dir="${eclipse-home}">
+                        <exclude name="plugins/org.junit4*/**"/>
                       </fileset>
                     </copy>
                     

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.commons.collections_3.2.0.v200803061811.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.commons.collections_3.2.0.v200803061811.jar?rev=781162&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.commons.collections_3.2.0.v200803061811.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.apache.log4j_1.2.13.v200806030600.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.eclipse.swtbot.junit4_x_2.0.0.329-dev.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.RSA
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.RSA?rev=781162&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.RSA
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.SF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.SF?rev=781162&view=auto
==============================================================================
--- directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.SF
(added)
+++ directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/ECLIPSEF.SF
Tue Jun  2 20:49:43 2009
@@ -0,0 +1,17 @@
+Signature-Version: 1.0
+SHA1-Digest-Manifest: MCZqCn9j21nPcAZrbtqvbiNj/yE=
+Created-By: 1.6.0 (IBM Corporation)
+SHA1-Digest-Manifest-Main-Attributes: YDw7DVb2mA4EdjnzxHN9pcP21go=
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: SAqY+5ITAL0mkdYeijlSRhyIaZk=
+
+Name: junit.jar
+SHA1-Digest: rG9r/UiI7Rq2Dt/TeE2Fjc35Z0c=
+
+Name: about.html
+SHA1-Digest: AABAfWMoxeKbdQBtnHLvutqecCA=
+
+Name: plugin.properties
+SHA1-Digest: wGsoVwj65BlLZ4QXwngmNNv8uMI=
+

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/MANIFEST.MF?rev=781162&view=auto
==============================================================================
--- directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/MANIFEST.MF
(added)
+++ directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/MANIFEST.MF
Tue Jun  2 20:49:43 2009
@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Bundle-ClassPath: junit.jar
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.junit4
+Require-Bundle: org.hamcrest;bundle-version="1.1.0";visibility:=r
+ eexport
+Bundle-Version: 4.5.0.v20090423
+Export-Package: junit.extensions;version="4.5.0",junit.framework;versi
+ on="4.5.0",junit.runner;version="4.5.0",junit.textui;version="4.5.0",
+ org.junit;version="4.5.0",org.junit.experimental.results;version="4.5
+ .0",org.junit.experimental.runners;version="4.5.0",org.junit.experime
+ ntal.theories;version="4.5.0",org.junit.experimental.theories.interna
+ l;version="4.5.0";x-internal:=true,org.junit.experimental.theories.su
+ ppliers;version="4.5.0",org.junit.internal;version="4.5.0";x-internal
+ :=true,org.junit.internal.builders;version="4.5.0";x-internal:=true,o
+ rg.junit.internal.matchers;version="4.5.0";x-internal:=true,org.junit
+ .internal.requests;version="4.5.0";x-internal:=true,org.junit.interna
+ l.runners;version="4.5.0";x-internal:=true,org.junit.internal.runners
+ .model;version="4.5.0";x-internal:=true,org.junit.internal.runners.st
+ atements;version="4.5.0";x-internal:=true,org.junit.matchers;version=
+ "4.5.0",org.junit.runner;version="4.5.0",org.junit.runner.manipulatio
+ n;version="4.5.0",org.junit.runner.notification;version="4.5.0",org.j
+ unit.runners;version="4.5.0",org.junit.runners.model;version="4.5.0"
+Bundle-ManifestVersion: 2
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
+
+Name: junit.jar
+SHA1-Digest: rxw47Sc3FahWIalTRXyxg7FmB1c=
+
+Name: about.html
+SHA1-Digest: 3PYtLUOZDA/7ZcfqqxzDWGJNkKU=
+
+Name: plugin.properties
+SHA1-Digest: Wv0zvGNivCvwY7jZIUt/sphnRAk=
+

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/eclipse.inf
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/eclipse.inf?rev=781162&view=auto
==============================================================================
--- directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/eclipse.inf
(added)
+++ directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/META-INF/eclipse.inf
Tue Jun  2 20:49:43 2009
@@ -0,0 +1,3 @@
+#Processed using Jarprocessor
+pack200.args = -E4
+pack200.conditioned = true

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/about.html
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/about.html?rev=781162&view=auto
==============================================================================
--- directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/about.html
(added)
+++ directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/about.html
Tue Jun  2 20:49:43 2009
@@ -0,0 +1,44 @@
+<!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">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>April 17, 2009</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).
 Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content
is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms
and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that
was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless
otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the
Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as set out
below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided

+for informational purposes only, and you should look to the Redistributor&rsquo;s license
for 
+terms and conditions of use.</p>
+
+<p>The Content includes items that have been sourced from third parties as follows:</p>
+
+<h4>JUnit 4.5</h4>
+
+<p>The plug-in is accompanied by software developed by JUnit.org.  The JUnit 4.5 code
included with the plug-in includes no modifications.
+Your use of JUnit 4.5 in both source and binary code form contained in the plug-in is subject
to the terms and conditions of the 
+Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available
at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
+The binary code is located in junit.jar and the source code is located in junitsrc.zip.</p>
+
+</body>
+</html>
\ No newline at end of file

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/junit.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/junit.jar?rev=781162&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/junit.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/plugin.properties?rev=781162&view=auto
==============================================================================
--- directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/plugin.properties
(added)
+++ directory/studio/trunk/test-integration-ui/resources/test-plugins/org.junit4_4.5.0.v20090423/plugin.properties
Tue Jun  2 20:49:43 2009
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+pluginName=JUnit Testing Framework Version 4
+providerName=Eclipse.org

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ContextMenuHelper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ContextMenuHelper.java?rev=781162&r1=781161&r2=781162&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ContextMenuHelper.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ContextMenuHelper.java
Tue Jun  2 20:49:43 2009
@@ -58,6 +58,11 @@
      */
     public static void clickContextMenu( final AbstractSWTBot<?> bot, final String...
texts )
     {
+        final Matcher<?>[] matchers = new Matcher<?>[texts.length];
+        for ( int i = 0; i < texts.length; i++ )
+        {
+            matchers[i] = allOf( instanceOf( MenuItem.class ), withMnemonic( texts[i] ) );
+        }
 
         // show
         final MenuItem menuItem = UIThreadRunnable.syncExec( new WidgetResult<MenuItem>()
@@ -67,10 +72,9 @@
                 MenuItem menuItem = null;
                 Control control = ( Control ) bot.widget;
                 Menu menu = control.getMenu();
-                for ( String text : texts )
+                for ( int i = 0; i < matchers.length; i++ )
                 {
-                    Matcher<?> matcher = allOf( instanceOf( MenuItem.class ), withMnemonic(
text ) );
-                    menuItem = show( menu, matcher );
+                    menuItem = show( menu, matchers[i] );
                     if ( menuItem != null )
                     {
                         menu = menuItem.getMenu();



Mime
View raw message