Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 130734 Details for
Bug 257266
[Usability] Clarify datapool import/export options.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch.
Defect_257266_patch.txt (text/plain), 212.33 KB, created by
Paul Slauenwhite
on 2009-04-02 13:29:49 EDT
(
hide
)
Description:
Patch.
Filename:
MIME Type:
Creator:
Paul Slauenwhite
Created:
2009-04-02 13:29:49 EDT
Size:
212.33 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.hyades.ui >Index: src/org/eclipse/hyades/ui/internal/wizard/AttributeWizardPage.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.ui/src/org/eclipse/hyades/ui/internal/wizard/AttributeWizardPage.java,v >retrieving revision 1.9 >diff -u -r1.9 AttributeWizardPage.java >--- src/org/eclipse/hyades/ui/internal/wizard/AttributeWizardPage.java 1 Apr 2009 13:36:40 -0000 1.9 >+++ src/org/eclipse/hyades/ui/internal/wizard/AttributeWizardPage.java 2 Apr 2009 17:28:52 -0000 >@@ -24,21 +24,20 @@ > import org.eclipse.ui.PlatformUI; > > /** >- * Wizard page that allows the user to define the description of the object >- * to be created. >- * </p> >+ * <p>Wizard page that allows the user to define the description of the object >+ * to be created.</p> > * > * > * @author Patrick Nedelec > * @author Marcelo Paternostro > * @author Paul E. Slauenwhite >- * @version April 1, 2009 >+ * @version April 2, 2009 > * @since January 26, 2005 > */ > public class AttributeWizardPage extends WizardPage { > >- private Text itemDescriptionText; >- private String itemDescription; >+ protected Text itemDescriptionText; >+ protected String itemDescription; > > private boolean firstActivation = true; > >#P org.eclipse.tptp.test.report.birt.doc.user >Index: tasks/treporttest.xhtml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.report.birt.doc.user/tasks/treporttest.xhtml,v >retrieving revision 1.16 >diff -u -r1.16 treporttest.xhtml >--- tasks/treporttest.xhtml 31 Mar 2009 13:33:27 -0000 1.16 >+++ tasks/treporttest.xhtml 2 Apr 2009 17:28:53 -0000 >@@ -62,10 +62,10 @@ > > <p>Generate a BIRT test report:</p> > <ol> >- <li>Right-click on a test suite in the Test Navigator and select <b>Report... </b>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click on a test suite in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>Report... </b>.</li> > <li>Select one of the BIRT test report types and click <b>Next </b>.</li> > <li>Select the parent folder and define the name of the BIRT test report and click <b>Next</b>.</li> >- <li>Optionally, provide the report window (start and end data and time) for the BIRT test report.</li> >+ <li>Provide the report window (start and end data and time) for the BIRT test report.</li> > <li>Click <b>Finish </b> to generate the BIRT test report.</li> > <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new BIRT test report is to be opened in the internal Web Browser or text editor.</li> > </ol> >#P org.eclipse.tptp.test.recorders.url.doc.user >Index: tasks/tcreatetestfromurlrecording.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.recorders.url.doc.user/tasks/tcreatetestfromurlrecording.htm,v >retrieving revision 1.1 >diff -u -r1.1 tcreatetestfromurlrecording.htm >--- tasks/tcreatetestfromurlrecording.htm 31 Mar 2009 13:33:24 -0000 1.1 >+++ tasks/tcreatetestfromurlrecording.htm 2 Apr 2009 17:28:54 -0000 >@@ -54,7 +54,7 @@ > <p>Performance tests are created from new URL recordings with the <a href="../../org.eclipse.hyades.test.doc.user/tasks/tcreatetestfromrecording.htm">New Test From Recording</a> wizard:</p> > > <ol> >- <li>Right-click in the Test Navigator, select <b>New</b> > <b>Test Element...</b> > <b>Test From Recording</b>, and click <b>Next</b>. Alternatively, click the <b>New Test From Recording</b> button in the toolbar of the <a href="../../org.eclipse.hyades.test.doc.user/concepts/crecordercontrolview.htm">Recorder Control View</a>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, select <b>New</b> > <b>Test Element...</b> > <b>Test From Recording</b>, and click <b>Next</b>. Alternatively, click the <b>New Test From Recording</b> button in the toolbar of the <a href="../../org.eclipse.hyades.test.doc.user/concepts/crecordercontrolview.htm">Recorder Control View</a>.</li> > <li>Select <b>Create the test from a new recording</b>.</li> > <li>Select the <b>URL Recorder</b> to record the new URL recording.</li> > <li>Optionally, click <b>Advanced >></b> and confirm the <b>TPTP URL Test Generator</b> is selected to create the new performance test from the new URL recording.</li> >@@ -97,7 +97,7 @@ > <p>In addition, performance tests can be created from existing URL recordings with the <b>New Test From Recording</b> wizard:</p> > > <ol> >- <li>Right-click in the Test Navigator, select <b>New</b> > <b>Test Element...</b> > <b>Test From Recording</b>, and click <b>Next</b>. Alternatively, click the <b>New Test From Recording</b> button in the toolbar of the <a href="../../org.eclipse.hyades.test.doc.user/concepts/crecordercontrolview.htm">Recorder Control View</a>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, select <b>New</b> > <b>Test Element...</b> > <b>Test From Recording</b>, and click <b>Next</b>. Alternatively, click the <b>New Test From Recording</b> button in the toolbar of the <a href="../../org.eclipse.hyades.test.doc.user/concepts/crecordercontrolview.htm">Recorder Control View</a>.</li> > <li>Select <b>Test From Recording</b> and click <b>Next</b>.</li> > <li>Select <b>Create the test from an existing URL recording</b>.</li> > <li>Select the <b>URL Recorder</b> to record the new URL recording.</li> >#P org.eclipse.tptp.test.tools.junit.plugin.doc.user >Index: concepts/cworkbenchLocationEditor.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.tools.junit.plugin.doc.user/concepts/cworkbenchLocationEditor.htm,v >retrieving revision 1.6 >diff -u -r1.6 cworkbenchLocationEditor.htm >--- concepts/cworkbenchLocationEditor.htm 17 Jul 2008 19:07:15 -0000 1.6 >+++ concepts/cworkbenchLocationEditor.htm 2 Apr 2009 17:28:55 -0000 >@@ -2,7 +2,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2006, 2008 Scapa Technologies and others. >+ * Copyright (c) 2006, 2009 Scapa Technologies and others. > * All rights reserved. This content is made available under > * the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -27,11 +27,11 @@ > > <h1>Editing a workbench location</h1> > >-<p>Test workbench locations are edited using the Location editor. The editor contains three tabs:</p> >+<p>Test workbench locations are edited using the Location Editor. The editor contains three tabs:</p> > > <h2>Overview</h2> > >-<p>This tab provides an overview of the test workbench location.</p> >+<p>This tab provides an overview of the test workbench location, including its general information, property groups, Eclipse workbench properties, and general properties.</p> > > <p>This tab contains the following sections:</p> > >@@ -64,7 +64,7 @@ > </li> > </ul> > >-<p>[1] Test workbench locations have a file name and logical name. The logical name is used in the Test Navigator, dialogs, editors, and wizards to represent the test workbench location. >+<p>[1] Test workbench locations have a file name and logical name. The logical name is used in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, dialogs, editors, and wizards to represent the test workbench location. > The file name represents the test workbench location file (<i>*.location</i>) within the workspace. When the test workbench location is created, the logical name defaults to the file name > (excluding the <i>.location</i> file extension) and may be modified without modifying the file name. The logical name allows customization of the test workbench location name > without affecting the file name within the workspace.</p> >Index: concepts/cEditingJUnitPluginTests.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.tools.junit.plugin.doc.user/concepts/cEditingJUnitPluginTests.htm,v >retrieving revision 1.3 >diff -u -r1.3 cEditingJUnitPluginTests.htm >--- concepts/cEditingJUnitPluginTests.htm 17 Jul 2008 19:07:15 -0000 1.3 >+++ concepts/cEditingJUnitPluginTests.htm 2 Apr 2009 17:28:55 -0000 >@@ -2,7 +2,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2008 IBM Corporation. >+ * Copyright (c) 2008, 2009 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -38,7 +38,7 @@ > <br/> > </li> > <li> >- <a href="PLUGINS_ROOT/org.eclipse.hyades.test.doc.user/samples/saccessdp.htm">Tutorial: Accessing a datapool from a JUnit test</a> >+ <a href="PLUGINS_ROOT/org.eclipse.hyades.test.doc.user/samples/saccessdatapool.htm">Tutorial: Accessing a datapool from a JUnit test</a> > <br/> > </li> > </ul> >Index: toc/junit_plugin_test_toc.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.tools.junit.plugin.doc.user/toc/junit_plugin_test_toc.xml,v >retrieving revision 1.1 >diff -u -r1.1 junit_plugin_test_toc.xml >--- toc/junit_plugin_test_toc.xml 31 Mar 2009 13:33:14 -0000 1.1 >+++ toc/junit_plugin_test_toc.xml 2 Apr 2009 17:28:55 -0000 >@@ -22,7 +22,7 @@ > </topic> > <topic label="Editing JUnit Plug-in tests" href="concepts/cEditingJUnitPluginTests.htm"> > <topic label="JUnit Plug-in Test Suite Editor" href="concepts/cpluginTestEditor.htm"/> >- <topic label="Tutorial: Accessing a datapool from a JUnit test" href="PLUGINS_ROOT/org.eclipse.hyades.test.doc.user/samples/saccessdp.htm"/> >+ <link toc="PLUGINS_ROOT/org.eclipse.hyades.test.doc.user/toc/test_datapools_toc.xml"/> > </topic> > <topic label="Creating a workbench location" href="tasks/tcreateWorkbenchLocation.htm"> > <topic label="Editing a workbench location" href="concepts/cworkbenchLocationEditor.htm"/> >Index: tasks/tcreateWorkbenchLocation.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.tools.junit.plugin.doc.user/tasks/tcreateWorkbenchLocation.htm,v >retrieving revision 1.5 >diff -u -r1.5 tcreateWorkbenchLocation.htm >--- tasks/tcreateWorkbenchLocation.htm 31 Mar 2009 13:33:14 -0000 1.5 >+++ tasks/tcreateWorkbenchLocation.htm 2 Apr 2009 17:28:55 -0000 >@@ -30,10 +30,9 @@ > <p>Create a test workbench location:</p> > > <ol> >- <li>Right-click in the Test Navigator and select <b>New</b> > <b>Test Element...</b>.</li> >- <li>Select <b>Test Assets</b> > <b>Workbench Location</b> and click <b>Next</b>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>New</b> > <b>Test Element...</b> > <b>Test Assets</b> > <b>Workbench Location</b>, and click <b>Next</b>.</li> > <li>Select the parent folder and define the name of the test workbench location and click <b>Next</b>.</li> >- <li>Optionally, provide a description for the test workbench location and click <b>Next</b>.</li> >+ <li>Provide a description for the test workbench location and click <b>Next</b>.</li> > <li>Select the target workbench as either the local workbench, as defined in the <a href="PLUGINS_ROOT/org.eclipse.pde.doc.user/guide/tools/preference_pages/target_platform.htm">Target Platform</a>, > or another workbench. If another workbench is selected, enter the host name or IP address of the target host, Eclipse location (<i><Eclipse installation directory absolute path>/eclipse</i>), > workspace location (<i><Eclipse workspace directory absolute path>/eclipse</i>), operating system, windowing system, architecture, and locale for the host where the other workbench is installed. >#P org.eclipse.hyades.test.ui >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/InsertRowAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/InsertRowAction.java,v >retrieving revision 1.6 >diff -u -r1.6 InsertRowAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/InsertRowAction.java 21 Jan 2008 17:19:28 -0000 1.6 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/InsertRowAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,13 +13,19 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; > import org.eclipse.jface.viewers.ISelectionProvider; > import org.eclipse.ui.actions.SelectionProviderAction; > > /** >- * @author psun >+ * <p>Insert row action for the datapool table.</p> >+ * >+ * >+ * @author Peter Sun >+ * @author Paul E. Slauenwhite >+ * @version April 2, 2009 >+ * @since January 27, 2005 > */ > public class InsertRowAction extends SelectionProviderAction { > private DatapoolTable table; >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/DeleteColumnAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/DeleteColumnAction.java,v >retrieving revision 1.6 >diff -u -r1.6 DeleteColumnAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/DeleteColumnAction.java 21 Jan 2008 17:19:28 -0000 1.6 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/DeleteColumnAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,14 +13,19 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; > import org.eclipse.jface.viewers.ISelectionProvider; > import org.eclipse.ui.actions.SelectionProviderAction; > > /** >- * @author psun >- * >+ * <p>Delete column action for the datapool table.</p> >+ * >+ * >+ * @author Peter Sun >+ * @author Paul E. Slauenwhite >+ * @version April 2, 2009 >+ * @since January 27, 2005 > */ > public class DeleteColumnAction extends SelectionProviderAction { > private DatapoolTable table; >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/CutAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/CutAction.java,v >retrieving revision 1.9 >diff -u -r1.9 CutAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/CutAction.java 7 Aug 2008 01:01:37 -0000 1.9 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/CutAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,7 +13,7 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.editor.DatapoolEditorPart; > import org.eclipse.hyades.test.ui.internal.editor.extension.DatapoolEditorExtension; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; >@@ -22,14 +22,13 @@ > import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds; > > /** >- * Cut action for the datapool table. >- * <p/> >+ * <p>Cut action for the datapool table.</p> > * > * > * @author Peter Sun > * @author Patrick Nedelec > * @author Paul E. Slauenwhite >- * @version August 6, 2008 >+ * @version April 2, 2009 > * @since January 27, 2005 > */ > public class CutAction extends org.eclipse.hyades.ui.internal.editor.action.CutAction { >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/PasteAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/PasteAction.java,v >retrieving revision 1.9 >diff -u -r1.9 PasteAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/PasteAction.java 7 Aug 2008 01:01:37 -0000 1.9 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/PasteAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,7 +13,7 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.editor.DatapoolEditorPart; > import org.eclipse.hyades.test.ui.internal.editor.extension.DatapoolEditorExtension; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; >@@ -29,7 +29,7 @@ > * @author Peter Sun > * @author Patrick Nedelec > * @author Paul E. Slauenwhite >- * @version August 6, 2008 >+ * @version April 2, 2009 > * @since January 27, 2005 > */ > public class PasteAction extends org.eclipse.hyades.ui.internal.editor.action.PasteAction { >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/CopyAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/CopyAction.java,v >retrieving revision 1.10 >diff -u -r1.10 CopyAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/CopyAction.java 7 Aug 2008 01:01:37 -0000 1.10 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/CopyAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,7 +13,7 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.editor.DatapoolEditorPart; > import org.eclipse.hyades.test.ui.internal.editor.extension.DatapoolEditorExtension; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; >@@ -22,14 +22,13 @@ > import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds; > > /** >- * Copy action for the datapool table. >- * <p/> >+ * <p>Copy action for the datapool table.</p> > * > * > * @author Peter Sun > * @author Patrick Nedelec > * @author Paul E. Slauenwhite >- * @version August 6, 2008 >+ * @version April 2, 2009 > * @since January 27, 2005 > */ > public class CopyAction extends org.eclipse.hyades.ui.internal.editor.action.CopyAction { >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/InsertColumnAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/InsertColumnAction.java,v >retrieving revision 1.6 >diff -u -r1.6 InsertColumnAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/InsertColumnAction.java 21 Jan 2008 17:19:28 -0000 1.6 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/InsertColumnAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,14 +13,19 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; > import org.eclipse.jface.viewers.ISelectionProvider; > import org.eclipse.ui.actions.SelectionProviderAction; > > /** >- * @author psun >- * >+ * <p>Insert column action for the datapool table.</p> >+ * >+ * >+ * @author Peter Sun >+ * @author Paul E. Slauenwhite >+ * @version April 2, 2009 >+ * @since January 27, 2005 > */ > public class InsertColumnAction extends SelectionProviderAction { > private DatapoolTable table; >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/DeleteRowAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/DeleteRowAction.java,v >retrieving revision 1.6 >diff -u -r1.6 DeleteRowAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/DeleteRowAction.java 21 Jan 2008 17:19:28 -0000 1.6 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/DeleteRowAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,14 +13,19 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; > import org.eclipse.jface.viewers.ISelectionProvider; > import org.eclipse.ui.actions.SelectionProviderAction; > > /** >- * @author psun >- * >+ * <p>Delete row action for the datapool table.</p> >+ * >+ * >+ * @author Peter Sun >+ * @author Paul E. Slauenwhite >+ * @version April 2, 2009 >+ * @since January 27, 2005 > */ > public class DeleteRowAction extends SelectionProviderAction { > private DatapoolTable table; >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/EditColumnAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/EditColumnAction.java,v >retrieving revision 1.6 >diff -u -r1.6 EditColumnAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/EditColumnAction.java 21 Jan 2008 17:19:28 -0000 1.6 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/EditColumnAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,14 +13,19 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; > import org.eclipse.jface.viewers.ISelectionProvider; > import org.eclipse.ui.actions.SelectionProviderAction; > > /** >- * @author psun >- * >+ * <p>Edit column action for the datapool table.</p> >+ * >+ * >+ * @author Peter Sun >+ * @author Paul E. Slauenwhite >+ * @version April 2, 2009 >+ * @since January 27, 2005 > */ > public class EditColumnAction extends SelectionProviderAction { > private DatapoolTable table; >Index: src/org/eclipse/hyades/test/ui/datapool/internal/action/EditRowAction.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/action/EditRowAction.java,v >retrieving revision 1.6 >diff -u -r1.6 EditRowAction.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/action/EditRowAction.java 21 Jan 2008 17:19:28 -0000 1.6 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/action/EditRowAction.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -13,14 +13,19 @@ > > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.control.DatapoolTable; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; > import org.eclipse.jface.viewers.ISelectionProvider; > import org.eclipse.ui.actions.SelectionProviderAction; > > /** >- * @author psun >- * >+ * <p>Edit row action for the datapool table.</p> >+ * >+ * >+ * @author Peter Sun >+ * @author Paul E. Slauenwhite >+ * @version April 2, 2009 >+ * @since January 27, 2005 > */ > public class EditRowAction extends SelectionProviderAction { > private DatapoolTable table; >Index: src/org/eclipse/hyades/test/ui/internal/util/ContextIds.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/util/ContextIds.java,v >retrieving revision 1.5 >diff -u -r1.5 ContextIds.java >--- src/org/eclipse/hyades/test/ui/internal/util/ContextIds.java 31 Mar 2009 13:33:03 -0000 1.5 >+++ src/org/eclipse/hyades/test/ui/internal/util/ContextIds.java 2 Apr 2009 17:28:56 -0000 >@@ -16,12 +16,12 @@ > * > * > * @author Paul E. Slauenwhite >- * @version March 31, 2009 >+ * @version April 2, 2009 > * @since February 1, 2005 > */ > public class ContextIds { > >- //Create New Test From Recording wizard: >+ //New Test From Recording wizard: > public static final String NEW_TEST_FROM_RECORDING_WIZARD = ".recw0001"; //$NON-NLS-1$ > > //Recorder Control view: >@@ -144,31 +144,58 @@ > public static final String EXEC_EDIT_OVERVIEW = ".exed0001"; //$NON-NLS-1$ > public static final String EXEC_EDIT_EVENTS = ".exed0002"; //$NON-NLS-1$ > >- // Added to support datapool editing (PBS 12/06/03) >- // datapool editor >+ //Dtapools: >+ >+ //Datapool Editor: >+ public static final String DATA_BASE_DIALOG = ".dpld0001"; //$NON-NLS-1$ >+ >+ //New Datapool wizard: >+ public static final String NEW_DATAPOOL_WIZARD = ".dplw0001"; //$NON-NLS-1$ >+ >+ //Import CSV File as Datapool wizard: >+ public static final String IMPORT_CSV_FILE_AS_DATAPOOL_WIZARD = ".dplw0002"; //$NON-NLS-1$ >+ >+ //Export Datapool as CSV File wizard: >+ public static final String EXPORT_DATAPOOL_AS_CSV_FILE_WIZARD = ".dplw0003"; //$NON-NLS-1$ >+ > public static final String DATA_FORM = ".datf0001"; //$NON-NLS-1$ > public static final String DATA_TEXT_FORM = ".datf0002"; //$NON-NLS-1$ > public static final String DATA_NAME_FORM = ".datf0003"; //$NON-NLS-1$ >- > public static final String DATA_TABLE_FORM = ".datbf0001"; //$NON-NLS-1$ >- >- // insert column action >+ >+ //Insert column action: > public static final String INS_COL_ACT = ".ica0001"; //$NON-NLS-1$ >- // delete column action >- public static final String DEL_COL_ACT = ".dca0001"; //$NON-NLS-1$ >- // edit column action >+ >+ //Edit column action: > public static final String EDIT_COL_ACT = ".eca0001"; //$NON-NLS-1$ >- // insert row action >+ >+ //Delete column action: >+ public static final String DEL_COL_ACT = ".dca0001"; //$NON-NLS-1$ >+ >+ //Insert row action: > public static final String INS_ROW_ACT = ".ira0001"; //$NON-NLS-1$ >- // delete row action >- public static final String DEL_ROW_ACT = ".dra0001"; //$NON-NLS-1$ >- // edit row action >+ >+ //Edit row action: > public static final String EDIT_ROW_ACT = ".era0001"; //$NON-NLS-1$ >- // insert row group action >+ >+ //Delete row action: >+ public static final String DEL_ROW_ACT = ".dra0001"; //$NON-NLS-1$ >+ >+ //Insert row group action: > public static final String INS_ROW_GRP_ACT = ".irga0001"; //$NON-NLS-1$ >- // delete row group action >- public static final String DEL_ROW_GRP_ACT = ".drga0001"; //$NON-NLS-1$ >- // edit row group action >+ >+ //Edit row group action: > public static final String EDIT_ROW_GRP_ACT = ".erga0001"; //$NON-NLS-1$ >- >+ >+ //Delete row group action: >+ public static final String DEL_ROW_GRP_ACT = ".drga0001"; //$NON-NLS-1$ >+ >+ //Copy action: >+ public static final String COPY_ACT = ".cpya0001"; //$NON-NLS-1$ >+ >+ //Cut action: >+ public static final String CUT_ACT = ".cuta0001"; //$NON-NLS-1$ >+ >+ //Paste action: >+ public static final String PASTE_ACT = ".psta0001"; //$NON-NLS-1$ > } >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportWizard.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportWizard.java,v >retrieving revision 1.24 >diff -u -r1.24 DatapoolImportWizard.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportWizard.java 1 Apr 2009 13:36:47 -0000 1.24 >+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportWizard.java 2 Apr 2009 17:28:56 -0000 >@@ -28,15 +28,19 @@ > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.util.TestUIUtilities; > import org.eclipse.jface.dialogs.ErrorDialog; > import org.eclipse.jface.operation.IRunnableWithProgress; > import org.eclipse.jface.viewers.IStructuredSelection; > import org.eclipse.jface.wizard.Wizard; >+import org.eclipse.swt.widgets.Composite; > import org.eclipse.tptp.platform.common.ui.wizard.LocationPage; > import org.eclipse.ui.IImportWizard; > import org.eclipse.ui.IWorkbench; >+import org.eclipse.ui.PlatformUI; > import org.eclipse.ui.actions.WorkspaceModifyOperation; >+import org.eclipse.ui.help.IWorkbenchHelpSystem; > > /** > * <p>Datapool import wizard to import data from a CSV file to an >@@ -45,7 +49,7 @@ > * > * @author Bianca Xue Jiang > * @author Paul E. Slauenwhite >- * @version April 1, 2009 >+ * @version April 2, 2009 > * @since March 18, 2005 > */ > public class DatapoolImportWizard extends Wizard implements IImportWizard { >@@ -105,6 +109,20 @@ > } > > /* (non-Javadoc) >+ * @see org.eclipse.jface.wizard.Wizard#createPageControls(org.eclipse.swt.widgets.Composite) >+ */ >+ public void createPageControls(Composite parent){ >+ >+ super.createPageControls(parent); >+ >+ //Set the context sensitive help: >+ IWorkbenchHelpSystem workbenchHelpSystem = PlatformUI.getWorkbench().getHelpSystem(); >+ workbenchHelpSystem.setHelp(datapoolImportPageOne.getControl(), (UiPlugin.getID() + ContextIds.IMPORT_CSV_FILE_AS_DATAPOOL_WIZARD)); >+ workbenchHelpSystem.setHelp(datapoolImportPageTwo.getControl(), (UiPlugin.getID() + ContextIds.IMPORT_CSV_FILE_AS_DATAPOOL_WIZARD)); >+ workbenchHelpSystem.setHelp(locationPage.getControl(), (UiPlugin.getID() + ContextIds.IMPORT_CSV_FILE_AS_DATAPOOL_WIZARD)); >+ } >+ >+ /* (non-Javadoc) > * @see org.eclipse.jface.wizard.IWizard#performFinish() > */ > public boolean performFinish() { >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolAttributeWizardPage.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolAttributeWizardPage.java,v >retrieving revision 1.6 >diff -u -r1.6 DatapoolAttributeWizardPage.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolAttributeWizardPage.java 1 Apr 2009 14:46:46 -0000 1.6 >+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolAttributeWizardPage.java 2 Apr 2009 17:28:56 -0000 >@@ -36,7 +36,7 @@ > * > * @author Bianca Xue Jiang > * @author Paul Slauenwhite >- * @version April 1, 2009 >+ * @version April 2, 2009 > * @since March 3, 2005 > */ > public class DatapoolAttributeWizardPage extends AttributeWizardPage { >@@ -122,7 +122,13 @@ > > csvFileSelectionComposite.setVisible(isVisible); > >- if(!isVisible){ >+ if(isVisible){ >+ csvFileSelectionComposite.getCSVFileText().setFocus(); >+ } >+ else{ >+ >+ itemDescriptionText.setFocus(); >+ > csvFileSelectionComposite.init(); > } > >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportSelectionPage.java >=================================================================== >RCS file: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportSelectionPage.java >diff -N src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportSelectionPage.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportSelectionPage.java 4 Nov 2008 14:20:23 -0000 1.8 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,237 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2005, 2008 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 >- * $Id: DatapoolExportSelectionPage.java,v 1.8 2008/11/04 14:20:23 paules Exp $ >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.hyades.test.ui.internal.wizard; >- >-import org.eclipse.core.resources.IResource; >-import org.eclipse.core.resources.ResourcesPlugin; >-import org.eclipse.hyades.edit.datapool.IDatapool; >-import org.eclipse.hyades.models.common.datapool.util.DatapoolEncryptManager; >-import org.eclipse.hyades.models.common.util.ICommonConstants; >-import org.eclipse.hyades.test.ui.datapool.internal.util.GridDataUtil; >-import org.eclipse.hyades.test.ui.dialog.EObjectResourceContentProvider; >-import org.eclipse.hyades.test.ui.dialog.EObjectResourceLabelProvider; >-import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.IStructuredSelection; >-import org.eclipse.jface.viewers.StructuredViewer; >-import org.eclipse.jface.viewers.TreeViewer; >-import org.eclipse.jface.viewers.Viewer; >-import org.eclipse.jface.viewers.ViewerSorter; >-import org.eclipse.jface.wizard.WizardPage; >-import org.eclipse.osgi.util.NLS; >-import org.eclipse.swt.SWT; >-import org.eclipse.swt.events.ModifyEvent; >-import org.eclipse.swt.events.ModifyListener; >-import org.eclipse.swt.events.SelectionEvent; >-import org.eclipse.swt.events.SelectionListener; >-import org.eclipse.swt.graphics.Image; >-import org.eclipse.swt.layout.FormAttachment; >-import org.eclipse.swt.layout.FormData; >-import org.eclipse.swt.layout.FormLayout; >-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.Text; >-import org.eclipse.swt.widgets.Tree; >- >-/** >- * Datapool export selection page. >- * >- * >- * @author Peter Sun >- * @author Paul E. Slauenwhite >- * @version October 31, 2008 >- * @since February 1, 2005 >- * @deprecated As of TPTP V4.5.2, use {@link DatapoolSelectionPage}. >- */ >-public class DatapoolExportSelectionPage extends WizardPage implements SelectionListener { >- >- IDatapool datapool = null; >- private TreeViewer assetViewer; >- Button filterButton = null; >- private EObjectResourceContentProvider contentProvider; >- private String[] fileExtensions; >- private Image fileImage; >- private Group group; >- private Text textArea; >- private FormData formData; >- private boolean isEncrypted = false; >- >- /** >- * @param pageName >- */ >- protected DatapoolExportSelectionPage(String pageName) >- { >- super(pageName); >- fileExtensions = getSupportedFileExtensions(); >- setPageComplete(false); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) >- */ >- public void createControl(Composite parent) >- { >- Composite composite = new Composite(parent, SWT.NONE); >- GridLayout layout = new GridLayout(); >- composite.setLayout(layout); >- GridData gridData = GridDataUtil.createFill(); >- composite.setLayoutData(gridData); >- >- filterButton = new Button(composite, SWT.CHECK); >- filterButton.setText(UiPluginResourceBundle.SHOW_FOLDERS); >- filterButton.addSelectionListener(this); >- createViewer(composite); >- assetViewer.setInput(ResourcesPlugin.getWorkspace().getRoot()); >- ((Tree)assetViewer.getControl()).addSelectionListener(this); >- ((TreeViewer)assetViewer).expandToLevel(2); >- setControl(composite); >- >- } >- >- public IDatapool getDatapool() >- { >- return datapool; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) >- */ >- public void widgetSelected(SelectionEvent e) >- { >- if(e.widget == filterButton) >- { >- contentProvider.setFilter((filterButton.getSelection() ? EObjectResourceContentProvider.SHOW_ALL : EObjectResourceContentProvider.FILTER_FOLDERS)); >- ISelection selection = assetViewer.getSelection(); >- assetViewer.refresh(); >- if(!selection.isEmpty()) >- assetViewer.setSelection(selection, true); >- } >- >- if(e.widget == assetViewer.getControl()) >- { >- setSelection(); >- } >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) >- */ >- public void widgetDefaultSelected(SelectionEvent e) >- { >- >- } >- >- protected StructuredViewer createViewer(Composite parent) >- { >- Tree tree = new Tree(parent, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER); >- GridData gridData = GridDataUtil.createFill(); >- gridData.heightHint = 150; >- tree.setLayoutData(gridData); >- >- contentProvider = new EObjectResourceContentProvider(fileExtensions); >- assetViewer = new TreeViewer(tree); >- assetViewer.setContentProvider(contentProvider); >- assetViewer.setLabelProvider(new EObjectResourceLabelProvider(true, fileImage)); >- >- contentProvider.setFilter(EObjectResourceContentProvider.FILTER_FOLDERS); >- >- ViewerSorter sorter = new ViewerSorter() >- { >- public void sort(Viewer viewer, Object[] elements) >- { >- if(elements.length > 0) >- super.sort(viewer, elements); >- } >- >- public int category(Object element) >- { >- if(element instanceof IResource) >- return 0; >- >- return 10; >- } >- }; >- assetViewer.setSorter(sorter); >- >- group = new Group(parent,SWT.NULL); >- group.setText(UiPluginResourceBundle.DatapoolExportWizard_password); >- group.setLayoutData(GridDataUtil.createHorizontalFill()); >- group.setLayout(new FormLayout()); >- group.setVisible(false); >- textArea = new Text(group, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER | SWT.PASSWORD); >- formData = new FormData(); >- formData.left = new FormAttachment(0,5); >- formData.top = new FormAttachment(0,5); >- formData.bottom = new FormAttachment(80,-5); >- formData.width = 200; >- textArea.setLayoutData(formData); >- textArea.addModifyListener(new ModifyListener(){ >- public void modifyText(ModifyEvent e){ >- if(textArea.getText().length()>0){ >- setPageComplete(true); >- } >- } >- }); >- return assetViewer; >- } >- >- public Text getTextArea(){ >- return textArea; >- } >- >- public boolean isEncrypted(){ >- return isEncrypted; >- } >- >- private void setSelection() >- { >- ISelection selection = assetViewer.getSelection(); >- if(selection != null && !selection.isEmpty()) >- { >- Object selectedObject = ((IStructuredSelection)selection).getFirstElement(); >- if(selectedObject instanceof IDatapool) >- { >- datapool = (IDatapool)selectedObject; >- if(datapool != null) >- { >- if(DatapoolEncryptManager.isDatapoolEncrypted(datapool)){ >- isEncrypted = true; >- setMessage(NLS.bind(UiPluginResourceBundle.DatapoolExportWizard_encrypted,datapool.getName()), ERROR); >- group.setVisible(true); >- group.setText(NLS.bind(UiPluginResourceBundle.DatapoolExportWizard_password , datapool.getName()+ ".datapool")); >- textArea.setFocus(); >- >- setPageComplete(false); >- }else{ >- isEncrypted = false; >- setMessage(null); >- group.setVisible(false); >- textArea.setText(""); >- >- setPageComplete(true); >- getContainer().updateButtons(); >- } >- } >- } >- } >- } >- >- private String[] getSupportedFileExtensions() >- { >- return new String[]{ICommonConstants.DATAPOOL_FILE_EXTENSION}; >- } >- >- >-} >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageTwo.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageTwo.java,v >retrieving revision 1.5 >diff -u -r1.5 DatapoolImportPageTwo.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageTwo.java 1 Apr 2009 13:36:47 -0000 1.5 >+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageTwo.java 2 Apr 2009 17:28:56 -0000 >@@ -33,7 +33,7 @@ > * > * > * @author Paul E. Slauenwhite >- * @version April 1, 2009 >+ * @version April 2, 2009 > * @since October 31, 2008 > */ > public class DatapoolImportPageTwo extends DatapoolSelectionPage { >@@ -45,6 +45,30 @@ > } > > /* (non-Javadoc) >+ * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) >+ */ >+ public void setVisible(boolean visible) { >+ >+ super.setVisible(visible); >+ >+ if (visible){ >+ >+ if(getSelectedDatapool() != null){ >+ >+ if(isSelectedDatapoolEncrypted()){ >+ encryptedDatapoolPasswordText.setFocus(); >+ } >+ else{ >+ datapoolSelectionViewer.getViewer().getTree().setFocus(); >+ } >+ } >+ else { >+ useExistingDatapoolButton.setFocus(); >+ } >+ } >+ } >+ >+ /* (non-Javadoc) > * @see org.eclipse.hyades.test.ui.internal.wizard.DatapoolSelectionPage#createControl(org.eclipse.swt.widgets.Composite) > */ > public void createControl(Composite parent) { >@@ -65,7 +89,19 @@ > > public void widgetSelected(SelectionEvent e) { > >- TestUIUtilities.setEnabled(exisitingDatapoolGroup, useExistingDatapoolButton.getSelection()); >+ boolean isEnabled = useExistingDatapoolButton.getSelection(); >+ >+ TestUIUtilities.setEnabled(exisitingDatapoolGroup, isEnabled); >+ >+ if((isEnabled) && (getSelectedDatapool() != null)){ >+ >+ if(isSelectedDatapoolEncrypted()){ >+ encryptedDatapoolPasswordText.setFocus(); >+ } >+ else{ >+ datapoolSelectionViewer.getViewer().getTree().setFocus(); >+ } >+ } > > setPageComplete(validatePage()); > } >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportCSVFileLocationPage.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportCSVFileLocationPage.java,v >retrieving revision 1.8 >diff -u -r1.8 DatapoolExportCSVFileLocationPage.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportCSVFileLocationPage.java 4 Mar 2008 19:21:36 -0000 1.8 >+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportCSVFileLocationPage.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -35,13 +35,13 @@ > import org.eclipse.swt.widgets.Text; > > /** >- * This wizard page is the first page used in the Export Datapool wizard. >- * It allows the user to select a csv file and different export options. >+ * <p>This wizard page is the first page used in the Export Datapool wizard. >+ * It allows the user to select a CSV file and different export options.</p> > * > * > * @author Peter Sun > * @author Paul E. Slauenwhite >- * @version March 4, 2008 >+ * @version April 2, 2009 > * @since February 1, 2005 > */ > public class DatapoolExportCSVFileLocationPage extends WizardPage implements ModifyListener, SelectionListener { >@@ -81,6 +81,18 @@ > setPageComplete(false); > } > >+ /* (non-Javadoc) >+ * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) >+ */ >+ public void setVisible(boolean visible) { >+ >+ super.setVisible(visible); >+ >+ if (visible) { >+ csvFileText.setFocus(); >+ } >+ } >+ > /** > * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) > */ >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageOne.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageOne.java,v >retrieving revision 1.2 >diff -u -r1.2 DatapoolImportPageOne.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageOne.java 1 Apr 2009 14:46:46 -0000 1.2 >+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolImportPageOne.java 2 Apr 2009 17:28:56 -0000 >@@ -30,8 +30,8 @@ > * > * > * @author Paul E. Slauenwhite >- * @version April 1, 2009 >- * @since April 1, 2009 >+ * @version April 2, 2009 >+ * @since April 2, 2009 > */ > public class DatapoolImportPageOne extends WizardPage { > >@@ -41,6 +41,18 @@ > super(pageName); > } > >+ /* (non-Javadoc) >+ * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) >+ */ >+ public void setVisible(boolean visible) { >+ >+ super.setVisible(visible); >+ >+ if (visible) { >+ csvFileSelectionComposite.getCSVFileText().setFocus(); >+ } >+ } >+ > /* (non-Javadoc) > * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) > */ >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportWizard.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportWizard.java,v >retrieving revision 1.16 >diff -u -r1.16 DatapoolExportWizard.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportWizard.java 1 Apr 2009 13:36:47 -0000 1.16 >+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolExportWizard.java 2 Apr 2009 17:28:56 -0000 >@@ -28,6 +28,7 @@ > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.util.TestUIUtil; > import org.eclipse.jface.dialogs.ErrorDialog; > import org.eclipse.jface.dialogs.IDialogConstants; >@@ -39,6 +40,8 @@ > import org.eclipse.swt.widgets.Display; > import org.eclipse.ui.IExportWizard; > import org.eclipse.ui.IWorkbench; >+import org.eclipse.ui.PlatformUI; >+import org.eclipse.ui.help.IWorkbenchHelpSystem; > > /** > * <p>DatapoolExportWizard.java</p> >@@ -46,13 +49,14 @@ > > * @author Peter Sun > * @author Paul E. Slauenwhite >- * @version April 1, 2009 >+ * @version April 2, 2009 > * @since February 1, 2005 > */ > public class DatapoolExportWizard extends Wizard implements IExportWizard { > > private DatapoolSelectionPage datapoolSelectionPage = null; > private DatapoolExportCSVFileLocationPage csvFileLocationPage = null; >+ private IStructuredSelection selection = null; > > public DatapoolExportWizard() > { >@@ -66,22 +70,19 @@ > public void init(IWorkbench workbench, IStructuredSelection selection) > { > setWindowTitle(UiPluginResourceBundle.WIZ_EXP_DATAPOOL_TTL); >+ this.selection = selection; > } > > /** > * @see org.eclipse.jface.wizard.IWizard#createPageControls(Composite) > */ >- public void createPageControls(Composite pageContainer) >- { >- super.createPageControls(pageContainer); >- } > > /* (non-Javadoc) > * @see org.eclipse.jface.wizard.Wizard#addPages() > */ > public void addPages(){ > >- datapoolSelectionPage = new DatapoolSelectionPage("datapoolSelection"); >+ datapoolSelectionPage = new DatapoolSelectionPage("datapoolSelection", selection); > datapoolSelectionPage.setTitle(UiPluginResourceBundle.WIZ_EXP_DATAPOOL_TTL); > datapoolSelectionPage.setDescription(UiPluginResourceBundle.WIZ_EXP_DATAPOOL_SEL_PG_DSC); > addPage(datapoolSelectionPage); >@@ -92,6 +93,19 @@ > addPage(csvFileLocationPage); > } > >+ /* (non-Javadoc) >+ * @see org.eclipse.jface.wizard.Wizard#createPageControls(org.eclipse.swt.widgets.Composite) >+ */ >+ public void createPageControls(Composite parent){ >+ >+ super.createPageControls(parent); >+ >+ //Set the context sensitive help: >+ IWorkbenchHelpSystem workbenchHelpSystem = PlatformUI.getWorkbench().getHelpSystem(); >+ workbenchHelpSystem.setHelp(datapoolSelectionPage.getControl(), (UiPlugin.getID() + ContextIds.EXPORT_DATAPOOL_AS_CSV_FILE_WIZARD)); >+ workbenchHelpSystem.setHelp(csvFileLocationPage.getControl(), (UiPlugin.getID() + ContextIds.EXPORT_DATAPOOL_AS_CSV_FILE_WIZARD)); >+ } >+ > public boolean canFinish() > { > return csvFileLocationPage.isPageComplete() && datapoolSelectionPage.isPageComplete(); >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java,v >retrieving revision 1.16 >diff -u -r1.16 DatapoolNewWizard.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java 1 Apr 2009 13:36:47 -0000 1.16 >+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java 2 Apr 2009 17:28:57 -0000 >@@ -28,13 +28,17 @@ > import org.eclipse.hyades.test.ui.UiPlugin; > import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil; > import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.hyades.test.ui.internal.util.TestUIUtilities; > import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard; > import org.eclipse.jface.dialogs.ErrorDialog; > import org.eclipse.jface.dialogs.IDialogSettings; > import org.eclipse.jface.dialogs.MessageDialog; > import org.eclipse.jface.window.Window; >+import org.eclipse.swt.widgets.Composite; > import org.eclipse.ui.PartInitException; >+import org.eclipse.ui.PlatformUI; >+import org.eclipse.ui.help.IWorkbenchHelpSystem; > > /** > * <p>Extends the HyadesNewWizard to create the Hyades Generic DataPool.</p> >@@ -44,7 +48,7 @@ > * @author Bianca Xue Jiang > * @author Tony Wang > * @author Paul E. Slauenwhite >- * @version April 1, 2009 >+ * @version April 2, 2009 > * @since February 1, 2005 > */ > public class DatapoolNewWizard extends HyadesNewWizard { >@@ -104,6 +108,19 @@ > addPage(getAttributeWizardPage()); > } > >+ /* (non-Javadoc) >+ * @see org.eclipse.hyades.ui.internal.wizard.HyadesWizard#createPageControls(org.eclipse.swt.widgets.Composite) >+ */ >+ public void createPageControls(Composite parent){ >+ >+ super.createPageControls(parent); >+ >+ //Set the context sensitive help: >+ IWorkbenchHelpSystem workbenchHelpSystem = PlatformUI.getWorkbench().getHelpSystem(); >+ workbenchHelpSystem.setHelp(getLocationPage().getControl(), (UiPlugin.getID() + ContextIds.NEW_DATAPOOL_WIZARD)); >+ workbenchHelpSystem.setHelp(getAttributeWizardPage().getControl(), (UiPlugin.getID() + ContextIds.NEW_DATAPOOL_WIZARD)); >+ } >+ > /** > * @see org.eclipse.hyades.ui.test.internal.wizard.HyadesNewWizard#createObject(org.eclipse.core.resources.IFile) > */ >Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolSelectionPage.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolSelectionPage.java,v >retrieving revision 1.3 >diff -u -r1.3 DatapoolSelectionPage.java >--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolSelectionPage.java 1 Apr 2009 13:36:47 -0000 1.3 >+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolSelectionPage.java 2 Apr 2009 17:28:57 -0000 >@@ -38,15 +38,15 @@ > * > * > * @author Paul E. Slauenwhite >- * @version April 1, 2009 >+ * @version April 2, 2009 > * @since October 31, 2008 > */ > public class DatapoolSelectionPage extends WizardPage { > >- private ProxyNodeSelectionViewer datapoolSelectionViewer = null; >- private Group encryptedDatapoolPasswordGroup = null; >- private Text encryptedDatapoolPasswordText = null; >- private IStructuredSelection selection = null; >+ protected ProxyNodeSelectionViewer datapoolSelectionViewer = null; >+ protected Group encryptedDatapoolPasswordGroup = null; >+ protected Text encryptedDatapoolPasswordText = null; >+ protected IStructuredSelection selection = null; > private IDatapool selectedDatapool = null; > private boolean isSelectedDatapoolEncrypted = false; > >@@ -61,6 +61,30 @@ > this.selection = selection; > } > >+ /* (non-Javadoc) >+ * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) >+ */ >+ public void setVisible(boolean visible) { >+ >+ super.setVisible(visible); >+ >+ if (visible){ >+ >+ if(getSelectedDatapool() != null){ >+ >+ if(isSelectedDatapoolEncrypted()){ >+ encryptedDatapoolPasswordText.setFocus(); >+ } >+ else{ >+ datapoolSelectionViewer.getViewer().getTree().setFocus(); >+ } >+ } >+ else { >+ datapoolSelectionViewer.getFilterButton().setFocus(); >+ } >+ } >+ } >+ > /* (non-Javadoc) > * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) > */ >@@ -134,8 +158,6 @@ > //Force the validation of the selection: > datapoolSelectionViewer.setSelection(); > >- setPageComplete(false); >- > pane.layout(false, true); > > setControl(pane); >Index: src/org/eclipse/hyades/test/ui/internal/resources/messages.properties >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/resources/messages.properties,v >retrieving revision 1.47 >diff -u -r1.47 messages.properties >--- src/org/eclipse/hyades/test/ui/internal/resources/messages.properties 1 Apr 2009 13:36:47 -0000 1.47 >+++ src/org/eclipse/hyades/test/ui/internal/resources/messages.properties 2 Apr 2009 17:28:56 -0000 >@@ -310,7 +310,7 @@ > # Test Suite -> Test and Execution History -> Test Log > > # Words >-W_TST_SUITE = Test >+W_TST_SUITE = Tests > > W_DETAIL = Detail > W_EXECUTION = Execution >@@ -391,8 +391,8 @@ > > WIZ_DATAPOOL_CSV_PG_SEL = C&SV File: > WIZ_DATAPOOL_CSV_PG_ENC = &Encoding: >-WIZ_DATAPOOL_CSV_PG_COL_HEADER = First r&ow contains variable names and optional suggested types. >-WIZ_DATAPOOL_CSV_PG_ROW_HEADER = First &column contains equivalence class names and optional row numbers. >+WIZ_DATAPOOL_CSV_PG_COL_HEADER = First r&ow of the CSV file contains the variable names and optional suggested types. >+WIZ_DATAPOOL_CSV_PG_ROW_HEADER = First &column of the CSV file contains the equivalence class names and optional record numbers. > > WIZ_DATAPOOL_CSV_FILE_OPEN = Select a CSV File: > >@@ -407,9 +407,9 @@ > WIZ_EXP_DATAPOOL_TTL = Export Datapool as CSV File > WIZ_EXP_DATAPOOL_SEL_PG_DSC = Select the datapool to export to the CSV file. > WIZ_EXP_DATAPOOL_CSV_PG_DSC = Select the location and options of the exported CSV file. >-WIZ_EXP_DATAPOOL_CSV_PG_VAR = E&xport variable names and suggested types in the first row. >-WIZ_EXP_DATAPOOL_CSV_PG_EC = Ex&port equivalence class names and row numbers in the first column. >-WIZ_EXP_DATAPOOL_CSV_PG_TAG = Enc&lose cell values in tags. >+WIZ_EXP_DATAPOOL_CSV_PG_VAR = E&xport the variable names and suggested types to the first row of the CSV file. >+WIZ_EXP_DATAPOOL_CSV_PG_EC = Ex&port the equivalence class names and record numbers to the first column of the CSV file. >+WIZ_EXP_DATAPOOL_CSV_PG_TAG = Enc&lose cell values in XML tags. > > WIZ_EXP_DATAPOOL_MSG_EXISTS = {0} already exists.\nDo you want to replace it? > >@@ -604,7 +604,7 @@ > ENV_DESCRIPTION = Description > ADD_ENV_DESC_DLG = Add Environment Setting > EDIT_ENV_DESC_DLG = Edit Environment Setting >-SHOW_FOLDERS = &Show Folders >+SHOW_FOLDERS = &Show folders > > #Test preference page > DEFAULT_HOST_NAME = Default &host name or IP address: >Index: infopop/recorderUI.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/infopop/recorderUI.xml,v >retrieving revision 1.5 >diff -u -r1.5 recorderUI.xml >--- infopop/recorderUI.xml 31 Mar 2009 13:33:03 -0000 1.5 >+++ infopop/recorderUI.xml 2 Apr 2009 17:28:56 -0000 >@@ -11,7 +11,7 @@ > <?NLS TYPE="org.eclipse.help.contexts"?> > <contexts> > >-<!-- Create New Test From Recording wizard: --> >+<!-- New Test From Recording wizard: --> > <context id="recw0001"> > <description>Create a new test from a new or existing recording of user interactions with an application.</description> > <topic href="../org.eclipse.hyades.test.doc.user/tasks/tcreatetestfromrecording.htm" label="Creating a test from a recording"/> >@@ -19,7 +19,7 @@ > > <!-- Recorder Control view: --> > <context id="recv0001"> >-<description>View to control and monitor recorders.</description> >+<description>Control and monitor recorders.</description> > <topic href="../org.eclipse.hyades.test.doc.user/concepts/crecordercontrolview.htm" label="Recorder Control View"/> > </context> > >Index: infopop/testDatapool.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/infopop/testDatapool.xml,v >retrieving revision 1.4 >diff -u -r1.4 testDatapool.xml >--- infopop/testDatapool.xml 21 Nov 2008 18:44:36 -0000 1.4 >+++ infopop/testDatapool.xml 2 Apr 2009 17:28:56 -0000 >@@ -1,6 +1,6 @@ > <?xml version="1.0" encoding="UTF-8"?> > <!-- >-Copyright (c) 2005, 2008 IBM Corporation and others. >+Copyright (c) 2005, 2009 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 >@@ -11,25 +11,28 @@ > <?NLS TYPE="org.eclipse.help.contexts"?> > <contexts> > >-<context id="dplo0001"> >-<!--Datapool Definition Description--> >-<description>An overview of the datapool.</description> >-<topic href="../org.eclipse.hyades.test.doc.user/tasks/teditdp.htm" label="Editing a datapool"/> >-<topic href="../org.eclipse.hyades.test.doc.user/tasks/taccessdp.htm" label="Accessing a datapool from a Hyades Test"/> >+<!-- Datapool Editor: --> >+<context id="dpld0001"> >+<description>Edit the structure of datapools.</description> >+<topic href="../org.eclipse.hyades.test.doc.user/concepts/cdatapooleditor.htm" label="Datapool Editor"/> > </context> > >-<context id="dplt0001"> >-<!--Datapool Data Table Description--> >-<description>Datapools contain data that tests can use when they run. You can add Variables (columns), Records (rows) and Equivalence Classes (groups of related Records), and can then populate the table with data which wil be used by your Hyades test.</description> >-<topic href="../org.eclipse.hyades.test.doc.user/tasks/teditdp.htm" label="Editing a datapool"/> >-<topic href="../org.eclipse.hyades.test.doc.user/tasks/taccessdp.htm" label="Accessing a datapool from a Hyades Test"/> >+<!-- New Datapool wizard: --> >+<context id="dplw0001"> >+<description>Create a new datapool.</description> >+<topic href="../org.eclipse.hyades.test.doc.user/tasks/tcreatedatapool.htm" label="Creating a datapool"/> > </context> > >-<context id="dpld0001"> >-<!-- Datapool base dialog: --> >-<description>Edit the structure of the datapool.</description> >-<topic href="../org.eclipse.hyades.test.doc.user/concepts/cdatapools.htm" label="Datapool structure"/> >-<topic href="../org.eclipse.hyades.test.doc.user/tasks/teditdp.htm" label="Editing a datapool"/> >+<!-- Import CSV File as Datapool wizard: --> >+<context id="dplw0002"> >+<description>Import a Comma-Separated Value (CSV) file into a new or existing new datapool.</description> >+<topic href="../org.eclipse.hyades.test.doc.user/tasks/cdatapoolimport.htm" label="Importing a Comma-Separated Value (CSV) file as a datapool"/> >+</context> >+ >+<!-- Export Datapool as CSV File wizard: --> >+<context id="dplw0003"> >+<description>Export a datapool to a Comma-Separated Value (CSV) file.</description> >+<topic href="../org.eclipse.hyades.test.doc.user/tasks/cdatapoolexport.htm" label="Exporting a datapool as a Comma-Separated Value (CSV) file"/> > </context> > > </contexts> >Index: src/org/eclipse/hyades/test/ui/datapool/internal/dialog/DatapoolBaseDialog.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/datapool/internal/dialog/DatapoolBaseDialog.java,v >retrieving revision 1.3 >diff -u -r1.3 DatapoolBaseDialog.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/dialog/DatapoolBaseDialog.java 21 Nov 2008 18:44:38 -0000 1.3 >+++ src/org/eclipse/hyades/test/ui/datapool/internal/dialog/DatapoolBaseDialog.java 2 Apr 2009 17:28:56 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2005, 2008 IBM Corporation and others. >+ * Copyright (c) 2005, 2009 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 >@@ -12,7 +12,7 @@ > package org.eclipse.hyades.test.ui.datapool.internal.dialog; > > import org.eclipse.hyades.test.ui.UiPlugin; >-import org.eclipse.hyades.test.ui.datapool.internal.util.ContextIds; >+import org.eclipse.hyades.test.ui.internal.util.ContextIds; > import org.eclipse.jface.dialogs.IDialogConstants; > import org.eclipse.jface.dialogs.TrayDialog; > import org.eclipse.swt.widgets.Button; >@@ -22,13 +22,13 @@ > import org.eclipse.ui.PlatformUI; > > /** >- * A base dialog for all other datapool dialogs with OK (default) >- * and Cancel buttons. >+ * <p>A base dialog for all other datapool dialogs with OK (default) >+ * and Cancel buttons.</p> > * > * > * @author Bianca Xue Jiang > * @author Paul Slauenwhite >- * @version November 21, 2008 >+ * @version April 2, 2009 > * @since January 27, 2005 > */ > public class DatapoolBaseDialog extends TrayDialog { >@@ -52,7 +52,7 @@ > */ > protected Control createDialogArea(Composite parent){ > >- //Set the context sensitive help for the dialog: >+ //Set the context sensitive help: > PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, UiPlugin.getID() + ContextIds.DATA_BASE_DIALOG); > > return (super.createDialogArea(parent)); >Index: src/org/eclipse/hyades/test/ui/internal/component/ProxyNodeSelectionViewer.java >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/component/ProxyNodeSelectionViewer.java,v >retrieving revision 1.2 >diff -u -r1.2 ProxyNodeSelectionViewer.java >--- src/org/eclipse/hyades/test/ui/internal/component/ProxyNodeSelectionViewer.java 1 Apr 2009 13:36:48 -0000 1.2 >+++ src/org/eclipse/hyades/test/ui/internal/component/ProxyNodeSelectionViewer.java 2 Apr 2009 17:28:56 -0000 >@@ -40,12 +40,13 @@ > * > * > * @author Paul E. Slauenwhite >- * @version April 1, 2009 >+ * @version April 2, 2009 > * @since October 31, 2008 > */ > public class ProxyNodeSelectionViewer { > > private TreeViewer assetViewer = null; >+ private Button filterButton = null; > private ProxyNodeContentProvider contentProvider = null; > private List selectedProxyNodes = null; > >@@ -74,6 +75,10 @@ > } > } > >+ public Button getFilterButton() { >+ return filterButton; >+ } >+ > public TreeViewer getViewer(){ > return assetViewer; > } >@@ -136,7 +141,7 @@ > } > }); > >- final Button filterButton = new Button(composite, SWT.CHECK); >+ filterButton = new Button(composite, SWT.CHECK); > filterButton.setText(UiPluginResourceBundle.SHOW_FOLDERS); > filterButton.addSelectionListener(new SelectionAdapter(){ > >Index: src/org/eclipse/hyades/test/ui/datapool/internal/util/ContextIds.java >=================================================================== >RCS file: src/org/eclipse/hyades/test/ui/datapool/internal/util/ContextIds.java >diff -N src/org/eclipse/hyades/test/ui/datapool/internal/util/ContextIds.java >--- src/org/eclipse/hyades/test/ui/datapool/internal/util/ContextIds.java 21 Nov 2008 18:44:37 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,59 +0,0 @@ >-/********************************************************************** >- * Copyright (c) 2005, 2008 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 >- * $Id: ContextIds.java,v 1.3 2008/11/21 18:44:37 paules Exp $ >- * >- * Contributors: >- * IBM - Initial API and implementation >- **********************************************************************/ >-package org.eclipse.hyades.test.ui.datapool.internal.util; >- >-/** >- * Context IDs >- * >- * >- * @author Paul Slauenwhite >- * @version November 21, 2008 >- * @since January 1, 2005 >- */ >-public class ContextIds { >- >- // Added to support datapool editing (PBS 12/06/03) >- // datapool editor >- public static final String DATA_FORM = ".datf0001"; //$NON-NLS-1$ >- public static final String DATA_TEXT_FORM = ".datf0002"; //$NON-NLS-1$ >- public static final String DATA_NAME_FORM = ".datf0003"; //$NON-NLS-1$ >- >- public static final String DATA_TABLE_FORM = ".datbf0001"; //$NON-NLS-1$ >- >- //Datapool base dialog ID: >- public static final String DATA_BASE_DIALOG = ".dpld0001"; //$NON-NLS-1$ >- >- // insert column action >- public static final String INS_COL_ACT = ".ica0001"; //$NON-NLS-1$ >- // delete column action >- public static final String DEL_COL_ACT = ".dca0001"; //$NON-NLS-1$ >- // edit column action >- public static final String EDIT_COL_ACT = ".eca0001"; //$NON-NLS-1$ >- // insert row action >- public static final String INS_ROW_ACT = ".ira0001"; //$NON-NLS-1$ >- // delete row action >- public static final String DEL_ROW_ACT = ".dra0001"; //$NON-NLS-1$ >- // edit row action >- public static final String EDIT_ROW_ACT = ".era0001"; //$NON-NLS-1$ >- // insert row group action >- public static final String INS_ROW_GRP_ACT = ".irga0001"; //$NON-NLS-1$ >- // delete row group action >- public static final String DEL_ROW_GRP_ACT = ".drga0001"; //$NON-NLS-1$ >- // edit row group action >- public static final String EDIT_ROW_GRP_ACT = ".erga0001"; //$NON-NLS-1$ >- // cut group action >- public static final String CUT_ACT = ".cuta0001"; //$NON-NLS-1$ >- // copy action >- public static final String COPY_ACT = ".cpya0001"; //$NON-NLS-1$ >- // paste action >- public static final String PASTE_ACT = ".psta0001"; //$NON-NLS-1$ >-} >Index: plugin.properties >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/plugin.properties,v >retrieving revision 1.94 >diff -u -r1.94 plugin.properties >--- plugin.properties 1 Apr 2009 13:36:47 -0000 1.94 >+++ plugin.properties 2 Apr 2009 17:28:56 -0000 >@@ -118,10 +118,10 @@ > Shortcut.RunMenu=Test > > # Datapool and CSV import and export: >-WIZARD_IMPORT_DATAPOOL_NAME = CSV File as Datapool. >+WIZARD_IMPORT_DATAPOOL_NAME = CSV File as Datapool > WIZARD_IMPORT_DATAPOOL_DESCRIPTION = Import a CSV file as a datapool. > >-WIZARD_EXPORT_DATAPOOL_NAME = Datapool as CSV File. >+WIZARD_EXPORT_DATAPOOL_NAME = Datapool as CSV File > WIZARD_EXPORT_DATAPOOL_DESCRIPTION = Export a datapool as a CSV file. > > GENERATE_TEST_TOOLTIP = Generate Test >#P org.eclipse.hyades.test.doc.user >Index: tasks/tcreatetestdeployment.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tcreatetestdeployment.htm,v >retrieving revision 1.7 >diff -u -r1.7 tcreatetestdeployment.htm >--- tasks/tcreatetestdeployment.htm 31 Mar 2009 13:33:17 -0000 1.7 >+++ tasks/tcreatetestdeployment.htm 2 Apr 2009 17:28:59 -0000 >@@ -30,10 +30,9 @@ > <p>Test deployments are created with the <b>New Deployment</b> wizard:</p> > > <ol> >- <li>Right-click in the Test Navigator and select <b>New</b> > <b>Test Element...</b>.</li> >- <li>Select <b>Test Assets</b> > <b>Deployment</b> and click <b>Next</b>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>New</b> > <b>Test Element...</b> > <b>Test Assets</b> > <b>Deployment</b>, and click <b>Next</b>.</li> > <li>Select the parent folder and define the name of the test deployment and click <b>Next</b>.</li> >- <li>Optionally, provide a description for the test deployment and click <b>Next</b>.</li> >+ <li>Provide a description for the test deployment and click <b>Next</b>.</li> > <li>Select or create the associated test artifacts by clicking the <b>New...</b> button and > selecting the test artifacts or creating a <a href="tcreateartifact.htm">new test artifact</a>. > Selected test artifacts can be removed (<b>Remove</b>), moved up (<b>Up</b>), or moved down (<b>Down</b>).</li> >Index: tasks/trun.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/trun.htm,v >retrieving revision 1.14 >diff -u -r1.14 trun.htm >--- tasks/trun.htm 31 Mar 2009 13:33:17 -0000 1.14 >+++ tasks/trun.htm 2 Apr 2009 17:28:59 -0000 >@@ -26,7 +26,7 @@ > > <p>There are a number of options available to run a test.</p> > >-<p>You can right-click on it in the Test Navigator and select <b>Run As</b> > <b>Run</b> or >+<p>You can right-click on it in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> and select <b>Run As</b> > <b>Run</b> or > <b>Run As</b> > <b>Test</b>. If the latter option is chosen, TPTP will automatically run the selected test without invoking the launch configuration dialog. </p> > > <p>If the former option is selected, the launch configuration dialog will be opened and the >Index: tasks/tcreatingaperformancetest.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tcreatingaperformancetest.htm,v >retrieving revision 1.3 >diff -u -r1.3 tcreatingaperformancetest.htm >--- tasks/tcreatingaperformancetest.htm 30 May 2008 18:24:26 -0000 1.3 >+++ tasks/tcreatingaperformancetest.htm 2 Apr 2009 17:28:59 -0000 >@@ -3,7 +3,7 @@ > > <!-- > /********************************************************************** >- * Copyright (c) 2008 IBM Corporation. >+ * Copyright (c) 2008, 2009 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -37,7 +37,7 @@ > <li>Click <b>File > New > Other</b>. The <b>New</b> dialog appears.</li> > <li>Expand the <b>Test</b> folder, then select <b>TPTP URL Test</b>.</li> > <li>Click <b>Next</b>, select the location (the project created in step 1), and name the performance test suite, for example, <i>examplePerformanceTest</i>.</li> >- <li>Click <b>Next</b> and optionally provide a description for the performance test suite. Click <b>Finish</b>.</li> >+ <li>Click <b>Next</b> and provide a description for the performance test suite. Click <b>Finish</b>.</li> > <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new performance test suite is to be opened in the URL Test editor.</li> > </ol> > </div> >Index: tasks/tgenerateexecutabletest.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tgenerateexecutabletest.htm,v >retrieving revision 1.15 >diff -u -r1.15 tgenerateexecutabletest.htm >--- tasks/tgenerateexecutabletest.htm 18 Jul 2008 16:18:12 -0000 1.15 >+++ tasks/tgenerateexecutabletest.htm 2 Apr 2009 17:28:59 -0000 >@@ -3,7 +3,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2004, 2008 IBM Corporation. >+ * Copyright (c) 2004, 2009 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -45,7 +45,7 @@ > source code into an executable test.</p> > </div> > <div class="skipspace">To generate a test's source code:</div> >-<ol><li class="skipspace"><span>In the Test Navigator, right-click the test to be run and select <span class="uicontrol">Generate</span>. </span> The <span class="uicontrol">JUnit Test Definition Code Generation</span> dialog >+<ol><li class="skipspace"><span>In the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click the test to be run and select <span class="uicontrol">Generate</span>. </span> The <span class="uicontrol">JUnit Test Definition Code Generation</span> dialog > box opens.</li> > <li class="skipspace"><span>In the <span class="uicontrol">Source Folder</span> field, accept the default > or click <span class="uicontrol">Browse</span> to select the source folder in a Java project in which >Index: tasks/tcreatetestfromrecording.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tcreatetestfromrecording.htm,v >retrieving revision 1.1 >diff -u -r1.1 tcreatetestfromrecording.htm >--- tasks/tcreatetestfromrecording.htm 31 Mar 2009 13:33:17 -0000 1.1 >+++ tasks/tcreatetestfromrecording.htm 2 Apr 2009 17:28:59 -0000 >@@ -29,7 +29,7 @@ > <p>Tests are created from new recordings with the <b>New Test From Recording</b> wizard:</p> > > <ol> >- <li>Right-click in the Test Navigator, select <b>New</b> > <b>Test Element...</b> > <b>Test From Recording</b>, and click <b>Next</b>. Alternatively, click the <b>New Test From Recording</b> button in the toolbar of the <a href="../concepts/crecordercontrolview.htm">Recorder Control View</a>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, select <b>New</b> > <b>Test Element...</b> > <b>Test From Recording</b>, and click <b>Next</b>. Alternatively, click the <b>New Test From Recording</b> button in the toolbar of the <a href="../concepts/crecordercontrolview.htm">Recorder Control View</a>.</li> > <li>Select <b>Create the test from a new recording</b>.</li> > <li>Select the recorder to record the new recording. A description of the selected recorder is displayed below the list of recorders.</li> > <li>Optionally, click <b>Advanced >></b> and select a different test generator to create the new test from the new recording.</li> >@@ -42,7 +42,7 @@ > <p>In addition, tests can be created from existing recordings with the <b>New Test From Recording</b> wizard:</p> > > <ol> >- <li>Right-click in the Test Navigator, select <b>New</b> > <b>Test Element...</b> > <b>Test From Recording</b>, and click <b>Next</b>. Alternatively, click the <b>New Test From Recording</b> button in the toolbar of the <a href="../concepts/crecordercontrolview.htm">Recorder Control View</a>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, select <b>New</b> > <b>Test Element...</b> > <b>Test From Recording</b>, and click <b>Next</b>. Alternatively, click the <b>New Test From Recording</b> button in the toolbar of the <a href="../concepts/crecordercontrolview.htm">Recorder Control View</a>.</li> > <li>Select <b>Test From Recording</b> and click <b>Next</b>.</li> > <li>Select <b>Create the test from an existing recording</b>.</li> > <li>Select the recorder that was used to record the existing recording. A description of the selected recorder is displayed below the list of recorders.</li> >Index: tasks/tcreatelocation.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tcreatelocation.htm,v >retrieving revision 1.9 >diff -u -r1.9 tcreatelocation.htm >--- tasks/tcreatelocation.htm 31 Mar 2009 13:33:17 -0000 1.9 >+++ tasks/tcreatelocation.htm 2 Apr 2009 17:28:59 -0000 >@@ -31,10 +31,9 @@ > <p>Test locations are created with the <b>New Location</b> wizard:</p> > > <ol> >- <li>Right-click in the Test Navigator and select <b>New</b> > <b>Test Element...</b>.</li> >- <li>Select <b>Test Assets</b> > <b>Location</b> and click <b>Next</b>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>New</b> > <b>Test Element...</b> > <b>Test Assets</b> > <b>Location</b>, and click <b>Next</b>.</li> > <li>Select the parent folder and define the name of the test location and click <b>Next</b>.</li> >- <li>Optionally, provide a description for the test location and click <b>Next</b>.</li> >+ <li>Provide a description for the test location and click <b>Next</b>.</li> > <li>Enter the host name or IP address of the target host. By default, <i>localhost</i> is entered. Test the > connection to the target host by clicking the <b>Test Connection</b> link<sup>1</sup>.</li> > <li>Click <b>Finish</b> to create the test location.</li> >Index: tasks/tcreatetestreports.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tcreatetestreports.htm,v >retrieving revision 1.7 >diff -u -r1.7 tcreatetestreports.htm >--- tasks/tcreatetestreports.htm 31 Mar 2009 13:33:17 -0000 1.7 >+++ tasks/tcreatetestreports.htm 2 Apr 2009 17:28:59 -0000 >@@ -64,10 +64,10 @@ > > <p>Generate a test report:</p> > <ol> >- <li>Right-click on a test suite in the Test Navigator and select <b>Report... </b>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click on a test suite in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>Report... </b>.</li> > <li>Select one of the test report types and click <b>Next </b>.</li> > <li>Select the parent folder and define the name of the test report and click <b>Next</b>.</li> >- <li>Optionally, provide the report window (start and end data and time) for the test report.</li> >+ <li>Provide the report window (start and end data and time) for the test report.</li> > <li>Click <b>Finish </b> to generate the test report.</li> > <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new test report is to be opened in the internal Web Browser.</li> > </ol> >Index: tasks/tcreateperformancetestreports.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tcreateperformancetestreports.htm,v >retrieving revision 1.8 >diff -u -r1.8 tcreateperformancetestreports.htm >--- tasks/tcreateperformancetestreports.htm 31 Mar 2009 13:33:17 -0000 1.8 >+++ tasks/tcreateperformancetestreports.htm 2 Apr 2009 17:28:59 -0000 >@@ -78,10 +78,10 @@ > > <p>Generate a performance test report:</p> > <ol> >- <li>Right-click on a performance test suite in the Test Navigator and select <b>Report... </b>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click on a performance test suite in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>Report... </b>.</li> > <li>Select one of the performance test report types and click <b>Next </b>.</li> > <li>Select the parent folder and define the name of the performance test report and click <b>Next</b>.</li> >- <li>Optionally, provide the report window (start and end data and time) for the performance test report.</li> >+ <li>Provide the report window (start and end data and time) for the performance test report.</li> > <li>Click <b>Finish </b> to generate the performance test report.</li> > <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new performance test report is to be opened in the internal Web Browser.</li> > </ol> >Index: tasks/tcreatedp.htm >=================================================================== >RCS file: tasks/tcreatedp.htm >diff -N tasks/tcreatedp.htm >--- tasks/tcreatedp.htm 17 Jul 2008 19:07:12 -0000 1.15 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,99 +0,0 @@ >-<!DOCTYPE html >- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >-<html lang="en-us" xml:lang="en-us"> >-<!-- >-/********************************************************************** >- * Copyright (c) 2004, 2008 IBM Corporation. >- * All rights reserved. This content >- * is 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 >- * $Id: tcreatedp.htm,v 1.15 2008/07/17 19:07:12 paules Exp $ >- * >- * Contributors: >- * IBM - Initial contribution >- **********************************************************************/ >- --> >-<head> >-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<meta name="security" content="public" /> >-<meta name="Robots" content="index,follow" /> >-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' /> >-<meta name="DC.Type" content="task" /> >-<meta name="DC.Title" content="Creating a datapool" /> >-<meta name="abstract" content="Datapools contain data that tests can use when they run." /> >-<meta name="description" content="Datapools contain data that tests can use when they run." /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/tdatapool.dita" /> >-<meta name="DC.Format" content="XHTML" /> >-<meta name="DC.Identifier" content="tcreatedp" /> >-<meta name="DC.Language" content="en-us" /> >-<link rel="stylesheet" type="text/css" href="../css/ibmdita.css" /> >-<link rel="stylesheet" type="text/css" href="../css/swg_info_common.css" /> >-<title>Creating a datapool</title> >-</head> >-<body><a name="tcreatedp"><!-- --></a> >- >-<h1 class="topictitle1">Creating a datapool</h1> >-<div><p>Datapools contain data that tests can use when they run.</p> >-<div class="skipspace">To create a datapool, do the following.</div> >-<ol><li class="skipspace"><span>Open the Test perspective.</span> >- <ul> >- <li>From the File menu, choose <b>Window > Open Perspective > >- Other</b>.</li> >- <li>Select <b>Test</b> and click <b>OK</b>. The Test Navigator >- appears.</li> >- </ul> >- </li> >-<li class="skipspace"><span>In the Test Navigator, right-click a project >- and select <span class="uicontrol">New > Test Elemen<b>t</b></span><b>...</b>. The <span >- class="uicontrol">New Test Element </span> dialog appears.</span></li> >- <li class="skipspace"><span>In the Wizards list box, expand the <span class="uicontrol">Test Assets</span> folder and >-select <span class="uicontrol">Datapool</span>.</span></li> >-<li class="skipspace"><span>Click <b>Next</b>. The <span class="uicontrol">New Datapool</span> dialog >-appears.</span></li> >-<li class="skipspace"><span>Choose the datapool project folder and datapool name. In the list of existing projects, select the project to store the datapool. </span> You can store datapools >-in any kind of project (Java, Simple, etc.). You do not have to store datapools with the >- tests that use them. <span>In the <span class="uicontrol">Name</span> >- field, enter the name of the new datapool.</span> Click <b>Finish</b> to create an empty datapool with default settings or click <b>Next</b> to continue.</li> >- <li class="skipspace">Optionally, enter a description and initial dimensions for the datapool. Click <b>Next</b> to continue.</li> >- <li class="skipspace">Optionally, import data contained in an existing CSV file (comma-separated value text file). >- <ul> >- <li><span>In the <span class="uicontrol">CSV File</span> field, type >- the name of a CSV file or click <span class="uicontrol">Browse</span> >- to navigate to the file.</span></li> >- <li><span>If the data in the CSV file is encoded differently from what >- the local computer expects, select the encoding from the <span >- class="uicontrol">Import Encoding</span> drop down menu.</span></li> >- <li><span>The first row of the CSV file may contain column names. If >- it does, check the box beside <span class="uicontrol">First row >- contains variable names and suggested types</span>.</span> If this box is not checked, default >-variable names and types such as Variable1::String are used. You can easily change the names using the datapool editor.</li> >- <li><span>If the first column of your CSV file contains </span>equivalence class names, check <span><span >- class="uicontrol">First column contains equivalence class names</span></span>. Equivalence classes group related data. The following example shows a CSV file with two equivalence >- classes, flowers and vegetables.<pre>,ModelNumber::String,Description::String,Price::Double >-flowers,F0001,Orchid,5.99<br />flowers,F0002,Tulip,1.99<br />flowers,F0003,Yellow Carnation,6.99<br />flowers,F0004,White Rose,9.99<br />flowers,F0005,Geraniums,4.99<br />vegetables,F0006,Cabbage,0.99<br />vegetables,F0007,Lettuce,0.99<br />vegetables,F0008,Tomatoes,0.25<br />vegetables,F0009,Celery,0.35<br />vegetables,F0010,Cucumbers,0.4</pre>Note: if your CSV file does not include equivalence class names, all imported rows are grouped under a single equivalence class.</li> >- </ul> >- </li><li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span> If you specified initial datapool dimensions, which may conflict with the CSV file dimensions, a dialog appears. Click <b>Yes</b> to use the dimensions of the CSV file. Click <b>No</b> to use the specified initial dimensions (and possibly truncate the CSV file data). The Datapool editor appears, showing the >- datapool's first equivalence class. <br /> >- </li> >- <li class="skipspace">The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new datapool is to be opened in the Datapool editor.<br /> >- </li> >- >-</ol> >-<div class="skipspace"><br />For instructions >-on how to add data to or edit the new datapool, go to <a >- href="./teditdp.htm">Editing a datapool</a>. >-</div> >-</div> >- >-<div> >-<p> >-<strong>Related concepts</strong><br /> >- <a href="../samples/saccessdp.htm">Tutorial: Creating a datapool driven JUnit test application</a><br /> >-<br /> >-<strong>Related tasks</strong><br /> >- <a href="../tasks/teditdp.htm">Editing a datapool</a><br /> >-</p> >-</div> >-</body> >-</html> >Index: tasks/tptpJUnitTest_creatingManually.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tptpJUnitTest_creatingManually.htm,v >retrieving revision 1.11 >diff -u -r1.11 tptpJUnitTest_creatingManually.htm >--- tasks/tptpJUnitTest_creatingManually.htm 30 May 2008 18:24:25 -0000 1.11 >+++ tasks/tptpJUnitTest_creatingManually.htm 2 Apr 2009 17:28:59 -0000 >@@ -3,7 +3,7 @@ > > <!-- > /********************************************************************** >- * Copyright (c) 2000, 2008 IBM Corporation. >+ * Copyright (c) 2000, 2009 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -42,7 +42,7 @@ > </li> > <li>Click <b>Next</b>. The <b>New JUnit Test Definition</b> dialog launches.</li> > <li>Enter the parent folder (<i>javaProject/src/junit/samples</i>) and Name (<i>JUnit_src</i>).</li> >- <li>Optionally click <b>Next</b> and provide a description of the JUnit test definition.</li> >+ <li>Click <b>Next</b> and provide a description of the JUnit test definition.</li> > <li>Click on <b>Finish</b>.</li> > <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new JUnit test suite is to be opened in the JUnit Test editor.</li> > </ol> >Index: tasks/tcreateartifact.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/tcreateartifact.htm,v >retrieving revision 1.8 >diff -u -r1.8 tcreateartifact.htm >--- tasks/tcreateartifact.htm 31 Mar 2009 13:33:17 -0000 1.8 >+++ tasks/tcreateartifact.htm 2 Apr 2009 17:28:59 -0000 >@@ -29,10 +29,9 @@ > <p>Test artifacts are created with the <b>New Artifact</b> wizard:</p> > > <ol> >- <li>Right-click in the Test Navigator and select <b>New</b> > <b>Test Element...</b>.</li> >- <li>Select <b>Test Assets</b> > <b>Artifact</b> and click <b>Next</b>.</li> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>New</b> > <b>Test Element...</b> > <b>Test Assets</b> > <b>Artifact</b>, and click <b>Next</b>.</li> > <li>Select the parent folder and define the name of the test artifact and click <b>Next</b>.</li> >- <li>Optionally, provide a description for the test artifact and click <b>Next</b>.</li> >+ <li>Provide a description for the test artifact and click <b>Next</b>.</li> > <li>Select the associated test assets, such as test suites and datapools.</li> > <li>Click <b>Finish</b> to create the test artifact.</li> > <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new test artifact is to be opened in the Artifact editor.</li> >Index: tasks/t_openinglogs.html >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/tasks/t_openinglogs.html,v >retrieving revision 1.11 >diff -u -r1.11 t_openinglogs.html >--- tasks/t_openinglogs.html 30 May 2008 18:24:24 -0000 1.11 >+++ tasks/t_openinglogs.html 2 Apr 2009 17:28:59 -0000 >@@ -3,7 +3,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2005, 2008 IBM Corporation. >+ * Copyright (c) 2005, 2009 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -34,14 +34,14 @@ > <body><a name="openinglogs"><!-- --></a> > <h1 class="topictitle1">Opening a test log</h1> > <div><p>To open a test log file, use the Open File window, or double-click >-in the Test Navigator the file with the extension, <span class="filepath">.execution</span>.</p> >+in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> the file with the extension, <span class="filepath">.execution</span>.</p> > <ol><li><span>From the <span class="uicontrol">File</span> menu, click <span class="uicontrol">Open > File</span>.</span></li> > <li><span>Browse to and select the test log file to open. (Test log files > use the extension, <span class="filepath">.execution</span>.)</span></li> > <li><span>Click <span class="uicontrol">OK</span>.</span></li> > </ol> >-<div class="section">Alternatively, locate in the Test Navigator the test log file and >+<div class="section">Alternatively, locate in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> the test log file and > then double-click it.</div> > </div> > </body> >Index: tasks/topendp.htm >=================================================================== >RCS file: tasks/topendp.htm >diff -N tasks/topendp.htm >--- tasks/topendp.htm 30 May 2008 18:24:24 -0000 1.11 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,50 +0,0 @@ >-<!DOCTYPE html >- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >-<html lang="en-us" xml:lang="en-us"> >-<!-- >-/********************************************************************** >- * Copyright (c) 2004, 2008 IBM Corporation. >- * All rights reserved. This content >- * is 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 >- * $Id: topendp.htm,v 1.11 2008/05/30 18:24:24 paules Exp $ >- * >- * Contributors: >- * IBM - Initial contribution >- **********************************************************************/ >- --> >-<head> >-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<meta name="security" content="public" /> >-<meta name="Robots" content="index,follow" /> >-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' /> >-<meta name="DC.Type" content="task" /> >-<meta name="DC.Title" content="Opening a datapool" /> >-<meta name="abstract" content="Inspect or modify the contents of a datapool." /> >-<meta name="description" content="Inspect or modify the contents of a datapool." /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/tdatapool.dita" /> >-<meta name="DC.Format" content="XHTML" /> >-<meta name="DC.Identifier" content="topendp" /> >-<meta name="DC.Language" content="en-us" /> >-<link rel="stylesheet" type="text/css" href="../css/ibmdita.css" /> >-<link rel="stylesheet" type="text/css" href="../css/swg_info_common.css" /> >-<title>Opening a datapool</title> >-</head> >-<body><a name="topendp"><!-- --></a> >- >-<h1 class="topictitle1">Opening a datapool</h1> >-<div><p>Inspect or modify the contents of a datapool.</p> >-<div class="skipspace"><p>To open a datapool for editing:</p> >-</div> >-<ol><li><span>Open the Test perspective.</span></li> >-<li><span>In the Test Navigator, expand the Java project containing the datapool >-to be edited.</span></li> >-<li><span>From the list of test assets in the Test Navigator, double-click >-the datapool: the datapool opens in the <span class="uicontrol">Equivalence Class</span> tab.</span></li> >-<li><span>Along the bottom of the edit pane, click the <span class="uicontrol">Data Table</span> tab.</span></li> >-</ol> >-</div> >- >-</body> >-</html> >Index: tasks/teditdp.htm >=================================================================== >RCS file: tasks/teditdp.htm >diff -N tasks/teditdp.htm >--- tasks/teditdp.htm 30 May 2008 18:24:24 -0000 1.16 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,60 +0,0 @@ >-<!DOCTYPE html >- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >-<html lang="en-us" xml:lang="en-us"> >-<!-- >-/********************************************************************** >- * Copyright (c) 2004, 2008 IBM Corporation. >- * All rights reserved. This content >- * is 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 >- * $Id: teditdp.htm,v 1.16 2008/05/30 18:24:24 paules Exp $ >- * >- * Contributors: >- * IBM - Initial contribution >- **********************************************************************/ >- --> >-<head> >-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<meta name="security" content="public" /> >-<meta name="Robots" content="index,follow" /> >-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' /> >-<meta name="DC.Type" content="task" /> >-<meta name="DC.Title" content="Editing a datapool" /> >-<meta name="abstract" content="In a manner similar to editing a spreadsheet, you can add, modify or remove data from a datapool." /> >-<meta name="description" content="In a manner similar to editing a spreadsheet, you can add, modify or remove data from a datapool." /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/tdatapool.dita" /> >-<meta name="DC.Format" content="XHTML" /> >-<meta name="DC.Identifier" content="teditdp" /> >-<meta name="DC.Language" content="en-us" /> >-<link rel="stylesheet" type="text/css" href="../css/ibmdita.css" /> >-<link rel="stylesheet" type="text/css" href="../css/swg_info_common.css" /> >-<title>Editing a datapool</title> >-</head> >-<body> >-<div> >-<h1 class="topictitle1">Editing a datapool</h1> >- >-<p>The datapool editor is a grid similar to a spreadsheet.</p> >- >-<p>In a manner similar to editing a spreadsheet, you can add, modify or remove data from a datapool.</p> >- >-<p>When you right-click on the datapool editing grid, a context menu appears to add, edit, and remove a >-record or variable, and cut, copy, and paste the selected cell.</p> >- >-<p>If you insert a variable, the name, type, and relative position of the new variable is required. >-In addition, you may encrypt the new variable, which requires a password.</p> >- >-<p>The Datapool editor's overview tab allows you to edit variables and equivalence classes.</p> >- >-<p> >-<strong>Related concepts</strong><br /> >- <a href="../samples/saccessdp.htm">Tutorial: Creating a datapool driven JUnit test application</a><br /> >-<strong><br /> >-Related tasks</strong><br /> >- <a href="../tasks/tcreatedp.htm">Creating a datapool</a><br /> >-</p> >- >-</div> >-</body> >-</html> >Index: tasks/tdatapool.htm >=================================================================== >RCS file: tasks/tdatapool.htm >diff -N tasks/tdatapool.htm >--- tasks/tdatapool.htm 30 May 2008 18:24:25 -0000 1.14 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,62 +0,0 @@ >-<!DOCTYPE html >- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >-<html lang="en-us" xml:lang="en-us"> >-<!-- >-/********************************************************************** >- * Copyright (c) 2000, 2008 IBM Corporation. >- * All rights reserved. This content >- * is 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 >- * $Id: tdatapool.htm,v 1.14 2008/05/30 18:24:25 paules Exp $ >- * >- * Contributors: >- * IBM - Initial contribution >- **********************************************************************/ >- --> >-<head> >-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<meta name="security" content="public" /> >-<meta name="Robots" content="index,follow" /> >-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' /> >-<meta name="DC.Type" content="task" /> >-<meta name="DC.Title" content="Providing tests with variable data" /> >-<meta name="abstract" content="If you associate a value in a test with a datapool column, the test substitutes column data for that value when it runs." /> >-<meta name="description" content="If you associate a value in a test with a datapool column, the test substitutes column data for that value when it runs." /> >-<meta name="DC.Relation" scheme="URI" content="../concepts/ccommontestingtasksandconcepts.dita" /> >-<meta name="DC.Relation" scheme="URI" content="../concepts/cdatapools.dita" /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/tcreatedp.dita" /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/topendp.dita" /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/teditdp.dita" /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/taccessdp.dita" /> >-<meta name="DC.Format" content="XHTML" /> >-<meta name="DC.Identifier" content="tdatapool" /> >-<meta name="DC.Language" content="en-us" /> >-<link rel="stylesheet" type="text/css" href="../css/ibmdita.css" /> >-<link rel="stylesheet" type="text/css" href="../css/swg_info_common.css" /> >-<title>Providing tests with variable data</title> >-</head> >-<body><a name="tdatapool"><!-- --></a> >- >-<h1 class="topictitle1">Providing tests with variable data</h1> >-<div><p>If you associate a value in a test with a datapool column, the >-test substitutes column data for that value when it runs.</p> >-</div> >- >-<div> >-<blockquote> >-<div class="ulchildlink"><b><a href="../concepts/cdatapools.htm">Datapool structure</a></b><br /> >-Datapools provide variable data to your tests during execution.</div> >-<div class="ulchildlink"><b><a href="../tasks/tcreatedp.htm">Creating a datapool</a></b><br /> >-Datapools contain data that tests can use when they run.</div> >-<div class="ulchildlink"><b><a href="../tasks/topendp.htm">Opening a datapool</a></b><br /> >-Inspect or modify the contents of a datapool.</div> >-<div class="ulchildlink"><b><a href="../tasks/teditdp.htm">Editing a datapool</a></b><br /> >-In a manner similar to editing a spreadsheet, you can add, modify or remove data from a datapool.</div> >-<div class="ulchildlink"><b><a href="../samples/saccessdp.htm">Tutorial: Accessing a datapool from a JUnit test</a></b><br /> >-Create and access a datapool from an example test application.</div> >-</blockquote> >- >-</div> >-</body> >-</html> >Index: concepts/ccommontestingtasksandconcepts.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/ccommontestingtasksandconcepts.htm,v >retrieving revision 1.22 >diff -u -r1.22 ccommontestingtasksandconcepts.htm >--- concepts/ccommontestingtasksandconcepts.htm 29 Feb 2008 04:21:42 -0000 1.22 >+++ concepts/ccommontestingtasksandconcepts.htm 2 Apr 2009 17:28:58 -0000 >@@ -3,7 +3,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2004, 2008 IBM Corporation. >+ * Copyright (c) 2004, 2009 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -46,7 +46,7 @@ > > <div> > <blockquote> >-<div class="ulchildlink"><b><a href="../tasks/tdatapool.htm">Providing tests with variable data</a></b><br /> >+<div class="ulchildlink"><b><a href="../tasks/tdatapoolsintro.htm">Providing tests with variable data</a></b><br /> > If you associate a value in a test with a datapool column, the test substitutes column data for that value when it runs.</div> > <div class="ulchildlink"><b><a href="../tasks/tdeploymentintro.htm">Creating a test deployment</a></b><br /> > This topic describes how to create a deployment for your test suite. You must create a deployment before you can run a test.</div> >Index: concepts/clocationeditor.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/clocationeditor.htm,v >retrieving revision 1.9 >diff -u -r1.9 clocationeditor.htm >--- concepts/clocationeditor.htm 31 Mar 2009 13:33:18 -0000 1.9 >+++ concepts/clocationeditor.htm 2 Apr 2009 17:28:59 -0000 >@@ -26,11 +26,11 @@ > > <h1>Location Editor</h1> > >-<p>Test locations are edited using the Location editor. The editor contains three tabs:</p> >+<p>Test locations are edited using the Location . The editor contains three tabs:</p> > > <h2>Overview</h2> > >-<p>This tab provides an overview of the test location.</p> >+<p>This tab provides an overview of the test location, including its general information, property groups, Eclipse workbench properties, and general properties.</p> > > <p>This tab contains the following sections:</p> > >@@ -65,7 +65,7 @@ > </li> > </ul> > >-<p>[1] Test locations have a file name and logical name. The logical name is used in the Test Navigator, dialogs, editors, and wizards to represent the test location. >+<p>[1] Test locations have a file name and logical name. The logical name is used in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, dialogs, editors, and wizards to represent the test location. > The file name represents the test location file (<i>*.location</i>) within the workspace. When the test location is created, the logical name defaults to the file name > (excluding the <i>.location</i> file extension) and may be modified without modifying the file name. The logical name allows customization of the test location name > without affecting the file name within the workspace.</p> >@@ -80,7 +80,7 @@ > dependencies on the target host.</p> > > <p>In addition, the <i>ROOTDIR</i> general property contains absolute path of the directory on the target host where >-the dependencies configured in <a href="../concepts/cartifacteditor.htm">Artifact editor</a> are deployed when a test suite is executed. If the >+the dependencies configured in <a href="../concepts/cartifacteditor.htm">Artifact </a> are deployed when a test suite is executed. If the > <i>ROOTDIR</i> general property is not provided or invalid for the target host, the dependencies are deployed to a temporary directory on the target host.</p> > > <p>Note, the General Properties tab will only appear if one or more general properties are associated with the test location.</p> >Index: concepts/c_viewingtestresults.html >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/c_viewingtestresults.html,v >retrieving revision 1.12 >diff -u -r1.12 c_viewingtestresults.html >--- concepts/c_viewingtestresults.html 23 Feb 2009 14:52:18 -0000 1.12 >+++ concepts/c_viewingtestresults.html 2 Apr 2009 17:28:58 -0000 >@@ -40,7 +40,7 @@ > <div> > <ul class="ullinks"> > <li class="ulchildlink"><strong><a href="../tasks/t_openinglogs.html">Opening a test log</a></strong><br /> >-To open a test log file, use the Open File window, or double-click in the Test Navigator the file with the extension, <span class="filepath">.execution</span>.</li> >+To open a test log file, use the Open File window, or double-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> the file with the extension, <span class="filepath">.execution</span>.</li> > <li class="ulchildlink"><strong><a href="../tasks/t_viewingevents.html">Viewing events</a></strong><br /> > After a run, open the Test Log viewer to check the results for specific events, such as the test start and end, loop, invocation, message, or verdict. </li> > </ul> >Index: concepts/cartifacteditor.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/cartifacteditor.htm,v >retrieving revision 1.8 >diff -u -r1.8 cartifacteditor.htm >--- concepts/cartifacteditor.htm 31 Mar 2009 13:33:18 -0000 1.8 >+++ concepts/cartifacteditor.htm 2 Apr 2009 17:28:58 -0000 >@@ -26,11 +26,11 @@ > > <h1>Artifact Editor</h1> > >-<p>Test artifacts are edited using the Artifact editor. The editor contains three tabs:</p> >+<p>Test artifacts are edited using the Artifact Editor. The editor contains three tabs:</p> > > <h2>Overview</h2> > >-<p>This tab provides an overview of the test artifact.</p> >+<p>This tab provides an overview of the test artifact, including its general information, property groups, test assets, and general properties.</p> > > <p>This tab contains the following sections:</p> > >@@ -61,7 +61,7 @@ > </li> > </ul> > >-<p>[1] Test artifacts have a file name and logical name. The logical name is used in the Test Navigator, dialogs, editors, and wizards to represent the test artifact. >+<p>[1] Test artifacts have a file name and logical name. The logical name is used in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, dialogs, editors, and wizards to represent the test artifact. > The file name represents the test artifact file (<i>*.artifact</i>) within the workspace. When the test artifact is created, the logical name defaults to the file name > (excluding the <i>.artifact</i> file extension) and may be modified without modifying the file name. The logical name allows customization of the test artifact name > without affecting the file name within the workspace.</p> >Index: concepts/cdatapools.htm >=================================================================== >RCS file: concepts/cdatapools.htm >diff -N concepts/cdatapools.htm >--- concepts/cdatapools.htm 17 Jul 2008 19:07:12 -0000 1.18 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,91 +0,0 @@ >-<!DOCTYPE html >- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >-<html lang="en-us" xml:lang="en-us"> >-<head> >-<!-- >-/********************************************************************** >- * Copyright (c) 2000, 2008 IBM Corporation. >- * All rights reserved. This content >- * is 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 >- * $Id: cdatapools.htm,v 1.18 2008/07/17 19:07:12 paules Exp $ >- * >- * Contributors: >- * IBM - Initial contribution >- **********************************************************************/ >- --> >-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<meta name="security" content="public" /> >-<meta name="Robots" content="index,follow" /> >-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' /> >-<meta name="DC.Type" content="concept" /> >-<meta name="DC.Title" content="Datapool structure" /> >-<meta name="abstract" content="Datapools provide variable data to your tests during execution." /> >-<meta name="description" content="Datapools provide variable data to your tests during execution." /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/tdatapool.dita" /> >-<meta name="DC.Format" content="XHTML" /> >-<meta name="DC.Identifier" content="cdatapools" /> >-<meta name="DC.Language" content="en-us" /> >-<link rel="stylesheet" type="text/css" href="../css/ibmdita.css" /> >-<link rel="stylesheet" type="text/css" href="../css/swg_info_common.css" /> >-<title>Datapool structure</title> >-</head> >-<body><a name="cdatapools"><!-- --></a> >- >-<h1 class="topictitle1">Datapool structure</h1> >-<div><p><span class="tx">Datapools provide variable data to your tests during execution. You can add Variables (columns), Records (rows) and >-Equivalence Classes (groups of related Records), to define a datapool's structure. This section describes these structural elements. For information about populating a datapool and using the datapool API, see Tutorial: Creating a datapool driven >-JUnit test application.</span></p> >-<h3>Performance testing example</h3><p>Performance tests are based on user emulation. During a session with the >-application-under-test, the tester uses a feature that real customers >-will use, and from the recorded session a test is generated containing the >-exact data that the tester entered. For example, to create a performance test >-for a dialog in a web-based shopping application that prompts a shopper for >-an account number, the tester engages the dialog by selecting an >-item that is offered for sale, clicking a "pay now" button, and entering an >-account number. During playback of the test, in which the tester might request >-that hundreds of instances of the transaction be run simultaneously, it is >-desirable that different account numbers (perhaps a combination of valid and >-invalid numbers) are used for each of the instances. To supply variable data >-for tests to use during playback, the tester creates datapools.</p> >-<h3>Structural elements.</h3> >-<p>Datapools contain three structural elements</p> >-<ul><li><p>Equivalence class. A datapool subset containing a range of data that, >-when submitted to a test, produces the equivalent pass/fail result. Equivalence classes group related data. A datapool >-must contain one equivalence class. </p> >- <p>Note: you should use only one equivalence class for performance >- testing. A performance test can open a datapool in one of 3 modes, >- which determines how virtual users access the datapool: private, shared >- per machine, or segmented per machine. In the private and shared >- modes, equivalence classes are ignored but the segmented access mode >- requires that the datapool contain only 1 equivalence class. For this >- reason, we recommend that you add only a single equivalence class to >- datapools that you plan to use for performance testing.</p> >- </li> >-<li><p>Record. A row of data. Rows are indexed by an equivalence class starting >-with 0.</p> >-</li> >-<li><p>Variable. A named data column. Data resides in column cells and is >-typically typed based on what is expected by the application-under-test.</p> >-</li> >-</ul> >- >-<p>When you create a datapool, you have the option of initializing the new >-datapool with data contained in an existing comma-separated value text file (CSV) >-that you created with a spreadsheet editor or with some external or custom >-tool. For datapools containing large amounts of data, this approach is recommended. >-The datapool editor is suitable for entering small amounts of data and modifying >-individual records but provides no means of generating large amounts of typed >-data. >-</p> >- >-</div> >- >-<div> >-<p> >-<strong>Related concepts</strong><br /> >- <a href="../samples/saccessdp.htm">Tutorial: Creating a datapool driven JUnit test application</a></p> >-</div> >-</body> >-</html> >Index: concepts/cEditingJUnitTests.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/cEditingJUnitTests.htm,v >retrieving revision 1.1 >diff -u -r1.1 cEditingJUnitTests.htm >--- concepts/cEditingJUnitTests.htm 16 Apr 2008 19:32:47 -0000 1.1 >+++ concepts/cEditingJUnitTests.htm 2 Apr 2009 17:28:58 -0000 >@@ -2,7 +2,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2008 IBM Corporation. >+ * Copyright (c) 2008, 2009 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -38,7 +38,7 @@ > <br/> > </li> > <li> >- <a href="../samples/saccessdp.htm">Tutorial: Accessing a datapool from a JUnit test</a> >+ <a href="../samples/saccessdatapool.htm">Tutorial: Accessing a datapool from a TPTP JUnit test</a> > <br/> > </li> > </ul> >Index: concepts/cdeployeditor.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/cdeployeditor.htm,v >retrieving revision 1.8 >diff -u -r1.8 cdeployeditor.htm >--- concepts/cdeployeditor.htm 31 Mar 2009 13:33:18 -0000 1.8 >+++ concepts/cdeployeditor.htm 2 Apr 2009 17:28:58 -0000 >@@ -26,11 +26,11 @@ > > <h1>Deployment Editor</h1> > >-<p>Test deployments are edited using the Deployment editor. The editor contains three tabs:</p> >+<p>Test deployments are edited using the Deployment Editor. The editor contains three tabs:</p> > > <h2>Overview</h2> > >-<p>This tab provides an overview of the test deployment.</p> >+<p>This tab provides an overview of the test deployment, including its general information, artifacts, locations, and tests.</p> > > <p>This tab contains the following sections:</p> > >@@ -41,23 +41,23 @@ > <br/> > </li> > <li> >- <p><b>Test Artifacts</b></p> >+ <p><b>Artifacts</b></p> > <p>Contains links to the test artifacts in the Pairs tab. Clicking a link or the More... button will open the Pairs tab.</p> > <br/> > </li> > <li> >- <p><b>Test Locations</b></p> >+ <p><b>Locations</b></p> > <p>Contains links to the test locations in the Pairs tab. Clicking a link or the More... button will open the Pairs tab.</p> > <br/> > </li> > <li> >- <p><b>Test</b></p> >+ <p><b>Tests</b></p> > <p>Contains the test suites associated with the test artifacts.</p> > <br/> > </li> > </ul> > >-<p>[1] Test deployments have a file name and logical name. The logical name is used in the Test Navigator, dialogs, editors, and wizards to represent the test deployment. >+<p>[1] Test deployments have a file name and logical name. The logical name is used in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, dialogs, editors, and wizards to represent the test deployment. > The file name represents the test deployment file (<i>*.deploy</i>) within the workspace. When the test deployment is created, the logical name defaults to the file name > (excluding the <i>.deploy</i> file extension) and may be modified without modifying the file name. The logical name allows customization of the test deployment name > without affecting the file name within the workspace.</p> >@@ -75,7 +75,7 @@ > <br/> > <p>Test artifacts can be added to the list by clicking the <b>Add...</b> button and selecting the test artifacts or creating a <a href="../tasks/tcreateartifact.htm">new test artifact</a>.</p> > <br/> >- <p>Selected test artifacts can be removed (<b>Remove</b>), moved up (<b>Up</b>), moved down (<b>Down</b>), or opened in the Artifact editor (<b>Open...</b>).</p> >+ <p>Selected test artifacts can be removed (<b>Remove</b>), moved up (<b>Up</b>), moved down (<b>Down</b>), or opened in the Artifact Editor (<b>Open...</b>).</p> > <br/> > </li> > <li> >@@ -84,7 +84,7 @@ > <br/> > <p>Test locations can be added to the list by clicking the <b>Add...</b> button and selecting the test locations or creating a <a href="../tasks/tcreatelocation.htm">new test location</a>.</p> > <br/> >- <p>Selected test locations can be removed (<b>Remove</b>), moved up (<b>Up</b>), moved down (<b>Down</b>), or opened in the Location editor (<b>Open...</b>).</p> >+ <p>Selected test locations can be removed (<b>Remove</b>), moved up (<b>Up</b>), moved down (<b>Down</b>), or opened in the Location Editor (<b>Open...</b>).</p> > <br/> > </li> > <li> >Index: concepts/cedittest.htm >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/concepts/cedittest.htm,v >retrieving revision 1.19 >diff -u -r1.19 cedittest.htm >--- concepts/cedittest.htm 30 May 2008 18:24:27 -0000 1.19 >+++ concepts/cedittest.htm 2 Apr 2009 17:28:58 -0000 >@@ -3,7 +3,7 @@ > <html lang="en-us" xml:lang="en-us"> > <!-- > /********************************************************************** >- * Copyright (c) 2004, 2008 IBM Corporation. >+ * Copyright (c) 2004, 2009 IBM Corporation. > * All rights reserved. This content > * is made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at >@@ -37,7 +37,7 @@ > <div><p>You can inspect and modify a test prior to compiling and running > it.</p> > <p>Note, the test is not yet executable. You can immediately make the test executable >-by right-clicking it in the Test Navigator and selecting <span class="uicontrol">Generate</span>. >+by right-clicking it in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> and selecting <span class="uicontrol">Generate</span>. > Or you can first edit the test by right-clicking it and selecting <span class="uicontrol">Open</span>. </p> > <p> </p> > <p>Open the performance test in the TPTP URL Test editor:</p> >@@ -51,9 +51,9 @@ > the test. Information appearing in boxes can be edited. The <span class="uicontrol">Name</span> box > under <span class="uicontrol">TPTP URL Test</span> displays the name of the > test. You can change the name. If you do, the >-name displayed in the Test Navigator changes also but the filename containing >+name displayed in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> changes also but the filename containing > the test does not change. In this example, the test's name, as listed in the >-Test Navigator and displayed in the <span class="uicontrol">Name</span> box. The tester has decided >+<a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> and displayed in the <span class="uicontrol">Name</span> box. The tester has decided > to change the name to something more descriptive of the task that the test > emulates, <span class="uicontrol">searchEmployeeDB</span>.</p> > <p>The <span class="uicontrol">Source Information</span> area displays the Java package >Index: toc/junit_test_toc.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/toc/junit_test_toc.xml,v >retrieving revision 1.1 >diff -u -r1.1 junit_test_toc.xml >--- toc/junit_test_toc.xml 31 Mar 2009 13:33:18 -0000 1.1 >+++ toc/junit_test_toc.xml 2 Apr 2009 17:28:59 -0000 >@@ -31,7 +31,7 @@ > <topic label="Mapping test methods to a TPTP JUnit test" href="tasks/tptpJUnitTest_testMethods.htm"/> > </topic> > >- <topic label="Tutorial: Accessing a datapool from a JUnit test" href="samples/saccessdp.htm"/> >+ <link toc="toc/test_datapools_toc.xml"/> > </topic> > > <topic label="Running a test" href="tasks/trun.htm"/> >Index: toc/test_datapools_toc.xml >=================================================================== >RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.doc.user/toc/test_datapools_toc.xml,v >retrieving revision 1.1 >diff -u -r1.1 test_datapools_toc.xml >--- toc/test_datapools_toc.xml 31 Mar 2009 13:33:18 -0000 1.1 >+++ toc/test_datapools_toc.xml 2 Apr 2009 17:28:59 -0000 >@@ -14,13 +14,15 @@ > --> > <?NLS TYPE="org.eclipse.help.toc"?> > <toc label="Providing tests with variable data"> >- >- <topic label="Providing tests with variable data" href="tasks/tdatapool.htm"> >- >- <topic label="Datapool structure" href="concepts/cdatapools.htm"/> >- <topic label="Creating a datapool" href="tasks/tcreatedp.htm"/> >- <topic label="Opening a datapool" href="tasks/topendp.htm"/> >- <topic label="Editing a datapool" href="tasks/teditdp.htm"/> >- <topic label="Tutorial: Accessing a datapool from a JUnit test" href="samples/saccessdp.htm"/> >+ >+ <topic label="Providing tests with variable data" href="tasks/tdatapoolsintro.htm"> >+ >+ <topic label="Creating a datapool" href="tasks/tcreatedatapool.htm"> >+ <topic label="Datapool Editor" href="concepts/cdatapooleditor.htm"/> >+ <topic label="Importing a Comma-Separated Value (CSV) file as a datapool" href="tasks/cdatapoolimport.htm"/> >+ <topic label="Exporting a datapool as a Comma-Separated Value (CSV) file" href="tasks/cdatapoolexport.htm"/> >+ </topic> >+ >+ <topic label="Tutorial: Accessing a datapool from a TPTP JUnit test" href="samples/saccessdatapool.htm"/> > </topic> > </toc> >\ No newline at end of file >Index: samples/saccessdp.htm >=================================================================== >RCS file: samples/saccessdp.htm >diff -N samples/saccessdp.htm >--- samples/saccessdp.htm 23 Dec 2008 20:27:08 -0000 1.17 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,425 +0,0 @@ >-<!DOCTYPE html >- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >-<html lang="en-us" xml:lang="en-us"> >-<!-- >-/********************************************************************** >- * Copyright (c) 2004, 2008 IBM Corporation. >- * All rights reserved. This content is 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 >- * $Id: saccessdp.htm,v 1.17 2008/12/23 20:27:08 paules Exp $ >- * >- * Contributors: >- * IBM - Initial contribution >- **********************************************************************/ >- --> >- >-<head> >-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<meta name="security" content="public" /> >-<meta name="Robots" content="index,follow" /> >-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' /> >-<meta name="DC.Type" content="task" /> >-<meta name="DC.Title" content="Accessing a datapool from a Hyades test" /> >-<meta name="abstract" content="You can use a datapool from a Hyades test by making calls to the datapool API from a test's generated Java code." /> >-<meta name="description" content="You can use a datapool from a Hyades test by making calls to the datapool API from a test's generated Java code." /> >-<meta name="DC.Relation" scheme="URI" content="../tasks/tdatapool.dita" /> >-<meta name="DC.Format" content="XHTML" /> >-<meta name="DC.Identifier" content="taccessdp" /> >-<meta name="DC.Language" content="en-us" /> >-<link rel="stylesheet" type="text/css" href="../css/ibmdita.css" /> >-<link rel="stylesheet" type="text/css" href="../css/swg_info_common.css" /> >-<title>Tutorial: Accessing a datapool from a JUnit test</title> >-</head> >-<body> >- >-<h1 class="topictitle1">Tutorial: Accessing a datapool from a JUnit test</h1> >-<div> >-<h2><br /> >-Objectives:</h2> >-<p>To create and access a datapool from an example test application using the Eclipse Test and >-Performance Tools Platform (TPTP). </p><h2> >-Time required</h2> >-<p>1 hour</p> >-<h2><strong><a name="BeforeYouBegin">Before you begin</a></strong></h2> >-<p><span>Before you start this tutorial, >-you need to <span> </span></span></p> >-<ol> >- <li> >- <span><span>Install Eclipse and the Eclipse Test and Performance Tools >- Platform (TPTP).</span></span></li> >- <li>Have a basic understanding of JUnit testing. For more information about JUnit testing, see <a >- href="http://www.junit.org">www.junit.org</a>.</li> >- <li>Configure and run the Agent Controller which corresponds to your TPTP version. For more information, see <a >- href="http://www.eclipse.org/tptp/home/downloads/installguide/HyadesDataCollection.html"> >- Getting started with the Agent Controller</a>.<br /> >- </li></ol> >-<h2><br /> >-<strong>Description</strong></h2> >-<p><span>In this tutorial, >-you create and test an application called MyShoppingCart. Using the Eclipse Test and Performance Tools Platform (TPTP), you develop JUnit tests and create a datapool to provide data to the test environment.<br /></span><br /> >-This tutorial guides you through the following procedures:</p> >-<ol> >- <li><a href="#CreateUserApp">Creating a sample user application</a></li> >- <li><a href="#SetupTestApp" target="_self">Setting up a TPTP test >- suite</a></li> >- <li><a href="#CreateDatapool">Creating a datapool and initializing test >- data</a></li> >- <li><a href="#ModifyTestCasesDP">Modifying test cases to reference a >- datapool</a><br /> >- </li> >-</ol> >- >- >-<h2><a name="CreateUserApp">Creating a sample user application</a></h2><br /> >-In this procedure, you develop the MyShoppingCart class. In subsequent procedures, you will use the Eclipse Test and Performance Tools Platform to develop a corresponding test environment.<br /><ol> >- <li>Create a new Eclipse Java Project. <ul> >- <li>From the File menu choose <b>File > New > Project...</b> The >- New Project dialog appears.</li> >- <li>In the Wizards list, select <b>Java Project</b> and click <b>Next</b>. >- The Create a Java project page appears.</li> >- <li>Type <tt>datapoolExample</tt> for the Project name and click <b>Finish</b>. >- The datapoolExample project appears in the Navigator view.<br /> >- </li> >- </ul> >- </li> >- <li>Create the MyShoppingCart class.<ul> >- <li>In the Navigator view, right-click the <b>datapoolExample</b> >- project and choose <b>New > Class</b>. The New Java Class dialog >- appears.</li> >- <li>Type <tt>MyShoppingCart</tt> in the <b>Name</b> field.</li> >- <li>Clear the option to create the main method <b>public static void >- main(String[] args)</b>.</li> >- <li>Click Finish. The MyShoppingCart.java file appears in the Java >- editor.</li> >- <li>Type the following for the MyShoppingCart source:<pre> >-import java.util.Hashtable; >- >-public class MyShoppingCart { >- >- public Hashtable myFlowers; >- >- public MyShoppingCart() { >- >- myFlowers = new Hashtable(); >- myFlowers.put("Orchid", new Double(5.99)); >- myFlowers.put("Tulip", new Double(1.99)); >- myFlowers.put("Yellow Carnation", new Double(6.99)); >- myFlowers.put("White Rose", new Double(9.99)); >- myFlowers.put("Geraniums", new Double(4.99)); >- } >- >- public double itemCost(String itemName, int itemQuantity) >- { >- Double price = (Double)myFlowers.get(itemName); >- >- if (price != null) { >- return price.doubleValue()*itemQuantity; >- } >- >- return -1; >- } >-}</pre></li> >- <li>Save MyShoppingCart.java. From the File menu choose <b>File > >- Save</b>.</li> >- </ul> >- </li> >-</ol> >-<h2><a name="SetupTestApp">Setting up a TPTP test suite</a></h2> >-<br /> In this procedure, you develop a test suite for the the MyShoppingCart class. Using the Eclipse Test and Performance Tools Platform, you develop a JUnit >- test for the itemCost method.<br /><ol> >- <li>Open the Test Perspective. >- <ul> >- <li>From the File menu, choose <b>Window > Open Perspective > >- Other</b>.</li> >- <li>Select <b>Test</b> and click <b>OK</b>. The Test Navigator appears.</li> >- </ul> >- </li> >- <li>Create a new TPTP JUnit Test.<ul> >- <li>In the Test Navigator, right-click the datapoolExample project and choose <b>New >- > Test Element...</b></li> >- <li>In the Test Element dialog, select <b>TPTP JUnit test</b> and click <b>Next</b>. The New Test Case dialog appears, prompting you to add JUnit libraries. Click <b>Yes</b> to add JUnit libraries.</li> >- <li> In the New JUnit Test Source Code page, type <b>MyShoppingCartTest</b> in the <b>Name</b> field. In the <b>Select how the test behavior is edited</b> section, choose the edit <b>In >- the test editor</b> option (the default).</li> >- <li>Click<b> Finish</b>. The TPTP JUnit Test editor appears, showing the >- MyShoppingCartTest test suite. The Overview tab includes a test description, Source Information, and a Test Methods listing. Currently, no test methods are defined. For this tutorial, the TPTP JUnit Test editor generates method stubs so the <b>Implement >- Test Behavior as code</b> option in the <b>Source Information</b> section should be cleared. For more information, see >- <a href="../concepts/cJUnitTestEditor.htm">JUnit Test Suite Editor</a>.</li> >- </ul> >- >- </li> >- <li>Add the testItemCost and testMyShoppingCartConstructor methods. >- <ul> >- <li>In the Test Methods tab, click Add. A default name appears for your test.</li> >- <li>Add the testItemCost method. In the Name field, type <b>testItemCost</b> for the new test name. In the Description field, type <b>Test >- for the MyShoppingCart.itemCost(String, int) method</b>.</li> >- <li>Add the testMyShoppingCartConstructor method. In the Test Methods tab, click Add. In the Name field, type <b>testMyShoppingCartConstructor</b> for the new test name. In the Description field, type <b>Test >- for the MyShoppingCart constructor</b>.</li> >- </ul> >- </li> >- <li>Configure the test execution behavior. >- <ul> >- <li>Add a test execution loop. In the Behavior tab, click <b>Add.. >- > Loop</b>. In the Name field, type <b>Loop_MyShoppingCart</b>. In >- the Number of Iterations field, type <b>1</b> (the default value).</li> >- <li>Add a testMyShoppingCartConstructor invocation. Select >- Loop_MyShoppingCart and click <b>Add... > invocation</b>. The Test Invocation >- dialog appears. Select Select <b>testMyShoppingCartConstructor</b> and >- click OK.</li> >- <li>Add a testItemCost invocation. Select >- Loop_MyShoppingCart and click <b>Add... > invocation</b>. The Test >- Invocation dialog appears. Select <b>testItemCost</b> and click OK.</li> >- <li>Save the test suite. From the File menu, choose <b>File > Save</b>. >- <br /> >- <img border="0" src="../images/testTutorial_Behavior.gif" width="534" >- height="407" alt=""/> <br /> >- Note: the Save command causes the TPTP JUnit Test editor to create >- test method stubs in MyShoppingCartTest.java<i></i>.<br /> >- </li> >- </ul> >- </li> >- <li> >- Enter code for the generated JUnit test methods testMyShoppingCartConstructor and testItemCost.<ul> >- <li>Open the Java Perspective. From the file menu choose <b>Window >- > Open Perspective > Other... > Java</b>.</li> >- <li>Open MyShoppingCartTest.java. In the Navigator, open the datapoolExample project folder and double-click MyShoppingCartTest.java. The MyShoppingCartTest.java contents appear in the Java editor, including code to setup and execute the test suite, and stub methods for testMyShoppingCartConstructor and testItemCost.</li> >- <li>Type the following code for the testMyShoppingCartConstructor method.<pre>public void testMyShoppingCartConstructor() >-throws Exception >-{ >- MyShoppingCart cart = new MyShoppingCart(); >- Double priceOrchid = (Double)cart.myFlowers.get("Orchid"); >- Double priceTulip = (Double)cart.myFlowers.get("Tulip"); >- >- assertTrue(priceOrchid.doubleValue() == 5.99); >- assertTrue(priceTulip.doubleValue() == 1.99); >-}</pre></li> >- <li>Type the following code for the testItemCost method. >-<pre>public void testItemCost() >-throws Exception >-{ >- MyShoppingCart cart = new MyShoppingCart(); >- double priceForTwo = cart.itemCost("Orchid", 2); >- >- assertTrue(priceForTwo == 11.98); >-}</pre> >-</li><li>Save MyShoppingCartTest.java. From the file menu, choose <b>File >- > Save</b>.</li></ul></li><li>Open the Test Perspective and create a test deployment. For an example, see <a href="../tasks/tdeploymentintro.htm">Creating a >- Test Deployment</a>.<br/></li> >- <li> >- Run the test using your custom deployment.<ul> >- <li>In the Test Navigator, right-click the MyShoppingCartTest test suite and choose <b>Run >- As > Run...</b>. The Run configuration dialog appears.</li> >- <li>In the Configurations pane, select <b>Test</b> and then click <b>New</b>.</li> >- <li>In the left pane of the Run configuration (<b>Select test to run</b>), expand datapoolExample and choose the MyShoppingCartTest test suite.</li> >- <li>In the right pane of the Run configuration, select the deployment you created section. </li> >- <li>In the Test Logs tab, clear the <b>Use defaults</b> option and >- select the datapoolExample project folder for the location.</li> >- <li>Click <b>Run</b> to launch the test.</li> >- </ul></li> >- <li>Double-click the MyShoppingCartTest test log, which appears in the Test Navigator. The MyShoppingCartTest test log appears. Select the Events tab to view the test details. You should see the following events: start of test suite, start of Loop_MyShoppingCart, test start, test verdict, test stop, second test start, second test verdict, second test stop, loop stop, test suite verdict, and test suite stop.<br /> >- <img border="0" src="../images/testTutorial_JUnitSuccess.gif" >- width="666" height="420" alt=""/></li></ol><br /> >-<h2><a name="CreateDatapool">Creating a datapool and initializing test >-data</a></h2> >-<br />In this procedure, you create a simple datapool to store test data. Using the datapool editor, you define a datapool's structural >- elements, including variables (columns), records (rows), and >- equivalence classes (groups of related records).<br /><ol> >- <li>Create a CSV (comma delimited) file including your test data. Typically, you can export data in a spreadsheet application or database to CSV format. In this tutorial, however, you type the data in a text editor. >- <ul> >- <li>Type the following in a text editor. <pre> >-,ModelNumber::String,Description::String,Price::Double >-flowers,F0001,Orchid,5.99 >-flowers,F0002,Tulip,1.99 >-flowers,F0003,Yellow Carnation,6.99 >-flowers,F0004,White Rose,9.99 >-flowers,F0005,Geraniums,4.99</pre> >-</li><li>Save the file as flowerData.csv in a temporary external location.</li> >- </ul> >- </li> >- >- <li class="skipspace"><span>In Eclipse, open the Test perspective.</span> >- <ul> >- <li>From the File menu, choose <b>Window > Open Perspective > >- Other</b>.</li> >- <li>Select <b>Test</b> and click <b>OK</b>. The Test Navigator >- appears.</li> >- </ul> >- </li> >- <li class="skipspace"><span>In the Test Navigator, right-click a >- project and select <span class="uicontrol">New > Test Elemen<b>t</b></span><b>...</b> >- The <span class="uicontrol">New Test Element </span> dialog appears.</span></li> >- <li class="skipspace"><span>In the Wizards list box, expand the <span >- class="uicontrol">Test Assets</span> folder and select <span >- class="uicontrol">Datapool</span>.</span></li> >- <li class="skipspace"><span>Click <b>Next</b>. The <span >- class="uicontrol">New Datapool</span> dialog appears.</span></li> >- <li class="skipspace"><span>Choose the datapool project folder and >- datapool name. In the list of existing projects, select the >- <b>datapoolExample</b> project. In the <span class="uicontrol">Name</span> >- field, type shoppingCartDatapool.</span> Click <b>Next</b> to >- continue and then <b>Next</b> again to open the CSV (comma delimited) file import page.</li> >- <li class="skipspace">Import the >- CSV file flowerData.csv.<ul> >- <li><span>In the <span class="uicontrol">CSV File</span> field, click <span class="uicontrol">Browse</span> >- and navigate to flowerData.csv.</span></li> >- <li><span>Check the <span class="uicontrol">First row >- contains variable names and suggested types</span></span> option. The first row of flowerData.csv contains column headings and types.</li> >- <li>Check the <span><span class="uicontrol">First column contains >- equivalence class names</span></span> option. Equivalence classes group related data. The first column of flowerData.csv specifies a single equivalence class called flowers.</li></ul> >- </li> >- <li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span> If you specified initial datapool dimensions, which may conflict with the CSV file dimensions, a dialog appears. Click <b>Yes</b> to use the dimensions of the CSV file. Click <b>No</b> to use the specified initial dimensions (and possibly truncate the CSV file data).<span> >- </span>The Datapool editor appears, showing the data contained in the flowers equivalence class. <br /> >- <img >- border="0" src="../images/testTutorial_datapoolAppears.gif" >- width="354" height="416" alt=""/> >- <br />For detailed information about creating a datapool, see <a >- href="../tasks/tcreatedp.htm">Creating a datapool</a>.</li> >-</ol> >-<h2><a name="ModifyTestCasesDP"><br /> >-Modifying test cases to reference a >-datapool</a></h2> >-<br />In this procedure, you use the datapool API to replace hard-coded test values with >- references to datapool columns. >- >-<h3>Adding libraries required by the datapool API</h3>The datapool API requires various TPTP and Eclipse Modeling Framework (EMF) libraries. In this procedure, you add the libraries to your Java build path.<br /> >-<ol> >- <li>Open the Java Perspective. From the file menu choose <b>Window > >- Open Perspective > Java</b>.</li> >- <li>Open the <b>datapoolExample</b> project properties. In the Navigator or Package Explorer window, right-click the <b>datapoolExample</b> project folder and choose <b>Properties</b>. The Properties for <b>datapoolExample</b> dialog appears.</li> >- <li>Add the following library JARs to the Java build path of the <b>datapoolExample</b> project: >- >- <p> >- <ul> >- <li><b><i>org.eclipse.tptp.platform.models_<version>/tptp-models.jar</i></b></li> >- <li><b><i>org.eclipse.tptp.platform.models.hierarchy_<version>/tptp-models-hierarchy.jar</i></b></li> >- <li><b><i>org.eclipse.emf.common_<version>.jar</i></b></li> >- <li><b><i>org.eclipse.emf.ecore_<version>.jar</i></b></li> >- <li><b><i>org.eclipse.emf.ecore.xmi_<version>.jar</i></b></li> >- <li><b><i>org.eclipse.equinox.common_<version>.jar</i></b></li> >- </ul> >- </p> >- >- <p>where <b><i><version></i></b> is the current version of the library JAR.</p> >- >- <p>Steps:</p> >- >- <ul> >- <li>In the left pane, select <b>Java Build Path</b>. </li> >- <li>In the right pane, select the <b>Libraries</b> tab. </li> >- <li>For each of the library JARs, complete the following steps: >- >- <ul> >- <li>If the library JAR is on the Java build path of the <b>datapoolExample</b> project, continue to the next library JAR. Otherwise, continue to the next step.</li> >- <li>Click <b>Add External JARs...</b>.</li> >- <li>Navigate to the directory containing the library JAR and select the JAR file. The library JAR is contained in the same directory as the dependencies under the <b>TPTP Libraries</b> or <b>JUnit 3</b> classpath container for the <b>datapoolExample</b> project. </li> >- <li>Click <b>Open</b>.</li> >- </ul> >- </li> >- </ul> >- </li> >- <li>Click <b>OK</b> to close the Properties dialog.</li> >-</ol><h3><br /> >-Using the datapool API</h3>In this procedure, you modify the MyShoppingCartTest class and testMyShoppingCartConstructor method to utilize the <span> >-shoppingCartDatapool</span>. >-<br /> >-<ol> >- <li>If required, open the Java Perspective. From the file menu choose <b>Window > >- Open Perspective > Java</b>.</li> >- <li>Open MyShoppingCartTest.java. In the Navigator, open the >- datapoolExample project folder and double-click >- MyShoppingCartTest.java. The MyShoppingCartTest.java contents >- appear in the Java editor.</li> >- <li>Add the following import statements to the MyShoppingCartTest class.<pre>import org.eclipse.hyades.execution.runtime.datapool.IDatapool; >-import org.eclipse.hyades.execution.runtime.datapool.IDatapoolFactory; >-import org.eclipse.hyades.execution.runtime.datapool.IDatapoolIterator; >-import org.eclipse.hyades.models.common.datapool.impl.Common_DatapoolFactoryImpl;</pre></li> >- <li>Declare an IDatapoolIterator class instance. This class instance will be initialized in your set up code and used in test methods.<pre>public class MyShoppingCartTest extends HyadesTestCase { >- >- IDatapoolIterator dpIterator; >- >- //...</pre></li> >- <li>Modify the setUp method to initialize your datapool. In a TPTP JUnit test environment, the setUp method provides a common fixture. You can use setUp to initialize common test variables. <b>Note:</b> specify your fully qualified workspace path in place of <b><workspace></b> in the java.io.File constructor.<pre>protected void setUp() throws Exception { >- // Initialize the datapool factory >- IDatapoolFactory dpFactory = new Common_DatapoolFactoryImpl(); >- >- // Load the shoppingCartDatapool datapool >- IDatapool datapool = dpFactory.load( >- new java.io.File("<b><workspace></b>\\datapoolExample\\shoppingCartDatapool.datapool"), >- false); >- >- // Create an iterator to traverse the datapool >- dpIterator = dpFactory.open(datapool,"org.eclipse.hyades.datapool.iterator.DatapoolIteratorSequentialPrivate"); >- >- // Initialize the datapool to traverse the first equivalence class. >- dpIterator.dpInitialize(datapool,0); >-}</pre><b>Notes: </b> >- <ul> >- <li>The second parameter in the IDatapoolFactory load method indicates if the datapool instance is shared. If true the datapool cache is checked for an existing copy of the datapool. If false, the datapool is a private instance. Modifying a shared datapool instance may affect other users, and is only recommended for confined environments.</li> >- <li>If you want to programmatically edit a datapool import org.eclipse.hyades.edit.datapool.</li> >- <li>The second parameter in the IDatapoolFactory open method represents the type of iterator. For shared datapools use DatapoolIteratorSequentialPrivate.</li> >- </ul> >- </li><li>Modify the testMyShoppingCartConstructor method to utilize the <span> >- shoppingCartDatapool</span>. >-<pre>public void testMyShoppingCartConstructor() >-throws Exception >-{ >- MyShoppingCart cart = new MyShoppingCart(); >- >- // Traverse through datapool... >- // Test if constructor initializes each flower record appropriately >- while(!dpIterator.dpDone()) >- { >- String Description = dpIterator.dpCurrent().getCell("Description").getStringValue(); >- double datapoolPrice = dpIterator.dpCurrent().getCell("Price").getDoubleValue(); >- >- // Test if the flower is accounted for in the application >- Double applicationPrice; >- assertNotNull(applicationPrice = (Double)cart.myFlowers.get(Description)); >- >- // Test that the application price equals the price in the datapool >- assertTrue(applicationPrice.doubleValue() == datapoolPrice); >- >- dpIterator.dpNext(); >- } >-}</pre></li><li>Save MyShoppingCartTest.java. From the file menu, choose <b>File >- > Save</b>.</li> >- <li>Add the datapool to your testArtifact. >- <ul> >- <li>Open the Test Perspective. In the Test Navigator, double-click testDeployment to open it in the editor.</li> >- <li>In the <b>Pairs</b> tab, select testAsset and click <b>Open...</b></li> >- <li>In the <b>Test Assets</b> tab, click <b>Add...</b>. Select the datapool and click <b>OK</b>. Save the asset.</li> >- </ul> >- </li> >- <li>Run the test using your custom deployment.<ul> >- <li>Open the Test Perspective. In the Test Navigator, right-click the MyShoppingCartTest test suite and choose <b>Run >- As > Run...</b>. The Run configuration dialog appears.</li> >- <li>In the left pane of the Run configuration, choose the MyShoppingCartTest test suite.</li> >- <li>In the right pane of the Run configuration, select the deployment you created in the <a >- href="#BeforeYouBegin">Before You Begin</a> section. </li> >- <li>In the Test Logs tab, clear the <b>Use defaults option</b> and >- select the datapoolExample project folder for the location.</li> >- <li>Click <b>Run</b> to launch the test.</li> >- </ul></li> >- <b>Notes: </b> >- <ul> >- <li>If the deployment you select contains any encrypted datapools, a dialog will be shown after you have launched the test to require the password for each encrypted datapool that contained in the deployment.</li> >- </ul> >- <li>Double-click the new MyShoppingCartTest test log, which appears in the Test Navigator. The MyShoppingCartTest test log appears. Select the Events tab to view the test result details.</li></ol> >-</div><div><p> >-<br /> >-<b>Related concepts</b> >-<br /> >-<a href="../concepts/ccommontestingtasksandconcepts.htm">Common testing >-tasks and concepts</a><br /> >-<br /> >-<b>Related tasks</b> <br /> >-<a href="../tasks/tdeploymentintro.htm">Creating a Test Deployment</a><br /> >-<a href="../tasks/tdatapool.htm">Providing tests with variable data</a> >-<br /> >-<a href="../tasks/tptpJUnitTest_creatingManually.htm">Creating a JUnit >-test manually</a><br /> >- </p> >-</div> >-</body> >-</html> >Index: samples/saccessdatapool.htm >=================================================================== >RCS file: samples/saccessdatapool.htm >diff -N samples/saccessdatapool.htm >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ samples/saccessdatapool.htm 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,419 @@ >+<!DOCTYPE html >+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >+<html lang="en-us" xml:lang="en-us"> >+<!-- >+/********************************************************************** >+ * Copyright (c) 2009 IBM Corporation. >+ * All rights reserved. This content is 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 >+ * $Id$ >+ * >+ * Contributors: >+ * IBM - Initial contribution >+ **********************************************************************/ >+ --> >+ >+<head> >+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >+<meta name="security" content="public" /> >+<meta name="Robots" content="index,follow" /> >+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' /> >+<meta name="DC.Type" content="task" /> >+<meta name="DC.Title" content="Accessing a datapool from a Hyades test" /> >+<meta name="abstract" content="You can use a datapool from a Hyades test by making calls to the datapool API from a test's generated Java code." /> >+<meta name="description" content="You can use a datapool from a Hyades test by making calls to the datapool API from a test's generated Java code." /> >+<meta name="DC.Relation" scheme="URI" content="../tasks/tdatapool.dita" /> >+<meta name="DC.Format" content="XHTML" /> >+<meta name="DC.Identifier" content="taccessdp" /> >+<meta name="DC.Language" content="en-us" /> >+<link rel="stylesheet" type="text/css" href="../css/ibmdita.css" /> >+<link rel="stylesheet" type="text/css" href="../css/swg_info_common.css" /> >+<title>Tutorial: Accessing a datapool from a TPTP JUnit test</title> >+</head> >+<body> >+ >+<h1 class="topictitle1">Tutorial: Accessing a datapool from a TPTP JUnit test</h1> >+<div> >+<h2><br /> >+Objectives:</h2> >+<p>To create and access a datapool from an example test application using the Eclipse Test and >+Performance Tools Platform (TPTP). </p><h2> >+Time required</h2> >+<p>1 hour</p> >+<h2><strong><a name="BeforeYouBegin">Before you begin</a></strong></h2> >+<p><span>Before you start this tutorial, >+you need to <span> </span></span></p> >+<ol> >+ <li> >+ <span><span>Install Eclipse and the Eclipse Test and Performance Tools >+ Platform (TPTP).</span></span></li> >+ <li>Have a basic understanding of JUnit testing. For more information about JUnit testing, see <a >+ href="http://www.junit.org">www.junit.org</a>.</li> >+ <li>Configure and run the Agent Controller which corresponds to your TPTP version. For more information, see <a >+ href="http://www.eclipse.org/tptp/home/downloads/installguide/HyadesDataCollection.html"> >+ Getting started with the Agent Controller</a>.<br /> >+ </li></ol> >+<h2><br /> >+<strong>Description</strong></h2> >+<p><span>In this tutorial, >+you create and test an application called MyShoppingCart. Using the Eclipse Test and Performance Tools Platform (TPTP), you develop JUnit tests and create a datapool to provide data to the test environment.<br /></span><br /> >+This tutorial guides you through the following procedures:</p> >+<ol> >+ <li><a href="#CreateUserApp">Creating a sample user application</a></li> >+ <li><a href="#SetupTestApp" target="_self">Setting up a TPTP test >+ suite</a></li> >+ <li><a href="#CreateDatapool">Creating a datapool and initializing test >+ data</a></li> >+ <li><a href="#ModifyTestCasesDP">Modifying test cases to reference a >+ datapool</a><br /> >+ </li> >+</ol> >+ >+ >+<h2><a name="CreateUserApp">Creating a sample user application</a></h2><br /> >+In this procedure, you develop the MyShoppingCart class. In subsequent procedures, you will use the Eclipse Test and Performance Tools Platform to develop a corresponding test environment.<br /><ol> >+ <li>Create a new Eclipse Java Project. <ul> >+ <li>From the File menu choose <b>File > New > Project...</b> The >+ New Project dialog appears.</li> >+ <li>In the Wizards list, select <b>Java Project</b> and click <b>Next</b>. >+ The Create a Java project page appears.</li> >+ <li>Type <tt>datapoolExample</tt> for the Project name and click <b>Finish</b>. >+ The datapoolExample project appears in the Navigator view.<br /> >+ </li> >+ </ul> >+ </li> >+ <li>Create the MyShoppingCart class.<ul> >+ <li>In the Navigator view, right-click the <b>datapoolExample</b> >+ project and choose <b>New > Class</b>. The New Java Class dialog >+ appears.</li> >+ <li>Type <tt>MyShoppingCart</tt> in the <b>Name</b> field.</li> >+ <li>Clear the option to create the main method <b>public static void >+ main(String[] args)</b>.</li> >+ <li>Click Finish. The MyShoppingCart.java file appears in the Java >+ editor.</li> >+ <li>Type the following for the MyShoppingCart source:<pre> >+import java.util.Hashtable; >+ >+public class MyShoppingCart { >+ >+ public Hashtable myFlowers; >+ >+ public MyShoppingCart() { >+ >+ myFlowers = new Hashtable(); >+ myFlowers.put("Orchid", new Double(5.99)); >+ myFlowers.put("Tulip", new Double(1.99)); >+ myFlowers.put("Yellow Carnation", new Double(6.99)); >+ myFlowers.put("White Rose", new Double(9.99)); >+ myFlowers.put("Geraniums", new Double(4.99)); >+ } >+ >+ public double itemCost(String itemName, int itemQuantity) >+ { >+ Double price = (Double)myFlowers.get(itemName); >+ >+ if (price != null) { >+ return price.doubleValue()*itemQuantity; >+ } >+ >+ return -1; >+ } >+}</pre></li> >+ <li>Save MyShoppingCart.java. From the File menu choose <b>File > >+ Save</b>.</li> >+ </ul> >+ </li> >+</ol> >+<h2><a name="SetupTestApp">Setting up a TPTP test suite</a></h2> >+<br /> In this procedure, you develop a test suite for the the MyShoppingCart class. Using the Eclipse Test and Performance Tools Platform, you develop a JUnit >+ test for the itemCost method.<br /><ol> >+ <li>Open the Test Perspective. >+ <ul> >+ <li>From the File menu, choose <b>Window > Open Perspective > >+ Other</b>.</li> >+ <li>Select <b>Test</b> and click <b>OK</b>. The <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> appears.</li> >+ </ul> >+ </li> >+ <li>Create a new TPTP JUnit Test.<ul> >+ <li>In the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click the datapoolExample project and choose <b>New >+ > Test Element...</b></li> >+ <li>In the Test Element dialog, select <b>TPTP JUnit test</b> and click <b>Next</b>. The New Test Case dialog appears, prompting you to add JUnit libraries. Click <b>Yes</b> to add JUnit libraries.</li> >+ <li> In the New JUnit Test Source Code page, type <b>MyShoppingCartTest</b> in the <b>Name</b> field. In the <b>Select how the test behavior is edited</b> section, choose the edit <b>In >+ the test editor</b> option (the default).</li> >+ <li>Click<b> Finish</b>. The TPTP JUnit Test editor appears, showing the >+ MyShoppingCartTest test suite. The Overview tab includes a test description, Source Information, and a Test Methods listing. Currently, no test methods are defined. For this tutorial, the TPTP JUnit Test editor generates method stubs so the <b>Implement >+ Test Behavior as code</b> option in the <b>Source Information</b> section should be cleared. For more information, see >+ <a href="../concepts/cJUnitTestEditor.htm">JUnit Test Suite Editor</a>.</li> >+ </ul> >+ >+ </li> >+ <li>Add the testItemCost and testMyShoppingCartConstructor methods. >+ <ul> >+ <li>In the Test Methods tab, click Add. A default name appears for your test.</li> >+ <li>Add the testItemCost method. In the Name field, type <b>testItemCost</b> for the new test name. In the Description field, type <b>Test >+ for the MyShoppingCart.itemCost(String, int) method</b>.</li> >+ <li>Add the testMyShoppingCartConstructor method. In the Test Methods tab, click Add. In the Name field, type <b>testMyShoppingCartConstructor</b> for the new test name. In the Description field, type <b>Test >+ for the MyShoppingCart constructor</b>.</li> >+ </ul> >+ </li> >+ <li>Configure the test execution behavior. >+ <ul> >+ <li>Add a test execution loop. In the Behavior tab, click <b>Add.. >+ > Loop</b>. In the Name field, type <b>Loop_MyShoppingCart</b>. In >+ the Number of Iterations field, type <b>1</b> (the default value).</li> >+ <li>Add a testMyShoppingCartConstructor invocation. Select >+ Loop_MyShoppingCart and click <b>Add... > invocation</b>. The Test Invocation >+ dialog appears. Select Select <b>testMyShoppingCartConstructor</b> and >+ click OK.</li> >+ <li>Add a testItemCost invocation. Select >+ Loop_MyShoppingCart and click <b>Add... > invocation</b>. The Test >+ Invocation dialog appears. Select <b>testItemCost</b> and click OK.</li> >+ <li>Save the test suite. From the File menu, choose <b>File > Save</b>. >+ <br /> >+ <img border="0" src="../images/testTutorial_Behavior.gif" width="534" >+ height="407" alt=""/> <br /> >+ Note: the Save command causes the TPTP JUnit Test editor to create >+ test method stubs in <i>MyShoppingCartTest.java</i>.<br /> >+ </li> >+ </ul> >+ </li> >+ <li> >+ Enter code for the generated JUnit test methods testMyShoppingCartConstructor and testItemCost.<ul> >+ <li>Open the Java Perspective. From the file menu choose <b>Window >+ > Open Perspective > Other... > Java</b>.</li> >+ <li>Open MyShoppingCartTest.java. In the Navigator, open the datapoolExample project folder and double-click MyShoppingCartTest.java. The MyShoppingCartTest.java contents appear in the Java editor, including code to setup and execute the test suite, and stub methods for testMyShoppingCartConstructor and testItemCost.</li> >+ <li>Type the following code for the testMyShoppingCartConstructor method.<pre>public void testMyShoppingCartConstructor() >+throws Exception >+{ >+ MyShoppingCart cart = new MyShoppingCart(); >+ Double priceOrchid = (Double)cart.myFlowers.get("Orchid"); >+ Double priceTulip = (Double)cart.myFlowers.get("Tulip"); >+ >+ assertTrue(priceOrchid.doubleValue() == 5.99); >+ assertTrue(priceTulip.doubleValue() == 1.99); >+}</pre></li> >+ <li>Type the following code for the testItemCost method. >+<pre>public void testItemCost() >+throws Exception >+{ >+ MyShoppingCart cart = new MyShoppingCart(); >+ double priceForTwo = cart.itemCost("Orchid", 2); >+ >+ assertTrue(priceForTwo == 11.98); >+}</pre> >+</li><li>Save MyShoppingCartTest.java. From the file menu, choose <b>File >+ > Save</b>.</li></ul></li><li>Open the Test Perspective and create a test deployment. For an example, see <a href="../tasks/tdeploymentintro.htm">Creating a >+ Test Deployment</a>.<br/></li> >+ <li> >+ Run the test using your custom deployment.<ul> >+ <li>In the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click the MyShoppingCartTest test suite and choose <b>Run >+ As > Run...</b>. The Run configuration dialog appears.</li> >+ <li>In the Configurations pane, select <b>Test</b> and then click <b>New</b>.</li> >+ <li>In the left pane of the Run configuration (<b>Select test to run</b>), expand datapoolExample and choose the MyShoppingCartTest test suite.</li> >+ <li>In the right pane of the Run configuration, select the deployment you created section. </li> >+ <li>In the Test Logs tab, clear the <b>Use defaults</b> option and >+ select the datapoolExample project folder for the location.</li> >+ <li>Click <b>Run</b> to launch the test.</li> >+ </ul></li> >+ <li>Double-click the MyShoppingCartTest test log, which appears in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>. The MyShoppingCartTest test log appears. Select the Events tab to view the test details. You should see the following events: start of test suite, start of Loop_MyShoppingCart, test start, test verdict, test stop, second test start, second test verdict, second test stop, loop stop, test suite verdict, and test suite stop.<br /> >+ <img border="0" src="../images/testTutorial_JUnitSuccess.gif" >+ width="666" height="420" alt=""/></li></ol><br /> >+<h2><a name="CreateDatapool">Creating a datapool and initializing test >+data</a></h2> >+<br />In this procedure, you create a simple datapool to store test data. Using the datapool editor, you define a datapool's structural >+ elements, including variables (columns), records (rows), and >+ equivalence classes (groups of related records).<br /><ol> >+ <li>Create a CSV (comma delimited) file including your test data. Typically, you can export data in a spreadsheet application or database to CSV format. In this tutorial, however, you type the data in a text editor. >+ <ul> >+ <li>Type the following in a text editor. <pre> >+,ModelNumber::String,Description::String,Price::Double >+flowers,F0001,Orchid,5.99 >+flowers,F0002,Tulip,1.99 >+flowers,F0003,Yellow Carnation,6.99 >+flowers,F0004,White Rose,9.99 >+flowers,F0005,Geraniums,4.99</pre> >+</li><li>Save the file as flowerData.csv in a temporary external location.</li> >+ </ul> >+ </li> >+ >+ <li class="skipspace"><span>In Eclipse, open the Test perspective.</span> >+ <ul> >+ <li>From the File menu, choose <b>Window > Open Perspective > >+ Other</b>.</li> >+ <li>Select <b>Test</b> and click <b>OK</b>. The <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a> >+ appears.</li> >+ </ul> >+ </li> >+ <li class="skipspace"><span>In the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click a >+ project and select <span class="uicontrol">New > Test Elemen<b>t</b></span><b>...</b> >+ The <span class="uicontrol">New Test Element </span> dialog appears.</span></li> >+ <li class="skipspace"><span>In the Wizards list box, expand the <span >+ class="uicontrol">Test Assets</span> folder and select <span >+ class="uicontrol">Datapool</span>.</span></li> >+ <li class="skipspace"><span>Click <b>Next</b>. The <span >+ class="uicontrol">New Datapool</span> dialog appears.</span></li> >+ <li class="skipspace"><span>Choose the datapool project folder and >+ datapool name. In the list of existing projects, select the >+ <b>datapoolExample</b> project. In the <span class="uicontrol">Name</span> >+ field, type shoppingCartDatapool.</span> Click <b>Next</b> to >+ continue and then <b>Next</b> again to open the CSV (comma delimited) file import page.</li> >+ <li class="skipspace">Import the >+ CSV file flowerData.csv.<ul> >+ <li><span>In the <span class="uicontrol">CSV File</span> field, click <span class="uicontrol">Browse</span> >+ and navigate to flowerData.csv.</span></li> >+ <li><span>Check the <span class="uicontrol">First row >+ contains variable names and suggested types</span></span> option. The first row of flowerData.csv contains column headings and types.</li> >+ <li>Check the <span><span class="uicontrol">First column contains >+ equivalence class names</span></span> option. Equivalence classes group related data. The first column of flowerData.csv specifies a single equivalence class called flowers.</li></ul> >+ </li> >+ <li class="skipspace"><span>Click <span class="uicontrol">Finish</span>.</span> If you specified initial datapool dimensions, which may conflict with the CSV file dimensions, a dialog appears. Click <b>Yes</b> to use the dimensions of the CSV file. Click <b>No</b> to use the specified initial dimensions (and possibly truncate the CSV file data).<span> >+ </span>The Datapool editor appears, showing the data contained in the flowers equivalence class. <br /> >+ <img >+ border="0" src="../images/testTutorial_datapoolAppears.gif" >+ width="354" height="416" alt=""/> >+ <br />For detailed information about creating a datapool, see <a >+ href="../tasks/tcreatedatapool.htm">Creating a datapool</a>.</li> >+</ol> >+<h2><a name="ModifyTestCasesDP"><br /> >+Modifying test cases to reference a >+datapool</a></h2> >+<br />In this procedure, you use the datapool API to replace hard-coded test values with >+ references to datapool columns. >+ >+<h3>Adding libraries required by the datapool API</h3>The datapool API requires various TPTP and Eclipse Modeling Framework (EMF) libraries. In this procedure, you add the libraries to your Java build path.<br /> >+<ol> >+ <li>Open the Java Perspective. From the file menu choose <b>Window > >+ Open Perspective > Java</b>.</li> >+ <li>Open the <b>datapoolExample</b> project properties. In the Navigator or Package Explorer window, right-click the <b>datapoolExample</b> project folder and choose <b>Properties</b>. The Properties for <b>datapoolExample</b> dialog appears.</li> >+ <li>Add the following library JARs to the Java build path of the <b>datapoolExample</b> project: >+ >+ <p> >+ <ul> >+ <li><b><i>org.eclipse.tptp.platform.models_<version>/tptp-models.jar</i></b></li> >+ <li><b><i>org.eclipse.tptp.platform.models.hierarchy_<version>/tptp-models-hierarchy.jar</i></b></li> >+ <li><b><i>org.eclipse.emf.common_<version>.jar</i></b></li> >+ <li><b><i>org.eclipse.emf.ecore_<version>.jar</i></b></li> >+ <li><b><i>org.eclipse.emf.ecore.xmi_<version>.jar</i></b></li> >+ <li><b><i>org.eclipse.equinox.common_<version>.jar</i></b></li> >+ </ul> >+ </p> >+ >+ <p>where <b><i><version></i></b> is the current version of the library JAR.</p> >+ >+ <p>Steps:</p> >+ >+ <ul> >+ <li>In the left pane, select <b>Java Build Path</b>. </li> >+ <li>In the right pane, select the <b>Libraries</b> tab. </li> >+ <li>For each of the library JARs, complete the following steps: >+ >+ <ul> >+ <li>If the library JAR is on the Java build path of the <b>datapoolExample</b> project, continue to the next library JAR. Otherwise, continue to the next step.</li> >+ <li>Click <b>Add External JARs...</b>.</li> >+ <li>Navigate to the directory containing the library JAR and select the JAR file. The library JAR is contained in the same directory as the dependencies under the <b>TPTP Libraries</b> or <b>JUnit 3</b> classpath container for the <b>datapoolExample</b> project. </li> >+ <li>Click <b>Open</b>.</li> >+ </ul> >+ </li> >+ </ul> >+ </li> >+ <li>Click <b>OK</b> to close the Properties dialog.</li> >+</ol><h3><br /> >+Using the datapool API</h3>In this procedure, you modify the MyShoppingCartTest class and testMyShoppingCartConstructor method to utilize the <span> >+shoppingCartDatapool</span>. >+<br /> >+<ol> >+ <li>If required, open the Java Perspective. From the file menu choose <b>Window > >+ Open Perspective > Java</b>.</li> >+ <li>Open MyShoppingCartTest.java. In the Navigator, open the >+ datapoolExample project folder and double-click >+ MyShoppingCartTest.java. The MyShoppingCartTest.java contents >+ appear in the Java editor.</li> >+ <li>Add the following import statements to the MyShoppingCartTest class.<pre>import org.eclipse.hyades.execution.runtime.datapool.IDatapool; >+import org.eclipse.hyades.execution.runtime.datapool.IDatapoolFactory; >+import org.eclipse.hyades.execution.runtime.datapool.IDatapoolIterator; >+import org.eclipse.hyades.models.common.datapool.impl.Common_DatapoolFactoryImpl;</pre></li> >+ <li>Declare an IDatapoolIterator class instance. This class instance will be initialized in your set up code and used in test methods.<pre>public class MyShoppingCartTest extends HyadesTestCase { >+ >+ IDatapoolIterator dpIterator; >+ >+ //...</pre></li> >+ <li>Modify the setUp method to initialize your datapool. In a TPTP JUnit test environment, the setUp method provides a common fixture. You can use setUp to initialize common test variables. <b>Note:</b> specify your fully qualified workspace path in place of <b><workspace></b> in the java.io.File constructor.<pre>protected void setUp() throws Exception { >+ // Initialize the datapool factory >+ IDatapoolFactory dpFactory = new Common_DatapoolFactoryImpl(); >+ >+ // Load the shoppingCartDatapool datapool >+ IDatapool datapool = dpFactory.load( >+ new java.io.File("<b><workspace></b>\\datapoolExample\\shoppingCartDatapool.datapool"), >+ false); >+ >+ // Create an iterator to traverse the datapool >+ dpIterator = dpFactory.open(datapool,"org.eclipse.hyades.datapool.iterator.DatapoolIteratorSequentialPrivate"); >+ >+ // Initialize the datapool to traverse the first equivalence class. >+ dpIterator.dpInitialize(datapool,0); >+}</pre><b>Notes: </b> >+ <ul> >+ <li>The second parameter in the IDatapoolFactory load method indicates if the datapool instance is shared. If true the datapool cache is checked for an existing copy of the datapool. If false, the datapool is a private instance. Modifying a shared datapool instance may affect other users, and is only recommended for confined environments.</li> >+ <li>If you want to programmatically edit a datapool import org.eclipse.hyades.edit.datapool.</li> >+ <li>The second parameter in the IDatapoolFactory open method represents the type of iterator. For shared datapools use DatapoolIteratorSequentialPrivate.</li> >+ </ul> >+ </li><li>Modify the testMyShoppingCartConstructor method to utilize the <span> >+ shoppingCartDatapool</span>. >+<pre>public void testMyShoppingCartConstructor() >+throws Exception >+{ >+ MyShoppingCart cart = new MyShoppingCart(); >+ >+ // Traverse through datapool... >+ // Test if constructor initializes each flower record appropriately >+ while(!dpIterator.dpDone()) >+ { >+ String Description = dpIterator.dpCurrent().getCell("Description").getStringValue(); >+ double datapoolPrice = dpIterator.dpCurrent().getCell("Price").getDoubleValue(); >+ >+ // Test if the flower is accounted for in the application >+ Double applicationPrice; >+ assertNotNull(applicationPrice = (Double)cart.myFlowers.get(Description)); >+ >+ // Test that the application price equals the price in the datapool >+ assertTrue(applicationPrice.doubleValue() == datapoolPrice); >+ >+ dpIterator.dpNext(); >+ } >+}</pre></li><li>Save MyShoppingCartTest.java. From the file menu, choose <b>File >+ > Save</b>.</li> >+ <li>Add the datapool to your testArtifact. >+ <ul> >+ <li>Open the Test Perspective. In the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, double-click testDeployment to open it in the editor.</li> >+ <li>In the <b>Pairs</b> tab, select testAsset and click <b>Open...</b></li> >+ <li>In the <b>Test Assets</b> tab, click <b>Add...</b>. Select the datapool and click <b>OK</b>. Save the asset.</li> >+ </ul> >+ </li> >+ <li>Run the test using your custom deployment.<ul> >+ <li>Open the Test Perspective. In the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click the MyShoppingCartTest test suite and choose <b>Run >+ As > Run...</b>. The Run configuration dialog appears.</li> >+ <li>In the left pane of the Run configuration, choose the MyShoppingCartTest test suite.</li> >+ <li>In the right pane of the Run configuration, select the deployment you created in the <a >+ href="#BeforeYouBegin">Before You Begin</a> section. </li> >+ <li>In the Test Logs tab, clear the <b>Use defaults option</b> and >+ select the datapoolExample project folder for the location.</li> >+ <li>Click <b>Run</b> to launch the test.</li> >+ </ul></li> >+ <b>Notes: </b> >+ <ul> >+ <li>If the deployment you select contains any encrypted datapools, a dialog will be shown after you have launched the test to require the password for each encrypted datapool that contained in the deployment.</li> >+ </ul> >+ <li>Double-click the new MyShoppingCartTest test log, which appears in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>. The MyShoppingCartTest test log appears. Select the Events tab to view the test result details.</li></ol> >+</div> >+ >+<p> >+<b>Related tasks</b><br/> >+<a href="../concepts/cjunitintro.htm">Testing with JUnit</a><br /> >+<a href="../tasks/tdatapoolsintro.htm">Providing tests with variable data</a><br /> >+<a href="../tasks/tdeploymentintro.htm">Creating a test deployment</a><br /> >+</p> >+ >+</body> >+</html> >Index: tasks/tcreatedatapool.htm >=================================================================== >RCS file: tasks/tcreatedatapool.htm >diff -N tasks/tcreatedatapool.htm >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ tasks/tcreatedatapool.htm 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,94 @@ >+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"> >+<html lang="en-us" xml:lang="en-us"> >+<!-- >+/********************************************************************** >+ * Copyright (c) 2009 IBM Corporation. >+ * All rights reserved. This content >+ * is 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 >+ * $Id$ >+ * >+ * Contributors: >+ * IBM - Initial contribution >+ **********************************************************************/ >+ --> >+<head> >+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> >+<link rel="StyleSheet" href="../css/book.css" type="text/css" /> >+ >+<title>Creating a datapool</title> >+</head> >+ >+<body> >+ >+<h1>Creating a datapool</h1> >+ >+<p>Datapools provide variable test data to tests during execution. Test data (for example, input and output data) is stored in a >+datapool and substituted in the test during execution. Test data can be added, modified, >+and deleted from the datapool and substituted in the test during execution without any >+modifications to the test.</p> >+ >+<p>Datapools contain three structural elements:</p> >+ >+<ul> >+ <li><b>Equivalence class:</b> A subset of related test data in the datapool with an associated name that produces the equivalent pass/fail result for a test. A datapool contains at least one equivalence class.</li> >+ <br/> >+ <br/> >+ <li><b>Variable:</b> A column of test data within each equivalence class with an associated name and type.</li> >+ <br/> >+ <br/> >+ <li><b>Record:</b> A slice or row of test data within an equivalence class with one or more variables.</li> >+</ul> >+ >+<p>Datapools are created with the <b>New Datapool</b> wizard:</p> >+ >+<ol> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, select <b>New</b> > <b>Test Element...</b> > <b>Test Assets</b> > <b>Datapool</b>, and click <b>Next</b>.</li> >+ <li>Select the parent folder and define the name of the datapool and click <b>Next</b>.</li> >+ <li>Provide a description for the datapool.</li> >+ <li>Provide the dimensions for the datapool. The dimensions represent the number of variables (or columns) and records (or rows) in each equivalence class of the datapool.</li> >+ <li>Test data can be created and edited in a >+Comma-Separated Value (CSV) file editor (for example, Microsoft® Excel®) and imported into a new or existing datapool. When working with large >+quantities of data, this approach is recommended. To import test data from a Comma-Separated Value (CSV) file into the datapool, select <b>Import CSV file into the new datapool</b>: >+ <ul> >+ <li>Provide or select (click <b>Browse...</b>) the path to the Comma-Separated Value (CSV) file.</li> >+ <li>Select the encoding of the Comma-Separated Value (CSV) file. This encoding is used to read the Comma-Separated Value (CSV) file.</li> >+ <li>Select <b>First row of the CSV file contains the variable names and optional suggested types</b> if the first row of the Comma-Separated Value (CSV) file contains the variable names and optional suggested types. That is, the first row of the Comma-Separated Value (CSV) file contains: >+ <br/><br/> >+ <p><i><variable 1 name>[::<variable 1 type>],<variable 2 name>[::<variable 2 type>]...<variable n name>[::<variable n type>]</i></p> >+ <br/> >+ </li> >+ <li>Select <b>First column of the CSV file contains the equivalence class names and optional row numbers</b> if the first column of the CSV file contains the equivalence class names and optional row numbers. That is, the first column of the Comma-Separated Value (CSV) file contains: >+ <br/><br/> >+ <p><i><equivalence class 1 name>[::0]</i></p> >+ <p><i><equivalence class 2 name>[::1]</i></p> >+ <p><i>...</i></p> >+ <p><i><equivalence class n name>[::<n>]</i></p> >+ <br/> >+ </li> >+ </ul> >+ </li> >+ <li>Click <b>Finish</b> to create the datapool.</li> >+ <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new datapool is to be opened in the Datapool editor.</li> >+</ol> >+ >+<p> >+<b>Related concepts</b><br/> >+<a href="../concepts/cdatapooleditor.htm">Datapool Editor</a><br/> >+</p> >+ >+<p> >+<b>Related tasks</b><br/> >+<a href="cdatapoolimport.htm">Importing a Comma-Separated Value (CSV) file as a Datapool</a><br/> >+<a href="cdatapoolexport.htm">Exporting a Datapool as a Comma-Separated Value (CSV) file</a><br/> >+</p> >+ >+<p> >+<b>Related samples</b><br/> >+<a href="../samples/saccessdatapool.htm">Tutorial: Accessing a datapool from a TPTP JUnit test</a><br/> >+</p> >+ >+</body> >+ >+</html> >Index: tasks/tdatapoolsintro.htm >=================================================================== >RCS file: tasks/tdatapoolsintro.htm >diff -N tasks/tdatapoolsintro.htm >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ tasks/tdatapoolsintro.htm 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,56 @@ >+<!DOCTYPE html >+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >+<html lang="en-us" xml:lang="en-us"> >+<!-- >+/********************************************************************** >+ * Copyright (c) 2009 IBM Corporation. >+ * All rights reserved. This content >+ * is 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 >+ * $Id$ >+ * >+ * Contributors: >+ * IBM - Initial contribution >+ **********************************************************************/ >+ --> >+<head> >+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> >+<link rel="StyleSheet" href="../css/book.css" type="text/css" /> >+ >+<title>Providing tests with variable data</title> >+</head> >+ >+<body> >+ >+<h1>Providing tests with variable data</h1> >+ >+<p>This section describes providing tests with variable test data from a datapool.</p> >+ >+<ul> >+ <li> >+ <a href="tcreatedatapool.htm">Creating a datapool</a> >+ <p>Datapools provide variable test data to tests during execution.</p> >+ <br/> >+ </li> >+ <li> >+ <a href="../samples/saccessdatapool.htm">Tutorial: Accessing a datapool from a TPTP JUnit test</a> >+ <p>Tutorial to demonstrate using datapools with <a href="../concepts/cjunitintro.htm">TPTP JUnit tests</a>.</p> >+ <br/> >+ </li> >+</ul> >+ >+<p> >+<b>Related concepts</b><br/> >+<a href="../concepts/cdatapooleditor.htm">Datapool Editor</a><br/> >+</p> >+ >+<p> >+<b>Related tasks</b><br/> >+<a href="cdatapoolimport.htm">Importing a Comma-Separated Value (CSV) file as a Datapool</a><br/> >+<a href="cdatapoolexport.htm">Exporting a Datapool as a Comma-Separated Value (CSV) file</a><br/> >+</p> >+ >+</body> >+ >+</html> >Index: concepts/cdatapooleditor.htm >=================================================================== >RCS file: concepts/cdatapooleditor.htm >diff -N concepts/cdatapooleditor.htm >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ concepts/cdatapooleditor.htm 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,131 @@ >+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"> >+<html lang="en-us" xml:lang="en-us"> >+<!-- >+/********************************************************************** >+ * Copyright (c) 2009 IBM Corporation. >+ * All rights reserved. This content is 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 >+ * $Id$ >+ * >+ * Contributors: >+ * IBM - Initial contribution >+ **********************************************************************/ >+ --> >+ >+<head> >+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> >+<link rel="StyleSheet" href="../css/book.css" type="text/css" /> >+ >+<title>Datapool Editor</title> >+</head> >+ >+<body> >+ >+<h1>Datapool Editor</h1> >+ >+<p>Datapools are edited using the Datapool Editor. The editor contains the following tabs:</p> >+ >+<h2>Overview</h2> >+ >+<p>This tab provides an overview of the datapool, including its general information, variables, and equivalence classes.</p> >+ >+<p>This tab contains the following sections:</p> >+ >+<ul> >+ <li> >+ <p><b>General Information</b></p> >+ <p>Contains the datapool's name, description, and file path within the workspace. The datapool's name<sup>1</sup> and description are editable.</p> >+ <br/> >+ </li> >+ <li> >+ <p><b>Variables</b></p> >+ <p>Contains the variables associated with the datapool.</p> >+ <br/> >+ <p>Variables can be added to the list by clicking the <b>Add</b> button.</p> >+ <br/> >+ <p>Selected variables can be removed (<b>Remove</b>), moved up (<b>Up</b>), or moved down (<b>Down</b>).</p> >+ <br/> >+ <p>Variable names can be edited by double-clicking the variable or selecting the variable and pressing <b>F2</b>.</p> >+ <br/> >+ </li> >+ <li> >+ <p><b>Equivalence Classes</b></p> >+ <p>Contains the equivalence classes associated with the datapool.</p> >+ <br/> >+ <p>Equivalence classes can be added to the list by clicking the <b>Add</b> button.</p> >+ <br/> >+ <p>Selected equivalence classes can be removed (<b>Remove</b>), moved up (<b>Up</b>), moved down (<b>Down</b>), or opened in the associated tab (<b>Open...</b>).</p> >+ <br/> >+ <p>Equivalence class names can be edited by double-clicking the equivalence class or selecting the equivalence class and pressing <b>F2</b>.</p> >+ <br/> >+ </li> >+</ul> >+ >+<p>[1] Datapools have a file name and logical name. The logical name is used in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a> of the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, dialogs, editors, and wizards to represent the datapool. >+The file name represents the datapool file (<i>*.datapool</i>) within the workspace. When the datapool is created, the logical name defaults to the file name >+(excluding the <i>.artifact</i> file extension) and may be modified without modifying the file name. The logical name allows customization of the datapool name >+without affecting the file name within the workspace.</p> >+ >+<h2>Equivalence Classes<sup>2</sup></h2> >+ >+<p>This tab contains the datapool table with the variables (or columns) for the datapool, records (or rows) for the equivalence class, and cells for the records:</p> >+ >+<ul> >+ <li> >+ <p><b>Variables</b></p> >+ >+ <p>Each variable has an associated name and type (for example, String, Number, Boolean, Enumeration, and Complex) that are used in the variable column name (for example, >+ <i><variable name>::<variable type></i>) in the datapool table. Each variable is positioned in the datapool table relative to the other variables >+ in the datapool. Variables may be encrypted for sensitive data, such as user identifiers. Variables are encrypted with a password for the datapool.</p> >+ <br/> >+ <p>Variables can be inserted (right-click on the datapool table and select <b>Insert Variable...</b>), removed (right-click a variable column in the datapool table and >+ select <b>Remove Variable</b>), and edited (right-click a variable column in the datapool table and select <b>Edit Variable...</b> or select the variable column name >+ in the datapool table).</p> >+ <br/> >+ </li> >+ <li> >+ <p><b>Records</b></p> >+ >+ <p>Each record has an associated number that is used in the first column in the datapool table. Each record is positioned in the datapool table relative to the other records in the equivalence class.</p> >+ <br/> >+ <p>Records can be inserted (right-click on the datapool table and select <b>Insert Record</b>), removed (right-click the record number in the first column in the datapool table and >+ select <b>Remove Record</b>), and edited (right-click the record number in the first column in the datapool table and select <b>Edit Record...</b>).</p> >+ <br/> >+ <p>Individual selected records (click the record number in the first column in the datapool table) or multiple selected records (hold <b>Ctrl</b> and click the record numbers in the first >+ column in the datapool table) can be cut (right-click and select <b>Cut</b>, <b>Ctrl+X</b>, or select <b>Edit</b> > <b>Cut</b> from the file menu), >+ copied (right-click and select <b>Copy</b>, <b>Ctrl+C</b>, or select <b>Edit</b> > <b>Copy</b> from the file menu), and deleted (press <b>Delete</b>). Copied records can be pasted >+ (right-click the record number in the first column in the datapool table and select <b>Paste</b>, <b>Ctrl+V</b>, or select <b>Edit</b> > <b>Paste</b> from the file menu).</p> >+ <br/> >+ </li> >+ <li> >+ <p><b>Cells</b></p> >+ >+ <p>Cells can be edited by double-clicking the cell in the datapool table.</p> >+ <br/> >+ <p>Individual selected cells can be cut (right-click and select <b>Cut</b>, <b>Ctrl+X</b>, or select <b>Edit</b> > <b>Cut</b> from the file menu), >+ copied (right-click and select <b>Copy</b>, <b>Ctrl+C</b>, or select <b>Edit</b> > <b>Copy</b> from the file menu), and deleted (press <b>Delete</b>). Copied cells or the system clipboard can be pasted >+ (right-click the cell and select <b>Paste</b>, <b>Ctrl+V</b>, or select <b>Edit</b> > <b>Paste</b> from the file menu). Finally, cells can be searched and replaced (<b>Ctrl+F</b> or select <b>Edit</b> >+ > <b>Find/Replace</b> from the file menu).</p> >+ <br/> >+ </li> >+</ul> >+ >+<p>[2] Each equivalence class has an associated tab named <i><Equivalence Class Name></i>.</p> >+ >+<p> >+<b>Related tasks</b><br/> >+<a href="../tasks/tcreatedatapool.htm">Creating a datapool</a><br/> >+<a href="../tasks/cdatapoolimport.htm">Importing a Comma-Separated Value (CSV) file as a Datapool</a><br/> >+<a href="../tasks/cdatapoolexport.htm">Exporting a Datapool as a Comma-Separated Value (CSV) file</a><br/> >+</p> >+ >+<p> >+<b>Related samples</b><br/> >+<a href="../samples/saccessdatapool.htm">Tutorial: Accessing a datapool from a TPTP JUnit test</a><br/> >+</p> >+ >+</body> >+ >+</html> >Index: tasks/cdatapoolimport.htm >=================================================================== >RCS file: tasks/cdatapoolimport.htm >diff -N tasks/cdatapoolimport.htm >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ tasks/cdatapoolimport.htm 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,102 @@ >+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"> >+<html lang="en-us" xml:lang="en-us"> >+<!-- >+/********************************************************************** >+ * Copyright (c) 2009 IBM Corporation. >+ * All rights reserved. This content >+ * is 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 >+ * $Id$ >+ * >+ * Contributors: >+ * IBM - Initial contribution >+ **********************************************************************/ >+ --> >+<head> >+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> >+<link rel="StyleSheet" href="../css/book.css" type="text/css" /> >+ >+<title>Importing a Comma-Separated Value (CSV) file as a datapool</title> >+</head> >+ >+<body> >+ >+<h1>Importing a Comma-Separated Value (CSV) file as a datapool</h1> >+ >+<p>Test data in a Comma-Separated Value (CSV) file can be imported into a new or existing datapool. Test data can be created and edited in a >+Comma-Separated Value (CSV) file editor (for example, Microsoft® Excel®) and imported into a new or existing datapool. This is the recommended >+approach when working with large quantities of data.</p> >+ >+<p>Import test data from a Comma-Separated Value (CSV) file into a new datapool with the <b>Import CSV File as Datapool</b> wizard:</p> >+ >+<ol> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>Import...</b>.</li> >+ <li>Select <b>Test</b> > <b>CSV File as Datapool</b>, and click <b>Next</b>.</li> >+ <li>Provide or select (click <b>Browse...</b>) the path to the Comma-Separated Value (CSV) file.</li> >+ <li>Select the encoding of the Comma-Separated Value (CSV) file. This encoding is used to read the Comma-Separated Value (CSV) file.</li> >+ <li>Select <b>First row of the CSV file contains the variable names and optional suggested types</b> if the first row of the Comma-Separated Value (CSV) file contains the variable names and optional suggested types. That is, the first row of the Comma-Separated Value (CSV) file contains: >+ <br/><br/> >+ <p><i><variable 1 name>[::<variable 1 type>],<variable 2 name>[::<variable 2 type>]...<variable n name>[::<variable n type>]</i></p> >+ <br/> >+ </li> >+ <li>Select <b>First column of the CSV file contains the equivalence class names and optional record numbers</b> if the first column of the Comma-Separated Value (CSV) file contains the equivalence class names and optional record numbers. That is, the first column of the Comma-Separated Value (CSV) file contains: >+ <br/><br/> >+ <p><i><equivalence class 1 name>[::0]</i></p> >+ <p><i><equivalence class 2 name>[::1]</i></p> >+ <p><i>...</i></p> >+ <p><i><equivalence class n name>[::<n>]</i></p> >+ <br/> >+ </li> >+ <li>Click <b>Next</b> and click <b>Next</b>.</li> >+ <li>Select the parent folder and define the name of the new datapool.</li> >+ <li>Click <b>Finish</b> to import test data from the Comma-Separated Value (CSV) file into the new datapool.</li> >+ <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the new datapool is to be opened in the Datapool editor.</li> >+</ol> >+ >+<p>Import test data from a Comma-Separated Value (CSV) file into an existing datapool with the <b>Import CSV File as Datapool</b> wizard:</p> >+ >+<ol> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, select <b>Import</b>.</li> >+ <li>Select <b>Test</b> > <b>CSV File as Datapool</b>, and click <b>Next</b>.</li> >+ <li>Provide or select (click <b>Browse...</b>) the path to the Comma-Separated Value (CSV) file.</li> >+ <li>Select the encoding of the Comma-Separated Value (CSV) file. This encoding is used to read the Comma-Separated Value (CSV) file.</li> >+ <li>Select <b>First row of the CSV file contains the variable names and optional suggested types</b> if the first row of the Comma-Separated Value (CSV) file contains the variable names and optional suggested types. That is, the first row of the Comma-Separated Value (CSV) file contains: >+ <br/><br/> >+ <p><i><variable 1 name>[::<variable 1 type>],<variable 2 name>[::<variable 2 type>]...<variable n name>[::<variable n type>]</i></p> >+ <br/> >+ </li> >+ <li>Select <b>First column of the CSV file contains the equivalence class names and optional record numbers</b> if the first column of the Comma-Separated Value (CSV) file contains the equivalence class names and optional record numbers. That is, the first column of the Comma-Separated Value (CSV) file contains: >+ <br/><br/> >+ <p><i><equivalence class 1 name>[::0]</i></p> >+ <p><i><equivalence class 2 name>[::1]</i></p> >+ <p><i>...</i></p> >+ <p><i><equivalence class n name>[::<n>]</i></p> >+ <br/> >+ </li> >+ <li>Click <b>Next</b>.</li> >+ <li>Select <b>Append to an existing datapool</b> to append the test data imported from a Comma-Separated Value (CSV) to an existing datapool.</li> >+ <li>Select an existing datapool from the list of datapool. Select <b>Show folders</b> to show the list of datapools in the workspace project structure. If the selected datapool contains an encrypted variable, provide the password for the selected datapool.</li> >+ <li>Click <b>Finish</b> to import test data from the Comma-Separated Value (CSV) file into the existing datapool.</li> >+ <li>The <b>Confirm Open Editor</b> dialog may appear (see the <b>Window</b> > <b>Preferences...</b> > <b>Test</b> > <b>Open Editor</b> preference), confirming if the existing datapool is to be opened in the Datapool editor.</li> >+</ol> >+ >+<p> >+<b>Related concepts</b><br/> >+<a href="../concepts/cdatapooleditor.htm">Datapool Editor</a><br/> >+</p> >+ >+<p> >+<b>Related tasks</b><br/> >+<a href="../tasks/tcreatedatapool.htm">Creating a datapool</a><br/> >+<a href="cdatapoolexport.htm">Exporting a Datapool as a Comma-Separated Value (CSV) file</a><br/> >+</p> >+ >+<p> >+<b>Related samples</b><br/> >+<a href="../samples/saccessdatapool.htm">Tutorial: Accessing a datapool from a TPTP JUnit test</a><br/> >+</p> >+ >+</body> >+ >+</html> >Index: tasks/cdatapoolexport.htm >=================================================================== >RCS file: tasks/cdatapoolexport.htm >diff -N tasks/cdatapoolexport.htm >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ tasks/cdatapoolexport.htm 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,79 @@ >+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"> >+<html lang="en-us" xml:lang="en-us"> >+<!-- >+/********************************************************************** >+ * Copyright (c) 2009 IBM Corporation. >+ * All rights reserved. This content >+ * is 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 >+ * $Id$ >+ * >+ * Contributors: >+ * IBM - Initial contribution >+ **********************************************************************/ >+ --> >+<head> >+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> >+<link rel="StyleSheet" href="../css/book.css" type="text/css" /> >+ >+<title>Exporting a datapool as a Comma-Separated Value (CSV) file</title> >+</head> >+ >+<body> >+ >+<h1>Exporting a datapool as a Comma-Separated Value (CSV) file</h1> >+ >+<p>Test data in a datapool can be exported to a Comma-Separated Value (CSV) file. Test data can exported from a datapool, edited in a >+Comma-Separated Value (CSV) file editor (for example, Microsoft® Excel®), and re-imported into a new or existing datapool. This is the recommended >+approach when working with large quantities of data.</p> >+ >+<p>Export test data from a datapool to a Comma-Separated Value (CSV) file with the <b>Export Datapool as CSV File</b> wizard:</p> >+ >+<ol> >+ <li>Open the <a href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.hyades.ui.perspective.TestPerspective)")'>Test Perspective</a>, right-click in the <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.hyades.test.ui.TestNavigator)")'>Test Navigator</a>, and select <b>Export...</b>.</li> >+ <li>Select <b>Test</b> > <b>Datapool as CSV File</b>, and click <b>Next</b>.</li> >+ <li>Select an existing datapool from the list of datapool. Select <b>Show folders</b> to show the list of datapools in the workspace project structure. If the selected datapool contains an encrypted variable, provide the password for the selected datapool.</li> >+ <li>Click <b>Next</b>.</li> >+ <li>Provide or select (click <b>Browse...</b>) the path to the new Comma-Separated Value (CSV) file.</li> >+ <li>Select the encoding of the Comma-Separated Value (CSV) file. This encoding is used to write the Comma-Separated Value (CSV) file.</li> >+ <li>Select <b>Export the variable names and suggested types to the first row of the CSV file</b> if the first row of the Comma-Separated Value (CSV) file will contain the variable names and suggested types. That is, the first row of the Comma-Separated Value (CSV) file will contain: >+ <br/><br/> >+ <p><i><variable 1 name>[::<variable 1 type>],<variable 2 name>[::<variable 2 type>]...<variable n name>[::<variable n type>]</i></p> >+ <br/> >+ </li> >+ <li>Select <b>Export the equivalence class names and record numbers to the first column of the CSV file</b> if the first column of the Comma-Separated Value (CSV) file will contain the equivalence class names and record numbers. That is, the first column of the Comma-Separated Value (CSV) will contain: >+ <br/><br/> >+ <p><i><equivalence class 1 name>[::0]</i></p> >+ <p><i><equivalence class 2 name>[::1]</i></p> >+ <p><i>...</i></p> >+ <p><i><equivalence class n name>[::<n>]</i></p> >+ <br/> >+ </li> >+ <li>Select <b>Enclose cell values in XML tags</b> if the cell values of the Comma-Separated Value (CSV) file will be enclosed in XML tags. That is, the cell values of the Comma-Separated Value (CSV) will contain: >+ <br/><br/> >+ <p><Literal><i><cell value></i></Literal></p> >+ <br/> >+ </li> >+ <li>Click <b>Finish</b> to export test data from the datapool to the new Comma-Separated Value (CSV) file .</li> >+</ol> >+ >+<p> >+<b>Related concepts</b><br/> >+<a href="../concepts/cdatapooleditor.htm">Datapool Editor</a><br/> >+</p> >+ >+<p> >+<b>Related tasks</b><br/> >+<a href="../tasks/tcreatedatapool.htm">Creating a datapool</a><br/> >+<a href="cdatapoolimport.htm">Importing a Comma-Separated Value (CSV) file as a datapool</a><br/> >+</p> >+ >+<p> >+<b>Related samples</b><br/> >+<a href="../samples/saccessdatapool.htm">Tutorial: Accessing a datapool from a TPTP JUnit test</a><br/> >+</p> >+ >+</body> >+ >+</html>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 257266
: 130734