[abbot-commits] SF.net SVN: abbot: [2335] abbot.swt/trunk/abbot.swt.test

[<gjo...@us...>]

Revision: 2335
          http://abbot.svn.sourceforge.net/abbot/?rev=2335&view=rev
Author:   gjohnsto
Date:     2007-04-17 13:01:49 -0700 (Tue, 17 Apr 2007)

Log Message:
-----------
Adopt and adapt to changes in abbot.swt.

Modified Paths:
--------------
    abbot.swt/trunk/abbot.swt.test/META-INF/MANIFEST.MF
    abbot.swt/trunk/abbot.swt.test/src/abbot/swt/finder/test/ExtraFinderTest.java
    abbot.swt/trunk/abbot.swt.test/src/abbot/swt/finder/test/FinderTests.java

Added Paths:
-----------
    abbot.swt/trunk/abbot.swt.test/src_win32/
    abbot.swt/trunk/abbot.swt.test/src_win32/abbot/
    abbot.swt/trunk/abbot.swt.test/src_win32/abbot/swt/
    abbot.swt/trunk/abbot.swt.test/src_win32/abbot/swt/test/
    abbot.swt/trunk/abbot.swt.test/src_win32/abbot/swt/test/bugutil/

Removed Paths:
-------------
    abbot.swt/trunk/abbot.swt.test/src/abbot/swt/test/bugutil/

Modified: abbot.swt/trunk/abbot.swt.test/META-INF/MANIFEST.MF
===================================================================
--- abbot.swt/trunk/abbot.swt.test/META-INF/MANIFEST.MF	2007-04-17 20:01:42 UTC (rev 2334)
+++ abbot.swt/trunk/abbot.swt.test/META-INF/MANIFEST.MF	2007-04-17 20:01:49 UTC (rev 2335)
@@ -1,11 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for abbot.swt
-Bundle-SymbolicName: abbot.swt.test
+Bundle-SymbolicName: abbot.swt.test;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: IBM
-Bundle-Localization: plugin
 Require-Bundle: org.eclipse.swt;bundle-version="[3.2.0,4.0.0)",
  abbot.swt;bundle-version="[1.0.0,2.0.0)",
  abbot.swt.examples;bundle-version="[1.0.0,2.0.0)"
@@ -13,5 +12,4 @@
  abbot.swt.finder.test,
  abbot.swt.junit.extensions.test,
  abbot.swt.test,
- abbot.swt.test.bugutil,
  abbot.swt.tester.test

Modified: abbot.swt/trunk/abbot.swt.test/src/abbot/swt/finder/test/ExtraFinderTest.java
===================================================================
--- abbot.swt/trunk/abbot.swt.test/src/abbot/swt/finder/test/ExtraFinderTest.java	2007-04-17 20:01:42 UTC (rev 2334)
+++ abbot.swt/trunk/abbot.swt.test/src/abbot/swt/finder/test/ExtraFinderTest.java	2007-04-17 20:01:49 UTC (rev 2335)
@@ -14,9 +14,9 @@
 import org.eclipse.swt.widgets.Widget;
 
 import abbot.swt.finder.BasicFinder;
-import abbot.swt.finder.Hierarchy;
+import abbot.swt.finder.WidgetHierarchy;
 import abbot.swt.finder.Matcher;
-import abbot.swt.finder.TestHierarchy;
+import abbot.swt.finder.WidgetTestHierarchyImpl;
 import abbot.swt.finder.WidgetFinder;
 import abbot.swt.finder.WidgetSearchException;
 import abbot.swt.finder.matchers.ClassMatcher;
@@ -44,7 +44,7 @@
 // TODO: add support and tests for dialogs
 public class ExtraFinderTest extends SWTTestCase {
 
-	private Hierarchy hierarchy;
+	private WidgetHierarchy hierarchy;
 
 	private WidgetFinder finder;
 
@@ -64,7 +64,7 @@
 
 		// Must create TestHierarchy before we open SampleApp. Otherwise, it might be
 		// filtered by the TestHierarchy (which by default ignores existing Shells).
-		hierarchy = TestHierarchy.getDefault();
+		hierarchy = WidgetTestHierarchyImpl.getDefault();
 		finder = new BasicFinder(hierarchy);
 
 		testApplication = (FinderTestApplication) Displays.syncExec(getDisplay(), new Result() {

Modified: abbot.swt/trunk/abbot.swt.test/src/abbot/swt/finder/test/FinderTests.java
===================================================================
--- abbot.swt/trunk/abbot.swt.test/src/abbot/swt/finder/test/FinderTests.java	2007-04-17 20:01:42 UTC (rev 2334)
+++ abbot.swt/trunk/abbot.swt.test/src/abbot/swt/finder/test/FinderTests.java	2007-04-17 20:01:49 UTC (rev 2335)
@@ -5,9 +5,9 @@
 import org.eclipse.swt.widgets.Widget;
 
 import abbot.swt.finder.BasicFinder;
-import abbot.swt.finder.Hierarchy;
+import abbot.swt.finder.WidgetHierarchy;
 import abbot.swt.finder.Matcher;
-import abbot.swt.finder.SWTHierarchy;
+import abbot.swt.finder.WidgetHierarchyImpl;
 import abbot.swt.finder.WidgetFinder;
 import abbot.swt.finder.WidgetSearchException;
 import abbot.swt.junit.extensions.SWTTestCase;
@@ -25,8 +25,8 @@
 
 	public static class FinderTestSWTClosed extends FinderTests {
 
-		protected Hierarchy getHierarchy() {
-			return SWTHierarchy.getDefault();
+		protected WidgetHierarchy getHierarchy() {
+			return WidgetHierarchyImpl.getDefault();
 		}
 
 		protected boolean shouldOpen() {
@@ -41,8 +41,8 @@
 	}
 
 	public static class FinderTestTestClosed extends FinderTests {
-		protected Hierarchy getHierarchy() {
-			return SWTHierarchy.getDefault();
+		protected WidgetHierarchy getHierarchy() {
+			return WidgetHierarchyImpl.getDefault();
 		}
 
 		protected boolean shouldOpen() {
@@ -60,7 +60,7 @@
 
 	private FinderTestApplication app;
 
-	protected abstract Hierarchy getHierarchy();
+	protected abstract WidgetHierarchy getHierarchy();
 
 	protected abstract boolean shouldOpen();
 

Copied: abbot.swt/trunk/abbot.swt.test/src_win32/abbot/swt/test/bugutil (from rev 2322, abbot.swt/trunk/abbot.swt.test/src/abbot/swt/test/bugutil)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.