This commit was manufactured by cvs2svn to create tag 'v200603160230'.
diff --git a/tests/org.eclipse.wst.common.tests.collector/.classpath b/tests/org.eclipse.wst.common.tests.collector/.classpath
deleted file mode 100644
index c293cf8..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="collector"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.common.tests.collector/.cvsignore b/tests/org.eclipse.wst.common.tests.collector/.cvsignore
deleted file mode 100644
index 512f021..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
diff --git a/tests/org.eclipse.wst.common.tests.collector/.project b/tests/org.eclipse.wst.common.tests.collector/.project
deleted file mode 100644
index 5b816ca..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.tests.collector</name>
- <comment></comment>
- <projects>
- <project>org.junit</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.common.tests.collector/about.html b/tests/org.eclipse.wst.common.tests.collector/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.collector/build.properties b/tests/org.eclipse.wst.common.tests.collector/build.properties
deleted file mode 100644
index c47b8d6..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = plugin.xml,\
- runtime/collector.jar,\
- about.html
-source.runtime/collector.jar = collector/
-output.runtime/collector.jar = bin/
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java
deleted file mode 100644
index b43f8ec..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.eclipse.wst.common.tests.collector;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class SuiteHelper {
-
- private Hashtable allTests = new Hashtable();
-
- public SuiteHelper(TestSuite suite) {
- addTest(suite);
- }
-
- private void addTest(Test test) {
- if (test instanceof TestSuite) {
- Enumeration tests = ((TestSuite) test).tests();
- while (tests.hasMoreElements()) {
- Test t = (Test) tests.nextElement();
- allTests.put(t.toString(), t);
- }
- return;
- }
- allTests.put(test.toString(), test);
- }
-
- public String[] getAllTests() {
- ArrayList testList = new ArrayList();
- Enumeration enumeration = allTests.keys();
- while (enumeration.hasMoreElements()) {
- testList.add(enumeration.nextElement());
- }
- Collections.sort(testList, new Comparator() {
- public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(((String) o2));
- }
- });
-
- String[] strArray = new String[testList.size()];
- for (int i = 0; i < strArray.length; i++) {
- strArray[i] = (String) testList.get(i);
- }
-
- return strArray;
- }
-
- public TestSuite buildSuite(String[] completeTests, String[] partialTests) {
- TestSuite suite = new TestSuite();
- for (int i = 0; i < completeTests.length; i++) {
- suite.addTest((Test) allTests.get(completeTests[i]));
- }
- for (int i = 0; i < partialTests.length; i++) {
- suite.addTest(getTest(partialTests[i]));
- }
- return suite;
- }
-
- public String[] getTestMethods(String testName) {
- ArrayList methodList = new ArrayList();
- Test test = (Test) allTests.get(testName);
- if (test instanceof TestSuite) {
- Enumeration testsEnum = ((TestSuite) test).tests();
- while (testsEnum.hasMoreElements()) {
- Test t = (Test) testsEnum.nextElement();
- methodList.add(t.toString());
- }
- }
-
- Collections.sort(methodList, new Comparator() {
- public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(((String) o2));
- }
- });
-
- String[] strArray = new String[methodList.size()];
- for (int i = 0; i < strArray.length; i++) {
- strArray[i] = (String) methodList.get(i);
- }
-
- return strArray;
- }
-
- private Test getSubTest(TestSuite suite, String testName) {
- if (null != suite) {
- Enumeration tests = suite.tests();
- while (tests.hasMoreElements()) {
- Test t = (Test) tests.nextElement();
- if (t.toString().equals(testName)) {
- return t;
- }
- }
- }
- return null;
- }
-
- /**
- * Returns a TestSuite to run
- */
- private Test getTest(String testName) {
- int firstIndex = testName.indexOf("."); //$NON-NLS-1$
- String suiteName = testName.substring(0, firstIndex);
- String subTestName = testName.substring(firstIndex + 1);
-
- //check the obvious suite first
- TestSuite suite = (TestSuite) allTests.get(suiteName);
- Test test = getSubTest(suite, subTestName);
- if (test != null) {
- return test;
- }
- //otherwise check all suites
- Enumeration keys = allTests.keys();
- while (keys.hasMoreElements()) {
- String key = (String) keys.nextElement();
- if (testName.startsWith(key)) {
- suite = (TestSuite) allTests.get(key);
- subTestName = testName.substring(key.length() + 1);
- test = getSubTest(suite, subTestName);
- if (test != null) {
- return test;
- }
- }
- }
-
- return null;
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java
deleted file mode 100644
index 3bab38e..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.wst.common.tests.collector;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.swingui.TestRunner;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class SuiteTestRunner extends TestRunner {
-
- private TestSuite suite;
-
- /**
- * PluginTestRunner constructor comment.
- */
- public SuiteTestRunner(TestSuite suiteToRun) {
- super();
- suite = suiteToRun;
- }
-
- /**
- * Only return the specified suite
- */
- public Test getTest(String suiteClassName) {
- return suite;
- }
-
- /**
- * called by the gui
- */
- public void launch() {
- start();
- }
-
- public void start() {
- String name = "dynamic test"; //$NON-NLS-1$
- fFrame = createUI(name);
- fFrame.pack();
- fFrame.setVisible(true);
- setSuite(name);
- runSuite();
- }
-
- /*
- * @see TestRunner#terminate()
- */
- public void terminate() {
- fFrame.dispose();
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java
deleted file mode 100644
index 2b2bd28..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.wst.common.tests.collector;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestCollectorActionDelegate implements IWorkbenchWindowActionDelegate {
-
- /**
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
- */
- public void dispose() {
- }
-
- /**
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
- */
- public void init(IWorkbenchWindow window) {
- }
-
- /**
- * @see org.eclipse.ui.IActionDelegate#run(IAction)
- */
- public void run(IAction action) {
- Shell shell = new Shell();
- GridLayout gridLayout = new GridLayout();
- shell.setLayout(gridLayout);
- shell.setText("Test Collector"); //$NON-NLS-1$
- TestCollectorGUI testCollectorGUI = new TestCollectorGUI(shell, SWT.NULL);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.horizontalSpan = 1;
- testCollectorGUI.setLayoutData(gridData);
-
- shell.setSize(500, 500);
- shell.open();
- }
-
-
- /**
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
deleted file mode 100644
index 606252f..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Created on Mar 6, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.tests.collector;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class TestCollectorGUI extends Composite implements ModifyListener {
-
- private static final String PLUGIN_ID = "org.eclipse.wst.common.tests.collector"; //$NON-NLS-1$
- private static final String SUITES_EXT_PT = "suites"; //$NON-NLS-1$
-// private static final String NAME = "name"; //$NON-NLS-1$
-// private static final String CLASS = "class"; //$NON-NLS-1$
-
- private Composite innerPanes = null;
- private Combo combo = null;
-
- private Hashtable testSuites = new Hashtable();
-
- /**
- * @param parent
- * @param style
- */
- public TestCollectorGUI(Composite parent, int style) {
- super(parent, style);
-
- loadConfiguration();
-
- createPartControl();
- }
-
- private void loadConfiguration() {
- IExtensionPoint suiteExtPt = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, SUITES_EXT_PT);
- IExtension[] suitesExtensions = suiteExtPt.getExtensions();
-
- for (int i = 0; i < suitesExtensions.length; i++) {
- IExtension extension = suitesExtensions[i];
- IConfigurationElement[] tests = extension.getConfigurationElements();
- for (int j = 0; j < tests.length; j++) {
- try {
- IConfigurationElement element = tests[j];
- String suiteName = element.getAttribute("name"); //$NON-NLS-1$
- testSuites.put(suiteName, element);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- }
-
- public void createPartControl() {
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- setLayout(gridLayout);
-
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 1;
-
- combo = new Combo(this, SWT.READ_ONLY);
- Enumeration keys = testSuites.keys();
- ArrayList arrayList = new ArrayList();
- while (keys.hasMoreElements()) {
- arrayList.add(keys.nextElement());
- }
-
- Collections.sort(arrayList, new Comparator() {
- public int compare(Object o1, Object o2) {
- return ((String) o1).compareTo(((String) o2));
- }
- });
-
- for (int i = 0; i < arrayList.size(); i++) {
- combo.add((String) arrayList.get(i));
- }
- combo.setLayoutData(gridData);
- combo.addModifyListener(this);
- if (combo.getItemCount() > 0) {
- combo.select(0);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- if (e.getSource() == combo) {
- updateCombo(e);
- }
- }
-
- private void updateCombo(ModifyEvent e) {
- if (null != innerPanes) {
- innerPanes.dispose();
- }
- try {
- String testName = combo.getText();
- IConfigurationElement element = (IConfigurationElement) testSuites.get(testName);
- TestSuite suite = (TestSuite) element.createExecutableExtension("class"); //$NON-NLS-1$
- innerPanes = new TestCollectorInnerPanes(this, SWT.NULL, new SuiteHelper(suite));
- } catch (Exception ex) {
- innerPanes = new Composite(this, SWT.NULL);
- innerPanes.setLayout(new GridLayout());
- innerPanes.setBackground(getBackground());
- Label errorLabel = new Label(innerPanes, SWT.NONE);
- errorLabel.setText(ex.getMessage());
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.horizontalSpan = 1;
- errorLabel.setLayoutData(gridData);
- }
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.horizontalSpan = 1;
- innerPanes.setLayoutData(gridData);
- layout();
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java
deleted file mode 100644
index f62d96b..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.eclipse.wst.common.tests.collector;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestCollectorInnerPanes extends Composite {
-
- private Table testClassTable;
- private Table testMethodTable;
-
- private Button launchTestButton;
-
- private SuiteHelper pluginTestLoader;
-
- private HashSet partialSetHash = new HashSet();
- private Hashtable shortToFullHashtable = new Hashtable();
- private Hashtable fullToShortHashtable = new Hashtable();
-
- public TestCollectorInnerPanes(Composite parent, int style, SuiteHelper loader) {
- super(parent, style);
- pluginTestLoader = loader;
- createPartControl();
- }
-
- public void createPartControl() {
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- gridLayout.marginWidth = 0;
- gridLayout.marginHeight = 0;
- setLayout(gridLayout);
- GridData gridData = null;
-
- Group tableGroup = new Group(this, SWT.NULL);
- GridLayout tableGroupLayout = new GridLayout();
- tableGroupLayout.makeColumnsEqualWidth = true;
- tableGroupLayout.numColumns = 1;
- tableGroupLayout.marginWidth = 0;
- tableGroupLayout.marginHeight = 0;
- tableGroup.setLayout(tableGroupLayout);
- tableGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- SashForm splitView = new SashForm(tableGroup, SWT.HORIZONTAL);
- splitView.setBackground(getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-
- gridData = new GridData(GridData.FILL_BOTH);
- gridData.horizontalSpan = 2;
- splitView.setLayoutData(gridData);
-
- Composite leftComposite = new Composite(splitView, SWT.NONE);
- GridLayout leftLayout = new GridLayout();
- leftLayout.numColumns = 1;
- leftComposite.setLayout(leftLayout);
- Label label2 = new Label(leftComposite, SWT.NULL);
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.CENTER;
- label2.setLayoutData(gridData);
- label2.setText("Test Suites"); //$NON-NLS-1$
-
- Composite rightComposite = new Composite(splitView, SWT.NONE);
- GridLayout rightLayout = new GridLayout();
- rightLayout.numColumns = 1;
- rightComposite.setLayout(rightLayout);
- Label label3 = new Label(rightComposite, SWT.NULL);
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.CENTER;
- label3.setLayoutData(gridData);
- label3.setText("Tests"); //$NON-NLS-1$
-
- testClassTable = new Table(leftComposite, SWT.CHECK);
- testClassTable.setBackground(getBackground());
- gridData = new GridData(GridData.FILL_BOTH);
- testClassTable.setLayoutData(gridData);
- String[] allTests = pluginTestLoader.getAllTests();
- for (int i = 0; i < allTests.length; i++) {
- TableItem tableItem = new TableItem(testClassTable, SWT.NULL);
- tableItem.setText(allTests[i]);
- }
- testClassTable.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- TableItem item = (TableItem) e.item;
- String testName = item.getText();
- updateMethodTable(testName, pluginTestLoader.getTestMethods(testName));
- testClassTable.setSelection(new TableItem[] { item });
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- });
-
- Label label = new Label(leftComposite, SWT.SEPARATOR | SWT.HORIZONTAL);
- label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- final Button selectAllCheckbox = new Button(leftComposite, SWT.CHECK);
- selectAllCheckbox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- selectAllCheckbox.setText("Select All"); //$NON-NLS-1$
- selectAllCheckbox.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- boolean checked = selectAllCheckbox.getSelection();
- TableItem [] items = testClassTable.getItems();
- for(int i=0;i<items.length; i++){
- items[i].setChecked(checked);
- }
- }
- });
-
- testMethodTable = new Table(rightComposite, SWT.CHECK);
- testMethodTable.setBackground(getBackground());
- gridData = new GridData(GridData.FILL_BOTH);
- testMethodTable.setLayoutData(gridData);
-
- launchTestButton = new Button(this, SWT.PUSH);
- gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalAlignment = GridData.CENTER;
- gridData.horizontalSpan = 2;
- launchTestButton.setLayoutData(gridData);
- launchTestButton.setText("Run Tests"); //$NON-NLS-1$
- launchTestButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- SuiteTestRunner runner = new SuiteTestRunner(buildSuite());
- runner.launch();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
- }
-
- private void storeMethodsTable() {
- TableItem[] items = testMethodTable.getItems();
- for (int i = 0; null != items && i < items.length; i++) {
- String partialTestName = (String)shortToFullHashtable.get(items[i].getText());
- if (items[i].getChecked() && !partialSetHash.contains(partialTestName)) {
- partialSetHash.add(partialTestName);
- } else if (!items[i].getChecked() && partialSetHash.contains(partialTestName)) {
- partialSetHash.remove(partialTestName);
- }
- }
- }
-
- private void updateMethodTable(String testName, String[] methodArray) {
- storeMethodsTable();
- testMethodTable.removeAll();
- shortToFullHashtable.clear();
- fullToShortHashtable.clear();
-
- for (int i = 0; null != methodArray && i < methodArray.length; i++) {
- String partialTestName = testName + "." + methodArray[i]; //$NON-NLS-1$
- int endIndex = methodArray[i].indexOf('(');
- String methodName = endIndex > 0 ? methodArray[i].substring(0, endIndex) : methodArray[i];
- shortToFullHashtable.put(methodName, partialTestName);
- fullToShortHashtable.put(partialTestName, methodName);
- TableItem tableItem = new TableItem(testMethodTable, SWT.NULL);
- tableItem.setText(methodName);
- tableItem.setChecked(partialSetHash.contains(partialTestName));
- }
-
- }
-
- private TestSuite buildSuite() {
- ArrayList completeTests = new ArrayList();
- TableItem[] items = testClassTable.getItems();
- for (int i = 0; i < items.length; i++) {
- if (items[i].getChecked()) {
- completeTests.add(items[i].getText());
- }
- }
-
- String[] completeArray = new String[completeTests.size()];
- for (int i = 0; i < completeArray.length; i++) {
- completeArray[i] = (String) completeTests.get(i);
- }
-
- ArrayList partialTests = new ArrayList();
- storeMethodsTable();
- Iterator iterator = partialSetHash.iterator();
- while (iterator.hasNext()) {
- partialTests.add(iterator.next());
- }
-
- String[] partialArray = new String[partialTests.size()];
- for (int i = 0; i < partialArray.length; i++) {
- partialArray[i] = (String) partialTests.get(i);
- }
-
- return pluginTestLoader.buildSuite(completeArray, partialArray);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.collector/plugin.properties b/tests/org.eclipse.wst.common.tests.collector/plugin.properties
deleted file mode 100644
index 144de79..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/plugin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-org.eclipse.wst.common.tests.collector=org.eclipse.wst.common.tests.collector
-suites=suites
-Test_Collector=Test Collector
-WTP_Tests=WTP Tests
-Open=Open
-Test_Collector=Test Collector
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.collector/plugin.xml b/tests/org.eclipse.wst.common.tests.collector/plugin.xml
deleted file mode 100644
index 98a7a6c..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/plugin.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.common.tests.collector"
- name="%org.eclipse.wst.common.tests.collector"
- version="1.0.0">
-
- <runtime>
- <library name="runtime/collector.jar"/>
- </runtime>
- <requires>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- </requires>
- <extension-point id="suites" name="%suites" schema="schema/suites.exsd"/>
-
-
-
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%Test_Collector"
- visible="true"
- id="testCollector">
- <menu
- label="%WTP_Tests"
- path="additions"
- id="org.eclipse.wst.common.tests.collector.testsMenu">
- <separator
- name="group1">
- </separator>
- </menu>
- <action
- label="%Open"
- tooltip="%Test_Collector"
- class="org.eclipse.wst.common.tests.collector.TestCollectorActionDelegate"
- menubarPath="org.eclipse.wst.common.tests.collector.testsMenu/group1"
- id="org.eclipse.wst.common.tests.collector.testsAction">
- </action>
- </actionSet>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd b/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd
deleted file mode 100644
index dfec3c5..0000000
--- a/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.tests.collector">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.tests.collector" id="suites" name="suites"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="suite"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="suite">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/tests/org.eclipse.wst.common.tests.ui/.classpath b/tests/org.eclipse.wst.common.tests.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.common.tests.ui/.cvsignore b/tests/org.eclipse.wst.common.tests.ui/.cvsignore
deleted file mode 100644
index 2521e52..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
diff --git a/tests/org.eclipse.wst.common.tests.ui/.project b/tests/org.eclipse.wst.common.tests.ui/.project
deleted file mode 100644
index 8efe78d..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.tests.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.common.tests.ui/about.html b/tests/org.eclipse.wst.common.tests.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.ui/build.properties b/tests/org.eclipse.wst.common.tests.ui/build.properties
deleted file mode 100644
index cb204fd..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.ui.jar = src/
-output.ui.jar = bin/
-bin.includes = plugin.xml,\
- ui.jar,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.wst.common.tests.ui/plugin.properties b/tests/org.eclipse.wst.common.tests.ui/plugin.properties
deleted file mode 100644
index 43069c8..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Ui_Plug-in=Test Ui Plug-in
-Eclipse=Eclipse.org
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.ui/plugin.xml b/tests/org.eclipse.wst.common.tests.ui/plugin.xml
deleted file mode 100644
index 642b93f..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/plugin.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.common.tests.ui"
- name="%Ui_Plug-in"
- version="1.0.0"
- provider-name="%Eclipse"
- class="org.eclipse.wst.common.tests.ui.UiPlugin">
-
- <runtime>
- <library name="ui.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui"/>
- <import plugin="org.eclipse.wst.common.tests"/>
- <import plugin="org.eclipse.wst.common.environment"/>
- </requires>
-
- <extension
- point="org.eclipse.wst.common.tests.collector.suites">
- <suite
- class="org.eclipse.wst.common.tests.ui.DataModelUIAPITests"
- name="DataModel UI API Tests">
- </suite>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.ui.DataModelWizardExtension">
- <DataModelWizard
- class="org.eclipse.wst.common.tests.ui.TestDataModelWizard"
- id="org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"/>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.ui.wizardPageGroup">
- <wizardPageGroup
- pageGroupID="foo"
- wizardID="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelProvider">
- <factory className="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelWizardFactory"/>
- </wizardPageGroup>
- <wizardPageGroup
- pageGroupID="bar"
- wizardID="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelProvider">
- <factory className="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelWizardFactory2"/>
- </wizardPageGroup>
- <wizardPageGroup
- pageGroupID="foobar"
- wizardID="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelProvider">
- <factory className="org.eclipse.wst.common.tests.ui.wizard.Test2DataModelWizardFactory3"/>
- </wizardPageGroup>
- </extension>
-
-
-</plugin>
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java
deleted file mode 100644
index b7f3581..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.common.tests.ui;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.common.tests.SimpleTestSuite;
-import org.eclipse.wst.common.tests.ui.wizard.TestWizardTestcase;
-
-/**
- * @author jsholl
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class DataModelUIAPITests extends TestSuite {
-
- public static Test suite() {
- return new DataModelUIAPITests();
- }
-
- public DataModelUIAPITests() {
- super();
- addTest(new SimpleTestSuite(DataModelUIFactoryTest.class));
- addTest(new SimpleTestSuite(TestWizardTestcase.class));
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
deleted file mode 100644
index 5f2d281..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.common.tests.ui;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.tests.TestDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardFactory;
-
-public class DataModelUIFactoryTest extends TestCase {
-
- public void testValidExtensionID() {
- IDataModel dataModel = DataModelFactory.createDataModel("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"); //$NON-NLS-1$
- assertTrue(dataModel.isProperty(ITestDataModel.FOO));
- DataModelWizard wizard = DataModelWizardFactory.createWizard("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"); //$NON-NLS-1$
- assertNotNull(wizard);
- assertNotNull(wizard.getDataModel());
- }
-
-
- public void testValidExtensionClass() {
- IDataModel dataModel = DataModelFactory.createDataModel(ITestDataModel.class);
- assertTrue(dataModel.isProperty(ITestDataModel.FOO));
- DataModelWizard wizard = DataModelWizardFactory.createWizard(ITestDataModel.class);
- assertNotNull(wizard);
- assertNotNull(wizard.getDataModel());
- }
-
- public void testValidExtensionInstance() {
- int startInstanceCount = TestDataModelProvider.getInstanceCount();
- IDataModel dataModel = DataModelFactory.createDataModel(new TestDataModelProvider());
- assertTrue(dataModel.isProperty(ITestDataModel.FOO));
- DataModelWizard wizard = DataModelWizardFactory.createWizard(dataModel);
- assertNotNull(wizard);
- assertTrue(dataModel == wizard.getDataModel());
- int endInstanceCount = TestDataModelProvider.getInstanceCount();
- assertEquals(1, endInstanceCount-startInstanceCount);
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java
deleted file mode 100644
index b6044c4..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.common.tests.ui;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.tests.TestDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-public class TestDataModelWizard extends DataModelWizard {
-
- public TestDataModelWizard() {
- super();
- }
-
- public TestDataModelWizard(IDataModel dataModel) {
- super(dataModel);
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new TestDataModelProvider();
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
deleted file mode 100644
index 976fc6e..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.wst.common.tests.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UiPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static UiPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public UiPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- resourceBundle = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static UiPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = UiPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.tests.ui.UiPluginResources"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.wst.common.tests.ui", path); //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java
deleted file mode 100644
index 806cb6e..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/manager/TestGroupManager.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.manager;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-import junit.framework.TestCase;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DataModelManager;
-import org.eclipse.wst.common.frameworks.internal.OperationManager;
-import org.eclipse.wst.common.frameworks.internal.datamodel.DataModelImpl;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageGroupHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.IDMPageHandler;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-import org.eclipse.wst.common.frameworks.internal.ui.PageGroupManager;
-import org.eclipse.wst.common.frameworks.operations.tests.manager.BaseOperation;
-
-public class TestGroupManager extends TestCase {
- private OperationManager operationManager;
- private PageGroupManager pageGroupManager;
- private BaseOperation opA;
- private BaseOperation opB;
- private BaseOperation opC;
- private BaseOperation opD;
- private BaseOperation opE;
- private BaseOperation opF;
- private BaseOperation opG;
- private SimplePageGroup pgA;
- private SimplePageGroup pgB;
- private SimplePageGroup pgC;
- private SimplePageGroup pgD;
- private SimplePageGroup pgE;
- private SimplePageGroup pgF;
- private SimplePageGroup pgG;
- private SimplePageGroup pgH;
- private SimplePageGroup pgRoot;
- private WizardPage r1;
- private WizardPage b1;
- private WizardPage b2;
- private WizardPage c1;
- private WizardPage d1;
- private WizardPage d2;
- private WizardPage d3;
- private WizardPage f1;
- private WizardPage f2;
- private WizardPage f3;
- private WizardPage f4;
- private WizardPage f5;
- private WizardPage f6;
- private WizardPage g1;
-
- private AGroupHandler aGroupHandler;
- private FGroupHandler fGroupHandler;
- // private Status error_ = new Status( IStatus.ERROR, "id", 0, "mess", null );
- private Vector executedOps;
- private Vector executedUndoOps;
- private Vector expectedOps;
- private Vector expectedUndoOps;
- private IDataModel dataModel;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- executedOps = new Vector();
- executedUndoOps = new Vector();
- expectedOps = new Vector();
- expectedUndoOps = new Vector();
- dataModel = new DataModelImpl(new DataModelProvider());
-
- DataModelManager dataModelManager = new DataModelManager(dataModel);
-
- opA = new BaseOperation("A", executedOps, executedUndoOps); //$NON-NLS-1$
- opB = new BaseOperation("B", executedOps, executedUndoOps); //$NON-NLS-1$
- opC = new BaseOperation("C", executedOps, executedUndoOps); //$NON-NLS-1$
- opD = new BaseOperation("D", executedOps, executedUndoOps); //$NON-NLS-1$
- opE = new BaseOperation("E", executedOps, executedUndoOps); //$NON-NLS-1$
- opF = new BaseOperation("F", executedOps, executedUndoOps); //$NON-NLS-1$
- opG = new BaseOperation("G", executedOps, executedUndoOps); //$NON-NLS-1$
-
- // Operations are organized as follows:
- //
- // D
- // / \
- // B F
- // / \ / \
- // A C E G
- operationManager = new OperationManager(dataModelManager, opD, EnvironmentService.getEclipseConsoleEnvironment() );
- operationManager.addExtendedPreOperation(opD.getID(), opB);
- operationManager.addExtendedPostOperation(opD.getID(), opF);
- operationManager.addExtendedPreOperation(opB.getID(), opA);
- operationManager.addExtendedPostOperation(opB.getID(), opC);
- operationManager.addExtendedPreOperation(opF.getID(), opE);
- operationManager.addExtendedPostOperation(opF.getID(), opG);
-
- // Page groups are organized as follows:
- //
- // B - C
- // / \
- // Root - A - D \ G
- // \ \ /
- // ------ E - F - H
- // \ null
- //
- // The page group handler for A will return either B and then E or D and
- // then E. The group handler for F will return either G or H and then null or
- // just null.
- //
- // Some of these group require operations to run first:
- //
- // Page group B requires operation C.
- // Page group D requires operation C.
- // Page group E requires operation E.
- // Page group F requires operation C.( C will already have been run and should not be
- // rerun.)
- //
- // Each page group has some pages associated with it as follows:
- //
- // Root has page r1.
- // A has no pages.
- // B has b1 and b2.
- // C has c1
- // D has d1, d2, and d3
- // E has no pages.
- // F has pages f1, f2, f3, f4, f5, f6
- // the page handler for F will return the following:
- // expected = f1 returns f1
- // expected = f2 returns skip
- // expected = f3 returns before f6
- // expected = f4 returns null
- // expected = f5 returns after f5
- // expected = f6 returns f4
- // G has pages g1
- // H has no pages.
- r1 = new WizardPage("r1"); //$NON-NLS-1$
- b1 = new WizardPage("b1"); //$NON-NLS-1$
- b2 = new WizardPage("b2"); //$NON-NLS-1$
- c1 = new WizardPage("c1"); //$NON-NLS-1$
- d1 = new WizardPage("d1"); //$NON-NLS-1$
- d2 = new WizardPage("d2"); //$NON-NLS-1$
- d3 = new WizardPage("d3"); //$NON-NLS-1$
- f1 = new WizardPage("f1"); //$NON-NLS-1$
- f2 = new WizardPage("f2"); //$NON-NLS-1$
- f3 = new WizardPage("f3"); //$NON-NLS-1$
- f4 = new WizardPage("f4"); //$NON-NLS-1$
- f5 = new WizardPage("f5"); //$NON-NLS-1$
- f6 = new WizardPage("f6"); //$NON-NLS-1$
- g1 = new WizardPage("g1"); //$NON-NLS-1$
-
- String wizardID = "testWizard"; //$NON-NLS-1$
-
- pgRoot = new SimplePageGroup("Root", wizardID); //$NON-NLS-1$
- pgA = new SimplePageGroup("A", wizardID); //$NON-NLS-1$
- pgB = new SimplePageGroup("B", wizardID, true, "C"); //$NON-NLS-1$ //$NON-NLS-2$
- pgC = new SimplePageGroup("C", wizardID); //$NON-NLS-1$
- pgD = new SimplePageGroup("D", wizardID, true, "C"); //$NON-NLS-1$ //$NON-NLS-2$
- pgE = new SimplePageGroup("E", wizardID, true, "E"); //$NON-NLS-1$ //$NON-NLS-2$
- pgF = new SimplePageGroup("F", wizardID, true, "C"); //$NON-NLS-1$ //$NON-NLS-2$
- pgG = new SimplePageGroup("G", wizardID); //$NON-NLS-1$
- pgH = new SimplePageGroup("H", wizardID); //$NON-NLS-1$
-
- pgRoot.addPages(new WizardPage[]{r1});
- pgB.addPages(new WizardPage[]{b1, b2});
- pgC.addPages(new WizardPage[]{c1});
- pgD.addPages(new WizardPage[]{d1, d2, d3});
- pgF.addPages(new WizardPage[]{f1, f2, f3, f4, f5, f6});
- pgG.addPages(new WizardPage[]{g1});
-
- pgF.setPageHandler(new FPageHandler());
-
- aGroupHandler = new AGroupHandler();
- fGroupHandler = new FGroupHandler();
-
- pgA.setPageGroupHandler(aGroupHandler);
- pgF.setPageGroupHandler(fGroupHandler);
-
- pageGroupManager = new PageGroupManager(operationManager, dataModelManager, pgRoot);
- pageGroupManager.addGroupAfter("Root", pgA); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("A", pgB); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("A", pgD); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("A", pgE); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("B", pgC); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("E", pgF); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("F", pgG); //$NON-NLS-1$
- pageGroupManager.addGroupAfter("F", pgH); //$NON-NLS-1$
- }
-
- public void testSimpleRun() throws Exception {
- HashSet ids = new HashSet();
- ids.add( "testprovider1" );
- ids.add( "testprovider2" );
- pgA.setDataModelIDs( ids );
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The root page should be null", pageGroupManager.getCurrentPage() == null); //$NON-NLS-1$
- pageGroupManager.moveBackOnePage(); // Should do nothing.
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- aGroupHandler.setGroupIDToSelect("B"); //$NON-NLS-1$
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be r1", pageGroupManager.getCurrentPage() == r1); //$NON-NLS-1$
- checkResults();
- assertTrue("Data models not Ok for page group A", checkDataModels() ); //$NON-NLS-1$
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be b1", pageGroupManager.getCurrentPage() == b1); //$NON-NLS-1$
- expectedOps.add(opA);
- expectedOps.add(opB);
- expectedOps.add(opC);
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be b2", pageGroupManager.getCurrentPage() == b2); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be c1", pageGroupManager.getCurrentPage() == c1); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f1", pageGroupManager.getCurrentPage() == f1); //$NON-NLS-1$
- expectedOps.add(opD);
- expectedOps.add(opE);
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f3", pageGroupManager.getCurrentPage() == f3); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f5", pageGroupManager.getCurrentPage() == f5); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f6", pageGroupManager.getCurrentPage() == f6); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- fGroupHandler.setGroupIDToSelect("G"); //$NON-NLS-1$
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f4); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertFalse("There should not be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be g1", pageGroupManager.getCurrentPage() == g1); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f4); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f6); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f5); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f3); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f1); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == c1); //$NON-NLS-1$
- expectedOps.setSize(3);
- expectedUndoOps.add(opE);
- expectedUndoOps.add(opD);
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be b2", pageGroupManager.getCurrentPage() == b2); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be b1", pageGroupManager.getCurrentPage() == b1); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveBackOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The root page should be r1", pageGroupManager.getCurrentPage() == r1); //$NON-NLS-1$
- expectedOps = new Vector();
- expectedUndoOps.add(opC);
- expectedUndoOps.add(opB);
- expectedUndoOps.add(opA);
- checkResults();
-
- reset();
- aGroupHandler.setGroupIDToSelect("D"); //$NON-NLS-1$
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be d1", pageGroupManager.getCurrentPage() == d1); //$NON-NLS-1$
- expectedOps.add(opA);
- expectedOps.add(opB);
- expectedOps.add(opC);
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be d2", pageGroupManager.getCurrentPage() == d2); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be d3", pageGroupManager.getCurrentPage() == d3); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f1", pageGroupManager.getCurrentPage() == f1); //$NON-NLS-1$
- expectedOps.add(opD);
- expectedOps.add(opE);
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f3", pageGroupManager.getCurrentPage() == f3); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f5", pageGroupManager.getCurrentPage() == f5); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- assertTrue("There should be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f6", pageGroupManager.getCurrentPage() == f6); //$NON-NLS-1$
- checkResults();
-
- pageGroupManager.moveForwardOnePage();
- fGroupHandler.setGroupIDToSelect(null);
- assertFalse("There should not be a next page", pageGroupManager.hasNextPage()); //$NON-NLS-1$
- assertTrue("The page should be f4", pageGroupManager.getCurrentPage() == f4); //$NON-NLS-1$
- checkResults();
- }
-
- private void checkResults() {
- assertTrue("Expected=" + expectedOps.size() + " executed=" + executedOps.size(), executedOps.size() == expectedOps.size()); //$NON-NLS-1$ //$NON-NLS-2$
-
- for (int index = 0; index < executedOps.size(); index++) {
- assertEquals(((BaseOperation) expectedOps.elementAt(index)).getID(), ((BaseOperation) executedOps.elementAt(index)).getID());
- }
-
- assertTrue("Expected undo=" + expectedUndoOps.size() + " executed=" + executedUndoOps.size(), executedUndoOps.size() == expectedUndoOps.size()); //$NON-NLS-1$ //$NON-NLS-2$
-
- for (int index = 0; index < executedUndoOps.size(); index++) {
- assertEquals(((BaseOperation) expectedUndoOps.elementAt(index)).getID(), ((BaseOperation) executedUndoOps.elementAt(index)).getID());
- }
- }
-
- private void reset() {
- executedOps.removeAllElements();
- expectedOps.removeAllElements();
- executedUndoOps.removeAllElements();
- expectedUndoOps.removeAllElements();
- }
-
- private boolean checkDataModels()
- {
- IDataModel model = dataModel;
-
- boolean containsModel1 = model.isNestedModel( "testprovider1" );
- boolean containsModel2 = model.isNestedModel( "testprovider2" );
- boolean prop1 = model.isPropertySet( "provider1Prop1" );
- boolean prop2 = model.isPropertySet( "provider1Prop2" );
- boolean prop3 = model.isPropertySet( "provider1Prop3" );
- boolean prop4 = model.isPropertySet( "provider1Prop4" );
- boolean prop5 = model.isPropertySet( "provider2Prop1" );
- boolean prop6 = model.isPropertySet( "provider2Prop2" );
- boolean prop7 = model.isPropertySet( "provider2Prop3" );
- boolean prop8 = model.isPropertySet( "provider2Prop4" );
- boolean value1 = model.getProperty( "provider1Prop1" ).equals( "11" );
- boolean value2 = model.getProperty( "provider1Prop2" ).equals( "22" );
- boolean value3 = model.getProperty( "provider1Prop3" ).equals( "33" );
- boolean value4 = model.getProperty( "provider1Prop4" ).equals( "44" );
- boolean value5 = model.getProperty( "provider2Prop1" ).equals( "1111" );
- boolean value6 = model.getProperty( "provider2Prop2" ).equals( "2222" );
- boolean value7 = model.getProperty( "provider2Prop3" ).equals( "3333" );
- boolean value8 = model.getProperty( "provider2Prop4" ).equals( "4444" );
-
- return containsModel1 && containsModel2 &&
- prop1 && prop2 && prop3 && prop4 && prop5 && prop6 && prop7 && prop8 &&
- value1 && value2 && value3 && value4 && value5 && value6 && value7 && value8;
- }
-
- private class AGroupHandler implements IDMPageGroupHandler {
- private String groupID_;
-
- public String getNextPageGroup(String currentPageGroupID, String[] pageGroupIDs) {
- String result = null;
-
- if (currentPageGroupID == null) {
- result = groupID_;
- } else if (currentPageGroupID.equals("E")) { //$NON-NLS-1$
- result = null;
- } else {
- result = "E"; //$NON-NLS-1$
- }
-
- return result;
- }
-
- public void setGroupIDToSelect(String id) {
- groupID_ = id;
- }
- }
-
- private class FGroupHandler implements IDMPageGroupHandler {
- private String groupID_;
-
- public String getNextPageGroup(String currentPageGroupID, String[] pageGroupIDs) {
- if (currentPageGroupID == null)
- return groupID_;
-
- return null;
- }
-
- public void setGroupIDToSelect(String id) {
- groupID_ = id;
- }
- }
-
- //
- // F has pages f1, f2, f3, f4, f5, f6
- // the page handler for F will return the following:
- // expected = f1 returns f1
- // expected = f2 returns skip
- // expected = f3 returns before f6
- // expected = f4 returns null
- // expected = f5 returns after f5
- // expected = f6 returns f4
- //
- // This handle should cause the following pages to be used.
- // f1, f3, f5, f6, f4, null
- //
- private class FPageHandler implements IDMPageHandler {
- public String getNextPage(String currentPageName, String expectedNextPageName) {
- String result = null;
-
- if (currentPageName == null) {
- result = "f1"; //$NON-NLS-1$
- } else if (currentPageName.equals("f1")) { //$NON-NLS-1$
- result = IDMPageHandler.SKIP_PAGE;
- } else if (currentPageName.equals("f3")) { //$NON-NLS-1$
- result = IDMPageHandler.PAGE_BEFORE + "f6"; //$NON-NLS-1$
- } else if (currentPageName.equals("f4")) { //$NON-NLS-1$
- result = null;
- } else if (currentPageName.equals("f5")) { //$NON-NLS-1$
- result = IDMPageHandler.PAGE_AFTER + "f5"; //$NON-NLS-1$
- } else if (currentPageName.equals("f6")) { //$NON-NLS-1$
- result = "f4"; //$NON-NLS-1$
- }
-
- return result;
- }
-
- public String getPreviousPage(String currentPageName, String expectedPreviousPageName) {
- return expectedPreviousPageName;
- }
-
- }
-
- private class DataModelProvider extends AbstractDataModelProvider {
-
- public Set getPropertyNames() {
- return new HashSet();
- }
- }
-
- private class WizardPage extends DataModelWizardPage {
- private boolean canFinish_ = true;
-
- public WizardPage(String id) {
- super(dataModel, id);
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- return null;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[0];
- }
-
- public void setCanFinish(boolean canFinish) {
- canFinish_ = canFinish;
- }
-
- public boolean canPageFinish() {
- return canFinish_;
- }
-
- public IDataModelOperation createOperation() {
- return null;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelProvider.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelProvider.java
deleted file mode 100644
index d619d48..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-
-public class Test2DataModelProvider extends AbstractDataModelProvider {
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizard.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizard.java
deleted file mode 100644
index 739957b..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizard.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.AddablePageGroup;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-import org.eclipse.wst.common.frameworks.internal.ui.SimplePageGroupHandler;
-
-public class Test2DataModelWizard extends DataModelWizard {
-
- protected IDataModelProvider getDefaultProvider() {
- return new Test2DataModelProvider();
- }
-
- protected AddablePageGroup createRootPageGroup() {
- SimplePageGroup pg = (SimplePageGroup) super.createRootPageGroup();
- pg.setPageGroupHandler(new SimplePageGroupHandler() {
- public String getNextPageGroup(String currentPageGroupID, String[] pageGroupIDs) {
- if (currentPageGroupID == null) {
- for (int i = 0; i < pageGroupIDs.length; i++) {
- if (pageGroupIDs[i].equals("bar")) { //$NON-NLS-1$
- return "bar"; //$NON-NLS-1$
- }
- }
- }
- return super.getNextPageGroup(currentPageGroupID, pageGroupIDs);
- }
- });
- return pg;
- }
-
- protected IDataModelOperation getRootOperation() {
- // TODO Auto-generated method stub
- return super.getRootOperation();
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory.java
deleted file mode 100644
index 3e369ad..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.DMWizardExtensionFactory;
-
-public class Test2DataModelWizardFactory extends DMWizardExtensionFactory {
-
- protected String getPageName() {
- return "A Page"; //$NON-NLS-1$
- }
-
- protected IDataModelProvider getProvider(){
- return new Test2DataModelProvider(){
- public IDataModelOperation getDefaultOperation() {
- return new AbstractDataModelOperation(){
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- System.out.println(getPageName());
- return OK_STATUS;
- }
- };
- }
- };
- }
-
- public DataModelWizardPage[] createPageGroup(IDataModel dataModel, String pageGroupID) {
- return new DataModelWizardPage[]{new DataModelWizardPage(DataModelFactory.createDataModel(getProvider()), getPageName()) {
- protected String[] getValidationPropertyNames() {
- // TODO Auto-generated method stub
- return null;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- Label label = new Label(composite, SWT.NULL);
- label.setLayoutData(data);
- label.setText(getPageName());
- return composite;
- }
- }};
- }
-
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory2.java
deleted file mode 100644
index 0f758a7..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory2.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-public class Test2DataModelWizardFactory2 extends Test2DataModelWizardFactory {
-
- protected String getPageName() {
- return "A Better Page"; //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory3.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory3.java
deleted file mode 100644
index 891e403..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/Test2DataModelWizardFactory3.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 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
- *******************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-public class Test2DataModelWizardFactory3 extends Test2DataModelWizardFactory {
-
- protected String getPageName() {
- return "Another Page, but not better"; //$NON-NLS-1$
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java
deleted file mode 100644
index 5fb74f4..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataModelProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class TestDataModelProvider extends AbstractDataModelProvider {
- public String getID() {
- return "TestWizardID"; //$NON-NLS-1$
- }
-
- public Set getPropertyNames() {
- HashSet result = new HashSet();
-
- result.add("prop1"); //$NON-NLS-1$
- result.add("prop2"); //$NON-NLS-1$
-
- return result;
- }
-
- public IDataModelOperation getDefaultOperation() {
- return new TestOperation();
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java
deleted file mode 100644
index ce6dde7..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestDataWizard.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.AddablePageGroup;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-import org.eclipse.wst.common.frameworks.internal.ui.PageGroupManager;
-
-public class TestDataWizard extends DataModelWizard {
- private SimplePageGroup root;
-
- public TestDataWizard() {
- setForcePreviousAndNextButtons(true);
- setNeedsProgressMonitor(true);
- }
-
- protected void doAddPages() {
- PageGroupManager pageManager = getPageGroupManager();
- pageManager.addGroupAfter(root.getPageGroupID(), new TestPageGroup2(getDataModel()));
-
- super.doAddPages();
- }
-
- protected IDataModelProvider getDefaultProvider() {
- return new TestDataModelProvider();
- }
-
- protected AddablePageGroup createRootPageGroup() {
- root = new TestRootPageGroup(getDataModel());
-
- return root;
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java
deleted file mode 100644
index a453462..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestOperation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class TestOperation extends AbstractDataModelOperation {
-
- public TestOperation() {
- setID("TestOperation"); //$NON-NLS-1$
- }
-
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- System.out.println("In execute: data model=" + getDataModel()); //$NON-NLS-1$
-
- try {
- monitor.beginTask("Test operation: ", 5); //$NON-NLS-1$
- for (int index = 1; index < 6; index++) {
- monitor.subTask("part " + index + " of 5 complete."); //$NON-NLS-1$ //$NON-NLS-2$
- Thread.sleep(1000);
- }
- } catch (Throwable exc) {
- throw new ExecutionException("execute threw and exception ", exc); //$NON-NLS-1$
- }
-
- return Status.OK_STATUS;
- }
-
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return Status.OK_STATUS;
- }
-
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- System.out.println("Undo test operation"); //$NON-NLS-1$
-
- return Status.OK_STATUS;
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java
deleted file mode 100644
index 62a71b4..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage1.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public class TestPage1 extends DataModelWizardPage {
- public TestPage1(IDataModel model) {
- super(model, "Page1"); //$NON-NLS-1$
- setTitle("Title for test page1"); //$NON-NLS-1$
- setDescription("Description for test page 1"); //$NON-NLS-1$
- }
-
- public boolean canPageFinish() {
- return true;
- }
-
- public IDataModelOperation createOperation() {
- return null;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite group = new Composite(parent, SWT.NONE);
- Button button1 = new Button(group, SWT.PUSH);
- Button button2 = new Button(group, SWT.PUSH);
-
- button1.setText("Button1"); //$NON-NLS-1$
- button2.setText("Button2"); //$NON-NLS-1$
- group.setLayout(new GridLayout());
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- return group;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[0];
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java
deleted file mode 100644
index 78963f9..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPage2.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public class TestPage2 extends DataModelWizardPage {
- public TestPage2(IDataModel model) {
- super(model, "Page2"); //$NON-NLS-1$
- setTitle("Title for test page2"); //$NON-NLS-1$
- setDescription("Description for test page 2"); //$NON-NLS-1$
- }
-
- public boolean canPageFinish() {
- return true;
- }
-
- public IDataModelOperation createOperation() {
- return null;
- }
-
- protected Composite createTopLevelComposite(Composite parent) {
- Composite group = new Composite(parent, SWT.NONE);
- Button button1 = new Button(group, SWT.PUSH);
- Button button2 = new Button(group, SWT.PUSH);
-
- button1.setText("Page 2 button1"); //$NON-NLS-1$
- button2.setText("Page 2 button2"); //$NON-NLS-1$
- group.setLayout(new GridLayout());
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- return group;
- }
-
- protected String[] getValidationPropertyNames() {
- return new String[0];
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java
deleted file mode 100644
index 98a8355..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestPageGroup2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-
-public class TestPageGroup2 extends SimplePageGroup {
- private IDataModel dataModel;
-
- public TestPageGroup2(IDataModel dataModel) {
- super("group2", dataModel.getID(), true, "TestOperation"); //$NON-NLS-1$ //$NON-NLS-2$
- this.dataModel = dataModel;
-
- addPages(new IWizardPage[]{new TestPage2(this.dataModel)});
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java
deleted file mode 100644
index ad285b9..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestRootPageGroup.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.SimplePageGroup;
-
-public class TestRootPageGroup extends SimplePageGroup {
- private IDataModel dataModel;
-
- public TestRootPageGroup(IDataModel dataModel) {
- super(dataModel.getID(), dataModel.getID());
- this.dataModel = dataModel;
-
- addPages(new IWizardPage[]{new TestPage1(this.dataModel)});
- }
-}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java
deleted file mode 100644
index 0d05a9b..0000000
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/wizard/TestWizardTestcase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2005 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
- **************************************************************************************************/
-package org.eclipse.wst.common.tests.ui.wizard;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-
-import junit.framework.TestCase;
-
-public class TestWizardTestcase extends TestCase {
- private TestDataWizard wizard_;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- wizard_ = new TestDataWizard();
- }
-
- public void testSimpleWizard() throws Exception {
- WizardDialog dialog = new WizardDialog(null, wizard_);
-
- dialog.open();
- }
-
- public void test2DataModelWizard() throws Exception {
- Display.getDefault().syncExec( new Runnable(){
- public void run() {
- WizardDialog dialog = new WizardDialog(null, new Test2DataModelWizard());
- dialog.open();
- }
- });
- }
-}
