diff options
| author | Michael Valenta | 2007-09-19 14:01:35 +0000 |
|---|---|---|
| committer | Michael Valenta | 2007-09-19 14:01:35 +0000 |
| commit | 8e81873fbbfc1df0aac775c71b2fc114a1f55543 (patch) | |
| tree | c1a8c67f36744ae06bcb62729f1097ed9477069d /tests/org.eclipse.team.tests.cvs.core/html | |
| parent | 830a633f5b6e8e3664be68f0f8333c3394fae6d8 (diff) | |
| download | eclipse.platform.team-8e81873fbbfc1df0aac775c71b2fc114a1f55543.tar.gz eclipse.platform.team-8e81873fbbfc1df0aac775c71b2fc114a1f55543.tar.xz eclipse.platform.team-8e81873fbbfc1df0aac775c71b2fc114a1f55543.zip | |
Bug 203944 Manual tests need to be updated
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/html')
109 files changed, 2300 insertions, 1758 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00000.html b/tests/org.eclipse.team.tests.cvs.core/html/00000.html deleted file mode 100644 index e83ba16a1..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00000.html +++ /dev/null @@ -1,19 +0,0 @@ -<html><head><title>Check Out Prompting</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><body><h2>Check Out Prompting</h2> - -<ul> - <li>Select a project in HEAD</li> - <li>Perform a Checkout As</li> - <li>Use the same name but specify a custom location</li> - <li>Ensure project was checked out properly</li> - <li>Select the same project and choose Checkout As again</li> - <li>Use the same name but don't specify a custom location</li> - <li>Ensure that the use is prompted to overwrite</li> - <li>Test various options in prompt to ensure proper behavior</li> -</ul> - - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00001.html b/tests/org.eclipse.team.tests.cvs.core/html/00001.html deleted file mode 100644 index 4b35dcc40..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00001.html +++ /dev/null @@ -1,8 +0,0 @@ -<html><head><title>Unit Use-cases</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -</head><body><h2>Unit Use-cases</h2> - -Answer comes here. - -<P> <br><a href="../hglegal2003.htm"><img src=../images/ngibmcpy2003.gif border=0></a> -</P></body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00002.html b/tests/org.eclipse.team.tests.cvs.core/html/00002.html deleted file mode 100644 index 74441500b..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00002.html +++ /dev/null @@ -1,5 +0,0 @@ -<html><head><title>End-To-End Use Cases</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -</head><body><h2>End-To-End Use Cases</h2> -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00003.html b/tests/org.eclipse.team.tests.cvs.core/html/00003.html deleted file mode 100644 index 2f8a8cc3b..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00003.html +++ /dev/null @@ -1,10 +0,0 @@ -<html><head><title>Unit Use-Cases</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -</head><body><h2>Unit Use-Cases</h2> - -Answer comes here. -<a href="html/00017.html">Crash Recovery</a> - - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00004.html b/tests/org.eclipse.team.tests.cvs.core/html/00004.html index 29343ae21..73d458511 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00004.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00004.html @@ -1,5 +1,10 @@ -<html><head><title>Repositories View</title> +<html> +<head> +<title>Repositories View</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> -</head><body><h2>Repositories View</h2> -</body></html>
\ No newline at end of file +</head> +<body> +<h2>Repositories View</h2> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00005.html b/tests/org.eclipse.team.tests.cvs.core/html/00005.html deleted file mode 100644 index 971d5986f..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00005.html +++ /dev/null @@ -1,8 +0,0 @@ -<html><head><title>Check Out</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -</head><body><h2>Check Out</h2> - -Answer comes here. - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00006.html b/tests/org.eclipse.team.tests.cvs.core/html/00006.html deleted file mode 100644 index 0c2c9e455..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00006.html +++ /dev/null @@ -1,19 +0,0 @@ -<html><head><title>Checkout As prompting</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -</head><body><h2>Checkout As prompting</h2> - -<h3>Checkout As... Prompting</h3> -<ul> - <li>Select a project in HEAD</li> - <li>Perform a Checkout As</li> - <li>Use the same name but specify a custom location</li> - <li>Ensure project was checked out properly</li> - <li>Select the same project and choose Checkout As again</li> - <li>Use the same name but don't specify a custom location</li> - <li>Ensure that the use is prompted to overwrite</li> - <li>Test various options in prompt to ensure proper behavior</li> -</ul> - - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00007.html b/tests/org.eclipse.team.tests.cvs.core/html/00007.html index d94d54ab0..f108c9b2f 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00007.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00007.html @@ -1,57 +1,65 @@ -<html><head><title>Check Out - prompts</title> +<html> +<head> +<title>Check Out - prompts</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Check Out - prompts</h2> +</head> +<body> +<h2>Check Out - prompts</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/02/25 20:34:42 $</p> +Last Modified: $Date: 2004/06/01 19:14:48 $</p> <h3>Scenario 1</h3> <ol> - <li>Select a project in HEAD</li> - <li>Perform a Checkout</li> - <li>Ensure project was checked out properly</li> - <li>Select the same project and choose Checkout As</li> - <li>Use the same name and specify a custom location</li> - <li>Ensure that the user is prompted to overwrite</li> - <li>Ensure OK and Cancel have proper behavior</li> + <li>Select a project in HEAD</li> + <li>Perform a Checkout</li> + <li>Ensure project was checked out properly</li> + <li>Select the same project and choose Checkout As</li> + <li>Use the same name and specify a custom location</li> + <li>Ensure that the user is prompted to overwrite</li> + <li>Ensure OK and Cancel have proper behavior</li> </ol> <h3>Scenario 2</h3> <ol> - <li>Select a project in HEAD</li> - <li>Perform a Checkout</li> - <li>Ensure project was checked out properly</li> - <li>Delete the project but leave the contents on disk</li> - <li>Perform a Checkout of the same project again</li> - <li>Ensure that the user is prompted to overwrite</li> - <li>Ensure OK and Cancel have proper behavior</li> + <li>Select a project in HEAD</li> + <li>Perform a Checkout</li> + <li>Ensure project was checked out properly</li> + <li>Delete the project but leave the contents on disk</li> + <li>Perform a Checkout of the same project again</li> + <li>Ensure that the user is prompted to overwrite</li> + <li>Ensure OK and Cancel have proper behavior</li> </ol> <h3>Scenario 3</h3> <ol> - <li>Select a project in HEAD</li> - <li>Perform a Checkout As</li> - <li>Use the same name and specify a custom location</li> - <li>Ensure project was checked out properly</li> - <li>Delete the project but leave the contents on disk</li> - <li>Perform a Checkout As of the same project to the same location as in step 3</li> - <li>Ensure that the user is prompted to overwrite</li> - <li>Ensure OK and Cancel have proper behavior</li> + <li>Select a project in HEAD</li> + <li>Perform a Checkout As</li> + <li>Use the same name and specify a custom location</li> + <li>Ensure project was checked out properly</li> + <li>Delete the project but leave the contents on disk</li> + <li>Perform a Checkout As of the same project to the same location + as in step 3</li> + <li>Ensure that the user is prompted to overwrite</li> + <li>Ensure OK and Cancel have proper behavior</li> </ol> <h3>Scenario 4</h3> <ol> - <li>Select a project in HEAD</li> - <li>Perform a Checkout As</li> - <li>Use the same name and specify a custom location</li> - <li>Ensure project was checked out properly</li> - <li>Delete the project but leave the contents on disk</li> - <li>Perform a Checkout on the project</li> - <li>Ensure project was checked out properly</li> - <li>Perform a Checkout As of the same project to the same location as in step 3</li> - <li>Ensure that the user is prompted twice: once to overwrite project and once to overwrite custom location</li> - <li>Ensure OK and Cancel have proper behavior</li> + <li>Select a project in HEAD</li> + <li>Perform a Checkout As</li> + <li>Use the same name and specify a custom location</li> + <li>Ensure project was checked out properly</li> + <li>Delete the project but leave the contents on disk</li> + <li>Perform a Checkout on the project</li> + <li>Ensure project was checked out properly</li> + <li>Perform a Checkout As of the same project to the same location + as in step 3</li> + <li>Ensure that the user is prompted twice: once to overwrite + project and once to overwrite custom location</li> + <li>Ensure OK and Cancel have proper behavior</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00008.html b/tests/org.eclipse.team.tests.cvs.core/html/00008.html index 6a7d80430..e3263106a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00008.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00008.html @@ -1,9 +1,16 @@ -<html><head><title>Comparing</title> +<html> +<head> +<title>Comparing</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Comparing</h2> +</head> +<body> +<h2>Comparing</h2> -The CVS plugin supports comparing of resources in the workspace with revision in the repository. You can also compare between two remote elements. +The CVS plugin supports comparing of resources in the workspace with +revision in the repository. You can also compare between two remote +elements. -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00009.html b/tests/org.eclipse.team.tests.cvs.core/html/00009.html index 01a2d8648..fae15e68e 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00009.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00009.html @@ -1,37 +1,44 @@ -<html><head><title>Remote resources</title> +<html> +<head> +<title>Remote resources</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Remote resources</h2> +</head> +<body> +<h2>Remote resources</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> -<h4>Compare With... in Repositories view </h4> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> +<h4>Compare With... in Repositories view</h4> <p>Perform the following steps:</p> <ol> - <li>Select a project in HEAD and choose Compare With... from context menu</li> - <li>Select a branch tag</li> - <li>Ensure result of comparison is correct</li> - <li>Repeat and in step 2) use a version tag</li> + <li>Select a project in HEAD and choose Compare With... from + context menu</li> + <li>Select a branch tag</li> + <li>Ensure result of comparison is correct</li> + <li>Repeat and in step 2) use a version tag</li> </ol> -<p>Repeat the above steps for a project in a branch and a project version.</p> +<p>Repeat the above steps for a project in a branch and a project +version.</p> <p>Repeat the above steps for a selected folder and a selected file.</p> <h4>Compare on two selections in Repositories view</h4> <p>Perform the following steps:</p> <ol> - <li>Select a project in HEAD</li> - <li>CTRL-select a project in a branch</li> - <li>Choose Compare from context menu</li> - <li>Ensure result of comparison is correct</li> + <li>Select a project in HEAD</li> + <li>CTRL-select a project in a branch</li> + <li>Choose Compare from context menu</li> + <li>Ensure result of comparison is correct</li> </ol> -<p>Repeat the above for various combinations (branch + version, version + branch, - branch + branch, version + version).</p> - <p>Repeat the above steps for a selected folder and a selected file.</p> +<p>Repeat the above for various combinations (branch + version, +version + branch, branch + branch, version + version).</p> +<p>Repeat the above steps for a selected folder and a selected file.</p> <h4>Compare on two selections in Resource History view.</h4> <p>Perform the following steps:</p> <ul> - <li>Open Resource History view on a file with multiple revisions</li> - <li>Select 2 and choose Compare from the context menu</li> - <li>Ensure result of comparison is correct</li> + <li>Open Resource History view on a file with multiple revisions</li> + <li>Select 2 and choose Compare from the context menu</li> + <li>Ensure result of comparison is correct</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00010.html b/tests/org.eclipse.team.tests.cvs.core/html/00010.html index 1b71fc5e9..7e02c4ca6 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00010.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00010.html @@ -1,6 +1,11 @@ -<html><head><title>Synchronizing</title> +<html> +<head> +<title>Synchronizing</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Synchronizing</h2> -</body></html>
\ No newline at end of file +</head> +<body> +<h2>Synchronizing</h2> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00011.html b/tests/org.eclipse.team.tests.cvs.core/html/00011.html index 54418612a..6ae9432ac 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00011.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00011.html @@ -1,203 +1,212 @@ -<html><head><title>Synchronize View</title> +<html> +<head> +<title>Synchronize View</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Synchronize View</h2> +</head> +<body> +<h2>Synchronize View</h2> <p>Since: 3.0<br> -Last Modified: $Date: 2007/05/18 13:54:37 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> <h3>Synchronize View Modes</h3> -<p> -Ensure that choosing direction modes result in proper filtering. +<p>Ensure that choosing direction modes result in proper filtering.</p> + <ul> -<li>Incoming mode contains incoming changes and conflicts.</li> -<li>Outgoing mode contains outgoing changes and conflicts.</li> -<li>Both mode contains all change types.</li> -<li>Conflict mode contains only conflicts.</li> + <li>Incoming mode contains incoming changes and conflicts.</li> + <li>Outgoing mode contains outgoing changes and conflicts.</li> + <li>Both mode contains all change types.</li> + <li>Conflict mode contains only conflicts.</li> </ul> -</p> -<p> -Also ensure that there are no empty containers (e.g folders or projects) -in any of the modes.</p> + +<p>Also ensure that there are no empty containers (e.g folders or +projects) in any of the modes.</p> <h3>Synchronize View Models</h3> -<p> -Ensure that each model contains the appropriate output. Models to test include: +<p>Ensure that each model contains the appropriate output. Models to +test include:</p> <ul> - <li>All Models: Projects should contain content from the highest level model - (e.g. Java projects contains Java content like packages while non-Java projects - contains folders).</li> - <li>Workspace: All projects are shown and contain folders. For this model, also test - the presentation types (Flat, Hierarchical and Compressed Folders).</li> - <li>Java: Only Java projects are present and contain Java content (e.g. packages). Also - ensure that any resource content is present (e.g. non-source folders).</li> + <li>All Models: Projects should contain content from the highest + level model (e.g. Java projects contains Java content like packages + while non-Java projects contains folders).</li> + <li>Workspace: All projects are shown and contain folders. For + this model, also test the presentation types (Flat, Hierarchical and + Compressed Folders).</li> + <li>Java: Only Java projects are present and contain Java content + (e.g. packages). Also ensure that any resource content is present (e.g. + non-source folders).</li> <li>Change Sets: All changes are grouped by change set.</li> </ul> -</p> -<p> -Also ensure that mode switching works properly for each model type. -</p> + +<p>Also ensure that mode switching works properly for each model +type.</p> <h3>Synchronize View Operations</h3> <p>Ensure Commit and Update buttons:</p> <ul> - <li>operate on all applicable changes</li> - <li>prompt in some form before executing</li> + <li>operate on all applicable changes</li> + <li>prompt in some form before executing</li> </ul> <p>Ensure Update menu action:</p> <ul> - <li>is enabled when selection contains incoming or conflicting changes</li> - <li>operates only on selected changes</li> - <li>silently handles mergable conflicts</li> - <li>will prompt if conflicts are not mergable</li> + <li>is enabled when selection contains incoming or conflicting + changes</li> + <li>operates only on selected changes</li> + <li>silently handles mergable conflicts</li> + <li>will prompt if conflicts are not mergable</li> </ul> <p>Ensure Commit menu action</p> <ul> - <li>is enable when selection contains outgoing changes</li> - <li>prompts for unadded resources</li> - <li>operates only on selected changes</li> + <li>is enable when selection contains outgoing changes</li> + <li>prompts for unadded resources</li> + <li>operates only on selected changes</li> </ul> <p>Ensure Override and Update</p> <ul> - <li>is enabled for outgoing and conflicting changes</li> - <li>prompts to confirm</li> - <li>operates only on selected changes</li> + <li>is enabled for outgoing and conflicting changes</li> + <li>prompts to confirm</li> + <li>operates only on selected changes</li> </ul> <p>Ensure Mark as Merged</p> <ul> - <li>is enabled for incoming and conflicting changes</li> - <li>operates only on selected changes</li> + <li>is enabled for incoming and conflicting changes</li> + <li>operates only on selected changes</li> </ul> -<p>Ensure Refresh button refreshes all projects regardless of mode, selection - or working set.</p> +<p>Ensure Refresh button refreshes all projects regardless of mode, +selection or working set.</p> <p>Ensure Refresh menu action refreshes only the selection</p> <p>All actions on large sets</p> -The following table can be used to determine what operations are appropriate and what result to expect. +The following table can be used to determine what operations are +appropriate and what result to expect. <table height="124" border="1" width="99%"> - <tbody> - <tr> - <td width="25%"><b>Change Type</b></td> - <td width="25%"><b>Action</b></td> - <td width="50%"><b>Result</b></td> - </tr> - <tr> - <td width="25%"><b>Incoming File Change</b></td> - <td width="25%">Update</td> - <td width="50%">Remote contents become local. Try with both Text and - Binary files.</td> - </tr> - <tr> - <td width="25%"><b>Incoming File Change</b></td> - <td width="25%">Mark as Merged</td> - <td width="50%">File becomes an outgoing change.</td> - </tr> - <tr> - <td width="25%"><b>Incoming File Addition</b></td> - <td width="25%">Update</td> - <td width="50%">Remote contents become local. Try with both Text and - Binary files.</td> - </tr> - <tr> - <td width="25%"><b>Incoming File Addition</b></td> - <td width="25%">Mark as Merged</td> - <td width="50%">File becomes an outgoing deletion.</td> - </tr> - <tr> - <td width="25%"><b>Incoming File Deletion</b></td> - <td width="25%">Update</td> - <td width="50%">Local file is deleted.</td> - </tr> - <tr> - <td width="25%"><b>Incoming File Deletion</b></td> - <td width="25%">Mark as Merged</td> - <td width="50%">File becomes an outgoing addition.</td> - </tr> - <tr> - <td width="25%"><b>Outgoing File Change</b></td> - <td width="25%">Commit</td> - <td width="50%">Prompt for release comment. Cancel aborts, OK commits - local file to server.</td> - </tr> - <tr> - <td width="25%"><b>Outgoing File Change</b></td> - <td width="25%">Override and Update</td> - <td width="50%">Remote contents become local. Try - with both Text and Binary files.</td> - </tr> - <tr> - <td width="25%"><b>Outgoing File Addition</b></td> - <td width="25%">Add to Version Control</td> - <td width="50%">Adds the file to version control. The icon should change - in the sync view, and Commit should now be enabled.</td> - </tr> - <tr> - <td width="25%"><b>Outgoing File Addition</b></td> - <td width="25%">Add to .cvsignore</td> - <td width="50%">Adds the file to .cvsignore. The file should disappear - from the sync view. The .cvsignore file should appear (if it wasn't visible - already). The file should not appear in subsequent syncs.</td> - </tr> - <tr> - <td width="25%"><b>Outgoing File Addition</b></td> - <td width="25%">Commit</td> - <td width="50%">Prompt for release comment should also include prompt for file - type if the type of the new file is not known. Cancel - aborts, OK commits local file to server.</td> - </tr> - <tr> - <td width="25%"><b>Outgoing File Addition</b></td> - <td width="25%">Override and Update</td> - <td width="50%">Local file is deleted.</td> - </tr> - <tr> - <td width="25%"><b>Outgoing File Deletion</b></td> - <td width="25%">Commit</td> - <td width="50%">Prompt for release comment. Cancel aborts, OK commits - deletion to server.</td> - </tr> - <tr> - <td width="25%"><b>Outgoing File Deletion</b></td> - <td width="25%">Override and Update</td> - <td width="50%">File is re-created, remote contents - become local.</td> - </tr> - <tr> - <td width="25%"><b>Conflicting File Change</b></td> - <td width="25%">Update</td> - <td width="50%">If the change is auto-mergable, the file becomes - an outgoing change and includes the remote changes and the local changes. - Otherwise, the user is prompted to indicate that a merge was not possible.</td> - </tr> - <tr> - <td width="25%"><b>Conflicting File Change</b></td> - <td width="25%">Mark As Merged</td> - <td width="50%">File becomes an outgoing change.</td> - </tr> - <tr> - <td width="25%"><b>Conflicting File Change</b></td> - <td width="25%">Override and Update</td> - <td width="50%">Dialog prompts user to replace local changes. If user - cancels nothing happens. If user chooses OK, then local changes are discarded - and remote contents replace local. No .# files created, no CVS markup, and - the file is not dirty as a result.</td> - </tr> - <tr> - <td width="25%"><b>Conflicting File Addition</b></td> - <td width="25%">Mark as Merged</td> - <td width="50%">File becomes an outgoing change.</td> - </tr> - <tr> - <td width="25%"><b>Conflicting File Addition</b></td> - <td width="25%">Override and Update</td> - <td width="50%">Remote contents become local.</td> - </tr> - </tbody> + <tbody> + <tr> + <td width="25%"><b>Change Type</b></td> + <td width="25%"><b>Action</b></td> + <td width="50%"><b>Result</b></td> + </tr> + <tr> + <td width="25%"><b>Incoming File Change</b></td> + <td width="25%">Update</td> + <td width="50%">Remote contents become local. Try with both Text + and Binary files.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Change</b></td> + <td width="25%">Mark as Merged</td> + <td width="50%">File becomes an outgoing change.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Addition</b></td> + <td width="25%">Update</td> + <td width="50%">Remote contents become local. Try with both Text + and Binary files.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Addition</b></td> + <td width="25%">Mark as Merged</td> + <td width="50%">File becomes an outgoing deletion.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Deletion</b></td> + <td width="25%">Update</td> + <td width="50%">Local file is deleted.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Deletion</b></td> + <td width="25%">Mark as Merged</td> + <td width="50%">File becomes an outgoing addition.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Change</b></td> + <td width="25%">Commit</td> + <td width="50%">Prompt for release comment. Cancel aborts, OK + commits local file to server.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Change</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Remote contents become local. Try with both Text + and Binary files.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Addition</b></td> + <td width="25%">Add to Version Control</td> + <td width="50%">Adds the file to version control. The icon + should change in the sync view, and Commit should now be enabled.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Addition</b></td> + <td width="25%">Add to .cvsignore</td> + <td width="50%">Adds the file to .cvsignore. The file should + disappear from the sync view. The .cvsignore file should appear (if + it wasn't visible already). The file should not appear in subsequent + syncs.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Addition</b></td> + <td width="25%">Commit</td> + <td width="50%">Prompt for release comment should also include + prompt for file type if the type of the new file is not known. Cancel + aborts, OK commits local file to server.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Addition</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Local file is deleted.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Deletion</b></td> + <td width="25%">Commit</td> + <td width="50%">Prompt for release comment. Cancel aborts, OK + commits deletion to server.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Deletion</b></td> + <td width="25%">Override and Update</td> + <td width="50%">File is re-created, remote contents become + local.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Change</b></td> + <td width="25%">Update</td> + <td width="50%">If the change is auto-mergable, the file becomes + an outgoing change and includes the remote changes and the local + changes. Otherwise, the user is prompted to indicate that a merge was + not possible.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Change</b></td> + <td width="25%">Mark As Merged</td> + <td width="50%">File becomes an outgoing change.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Change</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Dialog prompts user to replace local changes. If + user cancels nothing happens. If user chooses OK, then local changes + are discarded and remote contents replace local. No .# files created, + no CVS markup, and the file is not dirty as a result.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Addition</b></td> + <td width="25%">Mark as Merged</td> + <td width="50%">File becomes an outgoing change.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Addition</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Remote contents become local.</td> + </tr> + </tbody> </table> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00012.html b/tests/org.eclipse.team.tests.cvs.core/html/00012.html index b533b2f6a..89768599b 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00012.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00012.html @@ -1,7 +1,11 @@ -<html><head><title>Branch/Merge</title> +<html> +<head> +<title>Branch/Merge</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Branch/Merge</h2> - -</body></html>
\ No newline at end of file +</head> +<body> +<h2>Branch/Merge</h2> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00013.html b/tests/org.eclipse.team.tests.cvs.core/html/00013.html index d0b1bcc43..dc447d5e1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00013.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00013.html @@ -1,12 +1,19 @@ -<html><head><title>Synchronize View</title> +<html> +<head> +<title>Synchronize View</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Synchronize View</h2> +</head> +<body> +<h2>Synchronize View</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2004/06/01 19:14:48 $</p> <ul> -<li>Same scenarios as <a href="00011.html">CVS Synchronize View</a> except you can't commit. -<li>Test mark as merged (ensure that it can work on large data sets) + <li>Same scenarios as <a href="00011.html">CVS Synchronize + View</a> except you can't commit.</li> + <li>Test mark as merged (ensure that it can work on large data + sets)</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00014.html b/tests/org.eclipse.team.tests.cvs.core/html/00014.html index cae027d58..21d57a6b3 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00014.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00014.html @@ -1,10 +1,13 @@ -<html><head><title>History View</title> +<html> +<head> +<title>History View</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>History View</h2> - +</head> +<body> +<h2>History View</h2> <p>Since: 3.2 RC2<br> -Last Modified: $Date: 2006/0426 10:06:56 $</p> - -</body></html>
\ No newline at end of file +Last Modified: $Date: 2006/04/25 20:40:39 $</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00015.html b/tests/org.eclipse.team.tests.cvs.core/html/00015.html deleted file mode 100644 index 0f882594c..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00015.html +++ /dev/null @@ -1,16 +0,0 @@ -<html><head><title>Editor linking</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -</head><body><h2>Editor linking</h2> - -<ol> - <li>Open the Resource History view and enable editor linking</li> - <li>Open a compare editor from the sync view (on a resource that exists remotely) - and ensure that the history view updates.</li> - <li>Open an editor from the Repositories vew and ensure that the history view - updates.</li> - <li>Open an editoron a local file and ensure that the history view updates.</li> -</ol> -<p>Repeat the above with the Resource History view hidden and ensure that no revision - history is fetched (i.e. no jobs appear in progress view).</p> - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00016.html b/tests/org.eclipse.team.tests.cvs.core/html/00016.html deleted file mode 100644 index 266e46e54..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00016.html +++ /dev/null @@ -1,16 +0,0 @@ -<html><head><title>Sync View modes and working sets</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><body><h2>Sync View modes and working sets</h2> - -<p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/02/25 20:34:42 $</p> -Ensure that choosing modes and working sets -<ul> -<li>result in proper filtering -<li>updates status bar properly -<li>All actions on large sets (Mark as Merged as well) -</ul> - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00017.html b/tests/org.eclipse.team.tests.cvs.core/html/00017.html deleted file mode 100644 index 800d128eb..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00017.html +++ /dev/null @@ -1,29 +0,0 @@ -<html><head><title>Crash Recovery</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><body><h2>Crash Recovery</h2> - -<p>Scenario 1</p> -<ol> - <li>Turn on deep dirty decoration</li> - <li>Dirty a file and ensure that the file and it's parents are dirty</li> - <li>Quit Eclipse so dirty state is persisted</li> - <li>Restart and perform an override and update or commit and ensure file and - parents are clean</li> - <li>Kill Eclipse</li> - <li>Restart and ensure parents and file are clean</li> -</ol> -<p>Scenario 2</p> -<ol> - <li>Check out two copies of the same project</li> - <li>Dirty the same file in both projects, commit one and refresh the other in - the sync view so a conflict is visible</li> - <li>Quit Eclipse so that the sync state is persisted</li> - <li>Restart Eclipse and perform an Override and Commit on the conflict</li> - <li>Kill Eclipse</li> - <li>Restart Eclipse and ensure that the sync view doesn't show the file (i.e - the file is in-sync).</li> -</ol> - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00018.html b/tests/org.eclipse.team.tests.cvs.core/html/00018.html index fbb9676fb..20622f542 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00018.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00018.html @@ -1,20 +1,27 @@ -<html><head><title>Editor Linking</title> +<html> +<head> +<title>Editor Linking</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Editor Linking</h2> +</head> +<body> +<h2>Editor Linking</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2007/05/18 13:54:38 $</p> +Last Modified: $Date: 2007/05/23 13:19:15 $</p> <ol> - <li>Open the Resource History view and enable editor linking.</li> - <li>Open a compare editor from the sync view (on a resource that exists remotely) - and ensure that the history view updates.</li> - <li>Open an editor from the Repositories view and ensure that the history view - updates.</li> - <li>Open an editor on a local file and ensure that the history view updates.</li> + <li>Open the Resource History view and enable editor linking.</li> + <li>Open a compare editor from the sync view (on a resource that + exists remotely) and ensure that the history view updates.</li> + <li>Open an editor from the Repositories view and ensure that the + history view updates.</li> + <li>Open an editor on a local file and ensure that the history + view updates.</li> </ol> -<p>Repeat the above with the Resource History view hidden and ensure that no revision - history is fetched (i.e. no jobs appear in progress view).</p> +<p>Repeat the above with the Resource History view hidden and ensure +that no revision history is fetched (i.e. no jobs appear in progress +view).</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00019.html b/tests/org.eclipse.team.tests.cvs.core/html/00019.html index 3b6dac0d0..38c31eebb 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00019.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00019.html @@ -1,31 +1,39 @@ -<html><head><title>Crash Recovery</title> +<html> +<head> +<title>Crash Recovery</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Crash Recovery</h2> +</head> +<body> +<h2>Crash Recovery</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2007/05/23 13:19:15 $</p> <h3>Scenario 1</h3> <ol> - <li>Turn on deep dirty decoration</li> - <li>Dirty a file and ensure that the file and it's parents are dirty</li> - <li>Quit Eclipse so dirty state is persisted</li> - <li>Restart and perform an override and update or commit and ensure file and - parents are clean</li> - <li>Kill Eclipse</li> - <li>Restart and ensure parents and file are clean</li> + <li>Turn on deep dirty decoration</li> + <li>Dirty a file and ensure that the file and it's parents are + dirty</li> + <li>Quit Eclipse so dirty state is persisted</li> + <li>Restart and perform an override and update or commit and + ensure file and parents are clean</li> + <li>Kill Eclipse</li> + <li>Restart and ensure parents and file are clean</li> </ol> + <h3>Scenario 2</h3> <ol> - <li>Check out two copies of the same project</li> - <li>Dirty the same file in both projects, commit one and refresh the other in - the sync view so a conflict is visible</li> - <li>Quit Eclipse so that the sync state is persisted</li> - <li>Restart Eclipse and perform an Override and Commit on the conflict</li> - <li>Kill Eclipse</li> - <li>Restart Eclipse and ensure that the sync view doesn't show the file (i.e - the file is in-sync).</li> + <li>Check out two copies of the same project</li> + <li>Dirty the same file in both projects, commit one and refresh + the other in the sync view so a conflict is visible</li> + <li>Quit Eclipse so that the sync state is persisted</li> + <li>Restart Eclipse and perform an Override and Commit on the + conflict</li> + <li>Kill Eclipse</li> + <li>Restart Eclipse and ensure that the sync view doesn't show the + file (i.e the file is in-sync).</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00020.html b/tests/org.eclipse.team.tests.cvs.core/html/00020.html index ecbd13cda..1b3acdfa2 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00020.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00020.html @@ -1,6 +1,11 @@ -<html><head><title>Concurrency</title> +<html> +<head> +<title>Concurrency</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Concurrency</h2> -</body></html>
\ No newline at end of file +</head> +<body> +<h2>Concurrency</h2> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00021.html b/tests/org.eclipse.team.tests.cvs.core/html/00021.html index fb75b1906..143702d3f 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00021.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00021.html @@ -1,49 +1,61 @@ -<html><head><title>Close and disconnect</title> +<html> +<head> +<title>Close and disconnect</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Close and disconnect</h2> +</head> +<body> +<h2>Close and disconnect</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> <h4>Background refresh and disconnect</h4> <ol> - <li>Load several projects from the repository</li> - <li>Ensure that several have outgoing and incoming changes</li> - <li>Choose one project to disconnect. The project should have incoming and outgoing - changes and be one of the later ones in the refresh order (alphabetical).</li> - <li>Perform a refresh on all the projects</li> - <li>While the refresh is occurring, disconnect the project chosen in step 3) - and leave CVS folders.</li> - <li>Ensure that the project is removed from the sync view and no errors occur</li> + <li>Load several projects from the repository</li> + <li>Ensure that several have outgoing and incoming changes</li> + <li>Choose one project to disconnect. The project should have + incoming and outgoing changes and be one of the later ones in the + refresh order (alphabetical).</li> + <li>Perform a refresh on all the projects</li> + <li>While the refresh is occurring, disconnect the project chosen + in step 3) and leave CVS folders.</li> + <li>Ensure that the project is removed from the sync view and no + errors occur</li> </ol> <p>Repeat the steps and purge the CVS meta-data in step 5).</p> -<p>Repeat the above steps but change the operation in step 5) to the following:</p> +<p>Repeat the above steps but change the operation in step 5) to the +following:</p> <ul> - <li>close project</li> - <li>project where server is unreachable</li> - <li>delete project</li> - <li>binary project import over source project with outgoing changes</li> + <li>close project</li> + <li>project where server is unreachable</li> + <li>delete project</li> + <li>binary project import over source project with outgoing + changes</li> </ul> <h4>Decoration and disconnect</h4> <ul> - <li>Load several projects from the repository</li> - <li>Ensure that several have outgoing and incoming changes</li> - <li>Choose one project to disconnect. The project should have incoming and outgoing - changes and be one of the later ones in the refresh order (alphabetical).</li> - <li>Turn on CVS decorators</li> - <li>As the decorations are being calculated, disconnect all projects from CVS - control.</li> - <li>Ensure that the project is removed from the sync view and no errors occur</li> + <li>Load several projects from the repository</li> + <li>Ensure that several have outgoing and incoming changes</li> + <li>Choose one project to disconnect. The project should have + incoming and outgoing changes and be one of the later ones in the + refresh order (alphabetical).</li> + <li>Turn on CVS decorators</li> + <li>As the decorations are being calculated, disconnect all + projects from CVS control.</li> + <li>Ensure that the project is removed from the sync view and no + errors occur</li> </ul> -<p>Repeat the above steps but change the operation in step 5) to the following:</p> +<p>Repeat the above steps but change the operation in step 5) to the +following:</p> <ul> - <li>close project</li> - <li>project where server is unreachable</li> - <li>delete project</li> - <li>binary project import over source project with outgoing changes</li> - <li>delete or move files and folders (to test move/delete hook)</li> + <li>close project</li> + <li>project where server is unreachable</li> + <li>delete project</li> + <li>binary project import over source project with outgoing + changes</li> + <li>delete or move files and folders (to test move/delete hook)</li> </ul> - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00022.html b/tests/org.eclipse.team.tests.cvs.core/html/00022.html index 76d7d9e14..d67aa7fd2 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00022.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00022.html @@ -1,41 +1,45 @@ -<html><head><title>Performing a Merge</title> +<html> +<head> +<title>Performing a Merge</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Performing a Merge</h2> +</head> +<body> +<h2>Performing a Merge</h2> <p>Since: 3.1<br> -Last Modified: $Date: 2007/05/18 13:54:37 $</p> - +Last Modified: $Date: 2007/05/23 13:19:14 $</p> <h3>Scenario 1: One Time Merge</h3> -<p> -Using Team>Merge, merge the changes from a branch into HEAD. Once completed, in the synchronize view, -update the incoming changes, resolve any conflicts and ensure they worked, After updating, -redo the same merge. A no-changes dialog should be -presented since the local contents match the end-point. - -<p> -Things to try: +<p>Using Team>Merge, merge the changes from a branch into HEAD. Once +completed, in the synchronize view, update the incoming changes, resolve +any conflicts and ensure they worked, After updating, redo the same +merge. A no-changes dialog should be presented since the local contents +match the end-point. +<p>Things to try: <ul> -<li>Use content assist to select an existing branch for the end tag. A root versions should be automatically found if it exists. -<li>Choose to perform the merge into the local workspace. Ensure it works with and without a start tag. + <li>Use content assist to select an existing branch for the end + tag. A root versions should be automatically found if it exists.</li> + <li>Choose to perform the merge into the local workspace. Ensure + it works with and without a start tag.</li> </ul> <h3>Scenario 2: Ongoing Merge</h3> -After performing a one-time merge, pin the entry in the synchronize view. -Release changes to the end point (branch) and synchronize the merge. -The new changes should appear in the synchronize view. Update to these -changes as appropriate. +After performing a one-time merge, pin the entry in the synchronize +view. Release changes to the end point (branch) and synchronize the +merge. The new changes should appear in the synchronize view. Update to +these changes as appropriate. <h3>Scenario 3: Direct Merge</h3> -Perform a Team>Merge and choose to merge directly into the workspace. Try both the -case with a base tag and without it. - -<h3>Removing a Merge</h3> +Perform a Team>Merge and choose to merge directly into the workspace. +Try both the case with a base tag and without it. -<p>Delete the merge from the synchronize view using the remove toolbar button. The merge subscriber should be removed from the view. +<h3>Removing a Merge</h3> -</body></html>
\ No newline at end of file +<p>Delete the merge from the synchronize view using the remove +toolbar button. The merge subscriber should be removed from the view. +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00023.html b/tests/org.eclipse.team.tests.cvs.core/html/00023.html index c30bee182..4d783c250 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00023.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00023.html @@ -1,11 +1,14 @@ -<html><head><title>Restarting Workbench</title> +<html> +<head> +<title>Restarting Workbench</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Restarting Workbench</h2> +</head> +<body> +<h2>Restarting Workbench</h2> <p>Since: <br> -Last Modified: $Date: 2004/01/13 18:46:26 $</p><body> - +Last Modified: $Date: 2004/02/25 20:34:42 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00024.html b/tests/org.eclipse.team.tests.cvs.core/html/00024.html index 9b61f4414..194c60fd2 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00024.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00024.html @@ -1,41 +1,52 @@ -<html><head><title>Annotate</title> +<html> +<head> +<title>Annotate</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Annotate</h2> +</head> +<body> +<h2>Annotate</h2> <p>Since: 3.0 M6<br> -Last Modified: $Date: 2004/02/25 20:34:42 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <h4>Annotate action should be available from</h4> <ul> -<li>history view, repo explorer, resource/packages view + <li>history view, repo explorer, resource/packages view</li> </ul> <h4>Annotate java files</h4> <ul> -<li>should show the java editor -<li>you should be able to step through changes in the annotate view and the java editor should -stay in sync (e.g. highlight) the changes associated with the selected change in the annotate view. -<li>you should also be able to select a line in the java file and the annotate view should -select the change that is associated with that line. -<li>the history view should show the history for the opened file and highlight the revision -of the currently selected change in the annotate view. + <li>should show the java editor</li> + <li>you should be able to step through changes in the annotate + view and the java editor should stay in sync (e.g. highlight) the + changes associated with the selected change in the annotate view.</li> + <li>you should also be able to select a line in the java file and + the annotate view should select the change that is associated with that + line.</li> + <li>the history view should show the history for the opened file + and highlight the revision of the currently selected change in the + annotate view.</li> </ul> <h4>Annotate non-text editor files</h4> <ul> -<li>annotate plugin.xml file -<li>the default text editor should be shown -<li>you should also be able to select a line in the text file and the annotate view should -select the change that is associated with that line. -<li>the history view should show the history for the opened file and highlight the revision -of the currently selected change in the annotate view. + <li>annotate plugin.xml file</li> + <li>the default text editor should be shown</li> + <li>you should also be able to select a line in the text file and + the annotate view should select the change that is associated with that + line.</li> + <li>the history view should show the history for the opened file + and highlight the revision of the currently selected change in the + annotate view.</li> </ul> <h4>Annotate binary files</h4> <ul> -<li>annotate a file marked as binary -<li>the server should report an error that annotations cannot be shown for binary files. + <li>annotate a file marked as binary</li> + <li>the server should report an error that annotations cannot be + shown for binary files.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00025.html b/tests/org.eclipse.team.tests.cvs.core/html/00025.html index 970e06f98..74558dd2e 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00025.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00025.html @@ -1,19 +1,26 @@ -<html><head><title>Synchronize View Settings</title> +<html> +<head> +<title>Synchronize View Settings</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Synchronize View Settings</h2> +</head> +<body> +<h2>Synchronize View Settings</h2> <p>Since: 3.0 M6<br> -Last Modified: $Date: 2004/02/25 20:34:42 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <h4>Saved between sessions</h4> -<p>The following GUI preferences in the Synchronize View are persisted between workbench -sessions. Also they are persisted for each participant. You should be able to create -a merge and workspace participant, then change the settings on each. Restart Eclipse and the settings -should be maintained for each participant. The persisted settings are:</p> +<p>The following GUI preferences in the Synchronize View are +persisted between workbench sessions. Also they are persisted for each +participant. You should be able to create a merge and workspace +participant, then change the settings on each. Restart Eclipse and the +settings should be maintained for each participant. The persisted +settings are:</p> <ul> -<li>mode -<li>layout -<li>working set + <li>mode</li> + <li>layout</li> + <li>working set</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00026.html b/tests/org.eclipse.team.tests.cvs.core/html/00026.html index 3836925ae..3f9ac749e 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00026.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00026.html @@ -1,11 +1,14 @@ -<html><head><title>Sharing</title> +<html> +<head> +<title>Sharing</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Sharing</h2> +</head> +<body> +<h2>Sharing</h2> <p>Since: <br> -Last Modified: $Date: 2004/01/13 18:46:26 $</p><body> - +Last Modified: $Date: 2004/02/25 20:34:42 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00027.html b/tests/org.eclipse.team.tests.cvs.core/html/00027.html index 8f3373f57..232bda121 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00027.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00027.html @@ -1,18 +1,25 @@ -<html><head><title>Sharing as a subfolder</title> +<html> +<head> +<title>Sharing as a subfolder</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Sharing as a subfolder</h2> +</head> +<body> +<h2>Sharing as a subfolder</h2> <p>Since: 3.0 M6<br> -Last Modified: $Date: 2004/02/25 20:34:42 $</p> +Last Modified: $Date: 2007/05/23 13:19:15 $</p> <p>Perform the following steps:</p> <ol> - <li>Create a new project</li> - <li>Select Team>Share</li> - <li>Select a repository and click Next</li> - <li>Enter a path with at least two segments as the remote module name</li> - <li>Click Finish</li> + <li>Create a new project</li> + <li>Select Team>Share</li> + <li>Select a repository and click Next</li> + <li>Enter a path with at least two segments as the remote module + name</li> + <li>Click Finish</li> </ol> -<p>Ensure that the project was shared properly (i.e. remote folders were created). -</body></html>
\ No newline at end of file +<p>Ensure that the project was shared properly (i.e. remote folders +were created).</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00028.html b/tests/org.eclipse.team.tests.cvs.core/html/00028.html index 706fe0242..34cc45048 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00028.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00028.html @@ -1,52 +1,67 @@ -<html><head><title>Reconnecting an existing project</title> +<html> +<head> +<title>Reconnecting an existing project</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Reconnecting an existing project</h2> +</head> +<body> +<h2>Reconnecting an existing project</h2> <p>Since: 3.0 M6<br> -Last Modified: $Date: 2007/05/18 13:54:38 $</p> -<p> -The following scenario represents how a user would reconnect a project that does -not contain CVS meta-data to it's remote counterpart. It is assumed that the local project -was derived from a previous version of the remote project but both the local project and -the remote may have been modified since then. -</p> +Last Modified: $Date: 2007/05/23 13:19:15 $</p> +<p>The following scenario represents how a user would reconnect a +project that does not contain CVS meta-data to it's remote counterpart. +It is assumed that the local project was derived from a previous version +of the remote project but both the local project and the remote may have +been modified since then.</p> <h3>Scenario 1: Existing location using project name</h3> <p>Perform the following steps:</p> <ol> - <li>Load an existing project (using Checkout or you could import a plug-in project from the target area).</li> - <li>Disconnect the project and indicate that CVS meta-data is to be deleted.</li> - <li>Modify some local resources.</li> - <li>Optionally, modify the remote contents of some resources using a separate checkout.</li> - <li>Perform a Team>Share Project and select CVS (if there is more than one - repository provider available).</li> - <li>Select the repository the project was loaded from and click Next.</li> - <li>Use the project name as the module name. Click Next.</li> - <li>In the tag page, select HEAD as the branch to share with and click Next.</li> - <li>In the sharing page, only the files that do not have the same contents - as the server should appear. Perform a Mark as Merged or Commit on these - files. - <li>Click Finish.</li> + <li>Load an existing project (using Checkout or you could import a + plug-in project from the target area).</li> + <li>Disconnect the project and indicate that CVS meta-data is to + be deleted.</li> + <li>Modify some local resources.</li> + <li>Optionally, modify the remote contents of some resources using + a separate checkout.</li> + <li>Perform a Team>Share Project and select CVS (if there is more + than one repository provider available).</li> + <li>Select the repository the project was loaded from and click + Next.</li> + <li>Use the project name as the module name. Click Next.</li> + <li>In the tag page, select HEAD as the branch to share with and + click Next.</li> + <li>In the sharing page, only the files that do not have the same + contents as the server should appear. Perform a Mark as Merged or + Commit on these files.</li> + <li>Click Finish.</li> </ol> <h3>Scenario 1: New location using custom module name</h3> <p>Perform the following steps:</p> <ol> - <li>Load an existing project using Checkout As and a different name.</li> - <li>Disconnect the project and indicate that CVS meta-data is to be deleted.</li> - <li>Discard the repository location.</li> - <li>Modify some local resources.</li> - <li>Optionally, modify the remote contents of some resources using a separate checkout</li> - <li>Perform a Team>Share Project and select CVS (if there is more than one - repository provider available).</li> - <li>Select to create a new repository and click Next.</li> - <li>Enter the repository information for the repository and click Next.</li> - <li>Enter the name of the module that the project was loaded from. Click Next.</li> - <li>In the tag page, select HEAD as the branch to share with and click Next.</li> - <li>In the sharing page, only the files that do not have the same contents - as the server should appear. Perform a Mark as Merged or Commit on these - files. - <li>Click Finish.</li> + <li>Load an existing project using Checkout As and a different + name.</li> + <li>Disconnect the project and indicate that CVS meta-data is to + be deleted.</li> + <li>Discard the repository location.</li> + <li>Modify some local resources.</li> + <li>Optionally, modify the remote contents of some resources using + a separate checkout</li> + <li>Perform a Team>Share Project and select CVS (if there is more + than one repository provider available).</li> + <li>Select to create a new repository and click Next.</li> + <li>Enter the repository information for the repository and click + Next.</li> + <li>Enter the name of the module that the project was loaded from. + Click Next.</li> + <li>In the tag page, select HEAD as the branch to share with and + click Next.</li> + <li>In the sharing page, only the files that do not have the same + contents as the server should appear. Perform a Mark as Merged or + Commit on these files.</li> + <li>Click Finish.</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00028a.html b/tests/org.eclipse.team.tests.cvs.core/html/00028a.html index f6ba48671..23828b162 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00028a.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00028a.html @@ -1,10 +1,13 @@ -<html><head><title>SSH2</title> +<html> +<head> +<title>SSH2</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>SSH2</h2> -<p> -Tests for the ssh2 connection method.<br> -UNDER CONSTRUCTION -</p> -</body></html>
\ No newline at end of file +</head> +<body> +<h2>SSH2</h2> +<p>Tests for the ssh2 connection method.<br> +UNDER CONSTRUCTION</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00029.html b/tests/org.eclipse.team.tests.cvs.core/html/00029.html index 5977ac65f..b6fe1731b 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00029.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00029.html @@ -1,11 +1,14 @@ -<html><head><title>Patching</title> +<html> +<head> +<title>Patching</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Patching</h2> +</head> +<body> +<h2>Patching</h2> <p>Since: 3.0 M6<br> -Last Modified: $Date: 2004/01/13 18:46:26 $</p><body> - +Last Modified: $Date: 2004/02/25 20:34:42 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00029a.html b/tests/org.eclipse.team.tests.cvs.core/html/00029a.html index d4d4c8fc9..f4e49550f 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00029a.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00029a.html @@ -1,12 +1,15 @@ -<html><head><title>Server version compatibiliity</title> +<html> +<head> +<title>Server version compatibiliity</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Server version compatibiliity</h2> +</head> +<body> +<h2>Server version compatibiliity</h2> <p>Since: M6<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> - -This test is to ensure that the ssh2 connection method properly delegates to ssh1 -when the server only supports ssh1. - -</body></html>
\ No newline at end of file +Last Modified: $Date: 2007/05/18 13:54:37 $</p> +This test is to ensure that the ssh2 connection method properly +delegates to ssh1 when the server only supports ssh1. +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00030.html b/tests/org.eclipse.team.tests.cvs.core/html/00030.html index 5716fe58d..101ea88c5 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00030.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00030.html @@ -4,7 +4,7 @@ <meta NAME="since" content=""> </head><body><h2>Importing a zip over a shared project</h2> <p>Since: 3.0 M6<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> <p>This scenario captures one means of patching. It assumes that a zip file contains a previous version of a project that has been modified in some way and added to @@ -16,13 +16,14 @@ a zip archive (without CVS directories).</p> <li>Import the zip over the loaded project.</li> <li>Ensure that the sync states are Outgoing for all resources from the zip file.</li> <li>Ensure that all folders from the zip file (except new ones) - are marked as in-sync and all files (except new ones) are outgoing changes. + are marked as in-sync and all files (except new ones) are outgoing changes.</li> <li>Changing the comparison criteria to compare contents should not contact the server and should leave only the resources that differ in the sync view. Perform a Mark As Merged and a Commit on these resources.</li> - <li>Changing the comparison criteria back to revision number will reveal all the files - whose content did not change, perform a Mark as merged on these resources followed by - a Team>Update on the project in the Navigator (Note: This could be handled better).</li> + <li>Changing the comparison criteria back to revision number will + reveal all the files whose content did not change, perform a Mark as + merged on these resources followed by a Team>Update on the project in + the Navigator (Note: This could be handled better).</li> <li>After the update, ensure the project has no out-of-sync resources.</li> </ol> diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00030a.html b/tests/org.eclipse.team.tests.cvs.core/html/00030a.html index ed135e104..0bbf44492 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00030a.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00030a.html @@ -1,11 +1,14 @@ -<html><head><title>Proxies</title> +<html> +<head> +<title>Proxies</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Proxies</h2> +</head> +<body> +<h2>Proxies</h2> <p>Since: <br> -Last Modified: $Date: 2004/02/25 20:34:42 $</p> - +Last Modified: $Date: 2004/06/01 15:23:56 $</p> Using HTTP and SOCKS5 proxies. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00031.html b/tests/org.eclipse.team.tests.cvs.core/html/00031.html index 37a77e7af..4425d19f0 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00031.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00031.html @@ -1,16 +1,23 @@ -<html><head><title>Key Generation</title> +<html> +<head> +<title>Key Generation</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Key Generation</h2> +</head> +<body> +<h2>Key Generation</h2> <p>Since: <br> -Last Modified: $Date: 2004/02/10 17:06:35 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> -You should be able to generate private/public keys in the SSH2 preference -page. Here are some scenarios for testing: +You should be able to generate private/public keys in the SSH2 +preference page. Here are some scenarios for testing: <ul> -<li>Generate keys and save private key without password. You should be prompted. -<li>Generate keys and save private key with password. You shouldn't be prompted. -<li>Generate keys and install using the sftp button. + <li>Generate keys and save private key without password. You + should be prompted.</li> + <li>Generate keys and save private key with password. You + shouldn't be prompted.</li> + <li>Generate keys and install using the sftp button.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00032.html b/tests/org.eclipse.team.tests.cvs.core/html/00032.html index 2c66a51e9..98e988068 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00032.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00032.html @@ -1,16 +1,23 @@ -<html><head><title>General use</title> +<html> +<head> +<title>General use</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>General use</h2> +</head> +<body> +<h2>General use</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 20:01:23 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> This tests the prompting and usage of the SSH2 connection method: <ul> -<li>Delete all files in your SSH_HOME directory. You can find this directory by opening the SSH2 preference page -<li>Create a CVS repository connection of type 'extssh'. You will be prompting about the server id not being in -your known_hosts file. -<li>Select cancel, and error should be shown indicating that the location was not validated do you want to keep it. + <li>Delete all files in your SSH_HOME directory. You can find this + directory by opening the SSH2 preference page</li> + <li>Create a CVS repository connection of type 'extssh'. You will + be prompting about the server id not being in your known_hosts file.</li> + <li>Select cancel, and error should be shown indicating that the + location was not validated do you want to keep it.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00033.html b/tests/org.eclipse.team.tests.cvs.core/html/00033.html index 811c50546..8a0b1db21 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00033.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00033.html @@ -1,11 +1,14 @@ -<html><head><title>Annotate</title> +<html> +<head> +<title>Annotate</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Annotate</h2> +</head> +<body> +<h2>Annotate</h2> <p>Since: <br> -Last Modified: $Date: 2004/02/21 01:46:02 $</p><body> - +Last Modified: $Date: 2004/02/25 20:34:42 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00034.html b/tests/org.eclipse.team.tests.cvs.core/html/00034.html index bcda592e1..4521238bc 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00034.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00034.html @@ -1,12 +1,17 @@ -<html><head><title>Show Annotation Action</title> +<html> +<head> +<title>Show Annotation Action</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Show Annotation Action</h2> +</head> +<body> +<h2>Show Annotation Action</h2> <p>Since: 3.0 M3<br> -Last Modified: $Date: 2004/06/02 18:01:36 $</p> - -<p>Annotate a non-managed file, binary file, plugin.xml file... Be creative.</p> -<p>Ensure that the annotate view, editor, and history view stay synchronized.</p> - -</body></html>
\ No newline at end of file +Last Modified: $Date: 2007/05/18 13:54:37 $</p> +<p>Annotate a non-managed file, binary file, plugin.xml file... Be +creative.</p> +<p>Ensure that the annotate view, editor, and history view stay +synchronized.</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00035.html b/tests/org.eclipse.team.tests.cvs.core/html/00035.html index acffdefcd..206ac27f7 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00035.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00035.html @@ -1,11 +1,14 @@ -<html><head><title>Label Decorations</title> +<html> +<head> +<title>Label Decorations</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Label Decorations</h2> +</head> +<body> +<h2>Label Decorations</h2> <p>Since: <br> -Last Modified: $Date: 2004/02/21 01:46:02 $</p><body> - +Last Modified: $Date: 2004/02/25 20:34:42 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00036.html b/tests/org.eclipse.team.tests.cvs.core/html/00036.html index c8c192d48..3f802f113 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00036.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00036.html @@ -1,16 +1,25 @@ -<html><head><title>Enablement at startup</title> +<html> +<head> +<title>Enablement at startup</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Enablement at startup</h2> +</head> +<body> +<h2>Enablement at startup</h2> <p>Since: 3.0 M7<br> -Last Modified: $Date: 2004/06/02 18:01:36 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> -<p>The CVS decorators should not be enabled at start-up. Verify the label decorator preference page.</p> -Here are some scenarios for testing: +<p>The CVS decorators should not be enabled at start-up. Verify the +label decorator preference page.</p> +Here are some scenarios for testing: <ul> -<li>When sharing or checking out a project, the decorators will be enabled automatically.</li> -<li>Disabling after they have been enabled and restarting. The decorators should be disabled. Checkout should not enable them again.</li> -<li>Enable the decorations again, then disconnecting a project should clear the decorators on the project.</li> + <li>When sharing or checking out a project, the decorators will be + enabled automatically.</li> + <li>Disabling after they have been enabled and restarting. The + decorators should be disabled. Checkout should not enable them again.</li> + <li>Enable the decorations again, then disconnecting a project + should clear the decorators on the project.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00037.html b/tests/org.eclipse.team.tests.cvs.core/html/00037.html index b4ded54c7..8c8e5b385 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00037.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00037.html @@ -1,18 +1,20 @@ -<html><head><title>Customizations</title> +<html> +<head> +<title>Customizations</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Customizations</h2> +</head> +<body> +<h2>Customizations</h2> <p>Since: 3.1 <br> -Last Modified: $Date: 2005/05/10 16:16:42 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> -<p>You can customize the label decorations via the preference page. -The customizations will -take effect when apply is pressed. Resetting the defaults should work. -</p> -<p> -You can also configure the font and color used for various resources states. -There should be a link from the CVS label decorations preference page to the -general colors and fonts preference page. - -</body></html>
\ No newline at end of file +<p>You can customize the label decorations via the preference page. +The customizations will take effect when apply is pressed. Resetting the +defaults should work.</p> +<p>You can also configure the font and color used for various +resources states. There should be a link from the CVS label decorations +preference page to the general colors and fonts preference page.</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00038.html b/tests/org.eclipse.team.tests.cvs.core/html/00038.html index ca1e3549d..edbde2346 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00038.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00038.html @@ -1,19 +1,25 @@ -<html><head><title>Decorations in the Synchronize pages</title> +<html> +<head> +<title>Decorations in the Synchronize pages</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Decorations in the Synchronize pages</h2> +</head> +<body> +<h2>Decorations in the Synchronize pages</h2> <p>Since: 3.0 M8<br> -Last Modified: $Date: 2004/06/02 18:01:36 $</p> -<p> -CVS text label decorations should be visible in the CVS synchronize participants. We don't bother to show -the images because the sync view already shows the state images. The labels should also update if the -'show change in label' preference is changed. -</p> -<p> -Also, in the CVS synchronize view the revisions shown are the <local> - <remote>. So ensure that the correct -remote is shown.</p> -<p> -Ensure that when the local tag changes the decorators in the sync view and navigator get updated.</p> -<p>Ensure that there is no flicker in packages view when CVS decorator updated on commit, update.</p> -</body></html>
\ No newline at end of file +Last Modified: $Date: 2007/05/23 13:19:15 $</p> + +<p>CVS text label decorations should be visible in the CVS +synchronize participants. We don't bother to show the images because the +sync view already shows the state images. The labels should also update +if the 'show change in label' preference is changed.</p> +<p>Also, in the CVS synchronize view the revisions shown are the +<local> - <remote>. So ensure that the correct remote is +shown.</p> +<p>Ensure that when the local tag changes the decorators in the sync +view and navigator get updated.</p> +<p>Ensure that there is no flicker in packages view when CVS +decorator updated on commit, update.</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00039.html b/tests/org.eclipse.team.tests.cvs.core/html/00039.html index 97a3bcc7a..b73be3ab1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00039.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00039.html @@ -1,40 +1,52 @@ -<html><head><title>Compare with another branch or version</title> +<html> +<head> +<title>Compare with another branch or version</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Compare with another branch or version</h2> +</head> +<body> +<h2>Compare with another branch or version</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> -<p> -You should be able to select a project/folder/resource and compare against -another branch or version. Multi-select should work across projects in -different repositories. Once the comparison is shown it should be possible to -merge changes into the local workspace. It should also be possible to remember -the comparison, which will cause it to appear in the synchronize view.</p> -<p> -We should support multi-selection of files, but I'm not sure what should be -shown to the user in those cases.</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> + +<p>You should be able to select a project/folder/resource and +compare against another branch or version. Multi-select should work +across projects in different repositories. Once the comparison is shown +it should be possible to merge changes into the local workspace. It +should also be possible to remember the comparison, which will cause it +to appear in the synchronize view.</p> +<p>We should support multi-selection of files, but I'm not sure what +should be shown to the user in those cases.</p> <h3>On file selected</h3> <ul> -<li>If the file has differences open a compare editor and show otherwise a message is shown to indicate that the file is the same. -<li>should be able to open the history view and link in to the opened compare editor -<li>the compare editor should update when changes are made to the local file in some other context (e.g other editor, refactoring). + <li>If the file has differences open a compare editor and show + otherwise a message is shown to indicate that the file is the same.</li> + <li>should be able to open the history view and link in to the + opened compare editor</li> + <li>the compare editor should update when changes are made to the + local file in some other context (e.g other editor, refactoring).</li> </ul> <h3>Multiple selection</h3> -<p>Entire contents of the folder are compared deep. If changes are found the user is notified and they are -shown in a dialog. If no changes are found the user is notified. The dialog should allow the user to browse -the changes and merge anything into his workspace. If the user wants to keep the comparison non-model, he -can add it to the synchronize view. There is a button to do so on the compare dialog.</p> +<p>Entire contents of the folder are compared deep. If changes are +found the user is notified and they are shown in a dialog. If no changes +are found the user is notified. The dialog should allow the user to +browse the changes and merge anything into his workspace. If the user +wants to keep the comparison non-model, he can add it to the synchronize +view. There is a button to do so on the compare dialog.</p> <h3>Merging changes</h3> -<p> -When the compare dialog is showing several changes you should be able to selectively merge anything into the local workspace. Specific attention should -be made to the following cases: -</p> +<p>When the compare dialog is showing several changes you should be +able to selectively merge anything into the local workspace. Specific +attention should be made to the following cases:</p> <ul> -<li>Edit the local then press ok. You should be prompted to save the changes and the changes should be correctly updated in the corresponding resource. -<li>Edit the local and browse to another file. You should be prompted to save the changes. -<li>Press the cancel button with changes, you should be prompted. + <li>Edit the local then press ok. You should be prompted to save + the changes and the changes should be correctly updated in the + corresponding resource.</li> + <li>Edit the local and browse to another file. You should be + prompted to save the changes.</li> + <li>Press the cancel button with changes, you should be prompted.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00040.html b/tests/org.eclipse.team.tests.cvs.core/html/00040.html index 7b64daa37..e1533d7b9 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00040.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00040.html @@ -1,11 +1,15 @@ -<html><head><title>Reverting deleted resources</title> +<html> +<head> +<title>Reverting deleted resources</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Reverting deleted resources</h2> +</head> +<body> +<h2>Reverting deleted resources</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> - -You should be able to restore a deleted revision from the CVS server Team>Restore from Repository - -</body></html>
\ No newline at end of file +Last Modified: $Date: 2004/06/01 19:14:48 $</p> +You should be able to restore a deleted revision from the CVS server +Team>Restore from Repository +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00041.html b/tests/org.eclipse.team.tests.cvs.core/html/00041.html index aea279532..31a4a69f9 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00041.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00041.html @@ -1,17 +1,29 @@ -<html><head><title>File Revisions</title> +<html> +<head> +<title>File Revisions</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>File Revisions</h2> +</head> +<body> +<h2>File Revisions</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/03/15 22:00:31 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <h3>Compare the local resource with other revisions</h3> <ul> -<li>If the file isn't managed the action should no appear. -<li>If the file doesn't have any revisions you should be prompted -<li>If the file has revisions you should be prompted with the list of revisions in a compare dialog -<li>In the compare dialog you can select any revision and merge changes into the local copy -<li>If you edit the local resource then chose OK, you will be prompted to save changes. Ensure that the changes are saved correctly to the underlying resource. -<li>Ensure that the titles are ok (e.g. dialog title, structure pane title...) -</ul>
\ No newline at end of file + <li>If the file isn't managed the action should no appear.</li> + <li>If the file doesn't have any revisions you should be prompted</li> + <li>If the file has revisions you should be prompted with the list + of revisions in a compare dialog</li> + <li>In the compare dialog you can select any revision and merge + changes into the local copy</li> + <li>If you edit the local resource then chose OK, you will be + prompted to save changes. Ensure that the changes are saved correctly + to the underlying resource.</li> + <li>Ensure that the titles are ok (e.g. dialog title, structure + pane title...)</li> +</ul> + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00042.html b/tests/org.eclipse.team.tests.cvs.core/html/00042.html index ccc7bbecb..14f94fa4d 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00042.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00042.html @@ -1,20 +1,30 @@ -<html><head><title>CVS Console</title> +<html> +<head> +<title>CVS Console</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>CVS Console</h2> +</head> +<body> +<h2>CVS Console</h2> <p>Since: <br> -Last Modified: $Date: 2006/05/02 18:55:07 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> -There are a couple of preferences that controls the behavior and presentation of the console. -To enable this testing, you must first enable font and label decorations. This can be done -by going to <i>Window/Preferences/Team/CVS/Label Decorations</i> and checking off <b>"Enable font -and color decorations"</b>. -<p> -These are: +There are a couple of preferences that controls the behavior and +presentation of the console. To enable this testing, you must first +enable font and label decorations. This can be done by going to +<i>Window/Preferences/Team/CVS/Label Decorations</i> +and checking off +<b>"Enable font and color decorations"</b> +. +<p>These are:</p> <ul> -<li>font: changing the font should immediately update the sync view as well as all other views decorated by CVS (ie. Package Explorer). -<li>font color: message color, error color, command line. Changing these should immediately update the console view. + <li>font: changing the font should immediately update the sync + view as well as all other views decorated by CVS (ie. Package + Explorer).</li> + <li>font color: message color, error color, command line. Changing + these should immediately update the console view.</li> </ul> -</p> -</body></html>
\ No newline at end of file + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00043.html b/tests/org.eclipse.team.tests.cvs.core/html/00043.html deleted file mode 100644 index e618f1876..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/00043.html +++ /dev/null @@ -1,14 +0,0 @@ -<html><head><title>Preferences</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><h2>Preferences</h2> -<p>Since: M8<br> -Last Modified: $Date: 2004/03/05 17:12:22 $</p><body> - -There are a couple of preferences that controls the behavior and presentation of the console. These are: -<ul> -<li>font color: message color, error color, command line. Changing these should immediatly update the console view. -</ul> - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00044.html b/tests/org.eclipse.team.tests.cvs.core/html/00044.html index b5362520f..c9eb01b39 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00044.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00044.html @@ -1,11 +1,14 @@ -<html><head><title>Replacing</title> +<html> +<head> +<title>Replacing</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Replacing</h2> +</head> +<body> +<h2>Replacing</h2> <p>Since: <br> -Last Modified: $Date: 2004/03/05 17:12:22 $</p><body> - +Last Modified: $Date: 2004/03/09 20:51:17 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00045.html b/tests/org.eclipse.team.tests.cvs.core/html/00045.html index 6dec75660..72632c238 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00045.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00045.html @@ -1,14 +1,21 @@ -<html><head><title>With latest</title> +<html> +<head> +<title>With latest</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>With latest</h2> +</head> +<body> +<h2>With latest</h2> <p>Since: <br> -Last Modified: $Date: 2007/05/18 13:54:37 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> -<p>Ensure that the replace operation overwrites any outgoing changes. And verify the following: +<p>Ensure that the replace operation overwrites any outgoing +changes. And verify the following:</p> <ul> -<li>Label decorations (e.g. outgoing change flag, version) are updated in the navigator/packages view and synchronize view.</li> + <li>Label decorations (e.g. outgoing change flag, version) are + updated in the navigator/packages view and synchronize view.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00046.html b/tests/org.eclipse.team.tests.cvs.core/html/00046.html index 08f59649d..9ad844294 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00046.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00046.html @@ -1,19 +1,24 @@ -<html><head><title>With another branch of version</title> +<html> +<head> +<title>With another branch of version</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>With another branch of version</h2> +</head> +<body> +<h2>With another branch of version</h2> <p>Since: <br> -Last Modified: $Date: 2005/05/10 16:16:42 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> -<p>Check the following for all cases of replace: +<p>Check the following for all cases of replace:</p> <ul> -<li>Decorators are updated in the navigator/packages view and synchronize view. -<li>If a version is loaded that you can't commit to it -<li>If a branch is loaded, that you can commit to it. + <li>Decorators are updated in the navigator/packages view and + synchronize view.</li> + <li>If a version is loaded that you can't commit to it</li> + <li>If a branch is loaded, that you can commit to it.</li> </ul> -<p> -Also ensure that the tag filtering in the dialog works properly. +<p>Also ensure that the tag filtering in the dialog works properly.</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00047.html b/tests/org.eclipse.team.tests.cvs.core/html/00047.html index 93ffb0451..6c8403575 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00047.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00047.html @@ -1,19 +1,29 @@ -<html><head><title>With file revision</title> +<html> +<head> +<title>With file revision</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>With file revision</h2> +</head> +<body> +<h2>With file revision</h2> <p>Since: <br> -Last Modified: $Date: 2004/03/15 22:00:31 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <ul> -<li>If the file isn't managed the action should no appear. -<li>If the file doesn't have any revisions you should be prompted -<li>If the file has revisions you should be prompted with the list of revisions in a compare dialog -<li>In the compare dialog you can select any revision and compare changes but merging isn't supported -<li>If a revision is selected the Replace button should be enabled. Otherwise it should be disabled -<li>If you selected the replace button the file should contain the contents of the revision selected. The dialog will also close. -<li>Ensure that the titles are ok (e.g. dialog title, structure pane title...) + <li>If the file isn't managed the action should no appear.</li> + <li>If the file doesn't have any revisions you should be prompted</li> + <li>If the file has revisions you should be prompted with the list + of revisions in a compare dialog</li> + <li>In the compare dialog you can select any revision and compare + changes but merging isn't supported</li> + <li>If a revision is selected the Replace button should be + enabled. Otherwise it should be disabled</li> + <li>If you selected the replace button the file should contain the + contents of the revision selected. The dialog will also close.</li> + <li>Ensure that the titles are ok (e.g. dialog title, structure + pane title...)</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00048.html b/tests/org.eclipse.team.tests.cvs.core/html/00048.html index 6fa359ef8..a67c0fc52 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00048.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00048.html @@ -1,54 +1,67 @@ -<html><head><title>Performing a Synchronize</title> +<html> +<head> +<title>Performing a Synchronize</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Performing a Synchronize</h2> +</head> +<body> +<h2>Performing a Synchronize</h2> <p>Since: 3.0<br> -Last Modified: $Date: 2006/04/25 17:34:55 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> -<p> -Synchronizing means to compare your local workspace contents with the contents -in another location with the goal that the two locations should contain the -same contents at some point. -</p> +<p>Synchronizing means to compare your local workspace contents with +the contents in another location with the goal that the two locations +should contain the same contents at some point.</p> <h3>Performing a Synchronize operation</h3> -<p> -There are a few ways of launching a synchronize operation. They all open the same dialog but the initial -selection is affected by where the operation is launched. Here is the list of ways to start a -synchronize along with the expected initial selection. + +<p>There are a few ways of launching a synchronize operation. They +all open the same dialog but the initial selection is affected by where +the operation is launched. Here is the list of ways to start a +synchronize along with the expected initial selection.</p> + <ul> -<li><b>Using the global synchronize action (via toolbar or keybinding)</b>: The -selection should be obtained from the active view. If no view is active, all -projects should be selected. -<li><b>Using the Synchronize button in toolbar of the Synchronize view</b>: -All projects should be selected. -<li><b>Selecting Synchronize from the context menu of resources in the synchronize view</b>: -The selection should match what was selected when the menu was selected. -<li><b>Selecting Team > Synchronize with Repository from the context menu of any resource based view</b>: -The selection should match what was selected when the menu was selected. + <li><b>Using the global synchronize action (via toolbar or + keybinding)</b>: The selection should be obtained from the active view. If + no view is active, all projects should be selected.</li> + <li><b>Using the Synchronize button in toolbar of the + Synchronize view</b>: All projects should be selected.</li> + <li><b>Selecting Synchronize from the context menu of + resources in the synchronize view</b>: The selection should match what was + selected when the menu was selected.</li> + <li><b>Selecting Team > Synchronize with Repository from the + context menu of any resource based view</b>: The selection should match + what was selected when the menu was selected.</li> </ul> -</p> -<p> -Once launched, a synchronize will run in the background. Currently, the user is prompted to -switch perspectives when the synchronize is launched. When a synchronize completes, the user is prompted either with a dialog stating there is no changes -or one that contains a details area that shows the incoming changes. The user -is given the option to suppress the post-synchronize dialog. -<h3>Notice a file is out-of-sync in another view (e.g. packages explorer, types) and want to see the changes</h3> -<p>In case you can select a file, it will be refreshed with the server, and if changes are found the compare editor is opened -that will allow browsing the changes. If no changes are found, you will be prompted.</p> +<p>Once launched, a synchronize will run in the background. +Currently, the user is prompted to switch perspectives when the +synchronize is launched. When a synchronize completes, the user is +prompted either with a dialog stating there is no changes or one that +contains a details area that shows the incoming changes. The user is +given the option to suppress the post-synchronize dialog.</p> + +<h3>Notice a file is out-of-sync in another view (e.g. packages +explorer, types) and want to see the changes</h3> + +<p>In case you can select a file, it will be refreshed with the +server, and if changes are found the compare editor is opened that will +allow browsing the changes. If no changes are found, you will be +prompted.</p> -<h3>From another view would like to browse the outgoing/incoming changes for several resources</h3> -<p>Select a folder or group of files and Team > Synchronize will open the sync view and automatically refresh with -the remote repository.</p> +<h3>From another view would like to browse the outgoing/incoming +changes for several resources</h3> -<h3>In the sync view and would like to refresh to see if there are new changes from the server</h3> -<p> +<p>Select a folder or group of files and Team > Synchronize will +open the sync view and automatically refresh with the remote repository.</p> -</p> +<h3>In the sync view and would like to refresh to see if there are +new changes from the server</h3> -Assumption, the sync view may or may not be open when the synchronize is performed. Maybe we need a different prompt -each case. One for Team > Sync and another for refresh from the sync view. +<p>Assumption, the sync view may or may not be open when the +synchronize is performed. Maybe we need a different prompt each case. +One for Team > Sync and another for refresh from the sync view.</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00049.html b/tests/org.eclipse.team.tests.cvs.core/html/00049.html index 5a4f827cd..599cb0409 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00049.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00049.html @@ -1,28 +1,36 @@ -<html><head><title>Decorations</title> +<html> +<head> +<title>Decorations</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Decorations</h2> +</head> +<body> +<h2>Decorations</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/03/17 14:30:32 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> -There are many standard decorations in the sync view. Most significant are the propagated flags. +There are many standard decorations in the sync view. Most significant +are the propagated flags. <h3>Conflicts</h3> -<p> -Conflicting changes should be propagated to parent resources such that you can easily see, when the tree -is collapsed that there are conflicts. When the conflict is resolved, the parent conflict markers should be -removed. -</p> + +<p>Conflicting changes should be propagated to parent resources such +that you can easily see, when the tree is collapsed that there are +conflicts. When the conflict is resolved, the parent conflict markers +should be removed.</p> + <h3>Error and Warning problem markers</h3> -<p> -Error and warning makers are shown on resources and propagated to parent resources such that you can -easily see if you are releasing errors or warnings. -</p> + +<p>Error and warning makers are shown on resources and propagated to +parent resources such that you can easily see if you are releasing +errors or warnings.</p> + <h3>Branch changes</h3> -<p> -Changes to branches, revisions, should be updated automatically in the views decorators. For example, if you branch -from the sync view the branch name should appear. -</p> -</body></html>
\ No newline at end of file +<p>Changes to branches, revisions, should be updated automatically +in the views decorators. For example, if you branch from the sync view +the branch name should appear.</p> + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00050.html b/tests/org.eclipse.team.tests.cvs.core/html/00050.html index f2550cf25..a1715caf1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00050.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00050.html @@ -1,35 +1,47 @@ -<html><head><title>Sharing a new project</title> +<html> +<head> +<title>Sharing a new project</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Sharing a new project</h2> +</head> +<body> +<h2>Sharing a new project</h2> <p>Since: 3.0 M8<br> -Last Modified: $Date: 2004/03/18 21:04:58 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <h3>Scenario 1: Existing location using project name</h3> + <p>Perform the following steps:</p> + <ol> - <li>Create a new project that does not exist in the repository</li> - <li>Select Team>Share and select CVS (if there is more than one - repository provider available).</li> - <li>Select a repository and click Next</li> - <li>Use the project name as the module name. Click Next.</li> - <li>After a time, the last page should show the outgoing changes in the project. - Commit the changes from the synchronize pane.</li> - <li>Click Finish</li> + <li>Create a new project that does not exist in the repository</li> + <li>Select Team>Share and select CVS (if there is more than one + repository provider available).</li> + <li>Select a repository and click Next</li> + <li>Use the project name as the module name. Click Next.</li> + <li>After a time, the last page should show the outgoing changes + in the project. Commit the changes from the synchronize pane.</li> + <li>Click Finish</li> </ol> <h3>Scenario 2: New location using different name</h3> + <p>Perform the following steps:</p> + <ol> - <li>Create a new project</li> - <li>Select Team>Share and select CVS (if there is more than one - repository provider available).</li> - <li>Select to create a new repository and click Next</li> - <li>Enter the repository information for a new repository and click Next</li> - <li>Enter a single segment module name that does not exist in the repository and click Next.</li> - <li>After a time, the last page should show the outgoing changes in the project. - Commit the changes from the synchronize pane.</li> - <li>Click Finish</li> + <li>Create a new project</li> + <li>Select Team>Share and select CVS (if there is more than one + repository provider available).</li> + <li>Select to create a new repository and click Next</li> + <li>Enter the repository information for a new repository and + click Next</li> + <li>Enter a single segment module name that does not exist in the + repository and click Next.</li> + <li>After a time, the last page should show the outgoing changes + in the project. Commit the changes from the synchronize pane.</li> + <li>Click Finish</li> </ol> -</body></html>
\ No newline at end of file + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00051.html b/tests/org.eclipse.team.tests.cvs.core/html/00051.html index ec8a86fcf..8bfe111ae 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00051.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00051.html @@ -1,99 +1,137 @@ -<html><head><title>Compare With Each Other</title> +<html> +<head> +<title>Compare With Each Other</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Compare With Each Other</h2> +</head> +<body> +<h2>Compare With Each Other</h2> <p>Since: <br> -Last Modified: $Date: 2007/07/25 13:49:27 $</p> +Last Modified: $Date: 2007/09/05 19:30:00 $</p> <h3>Compare a resource with other resource</h3> <h5>The action</h5> <ul> -<li>The action should appear only when there are 2 or 3 resources selected.</li> -<li>If there are 3 resources selected you should be prompted to select the common ancestor.</li> + <li>The action should appear only when there are 2 or 3 resources + selected.</li> + <li>If there are 3 resources selected you should be prompted to + select the common ancestor.</li> </ul> <h5>Look</h5> <ul> -<li>Ensure that all titles and labels are ok (e.g. dialog title, structure pane title, compare editor labels...).</li> -<li>Ensure that all buttons in the toolbar are properly enabled (e.g. Copy All/Copy Current, Next/Prev Difference/Change).</li> -<li>Ensure that difference markers are properly display at start</li> + <li>Ensure that all titles and labels are ok (e.g. dialog title, + structure pane title, compare editor labels...).</li> + <li>Ensure that all buttons in the toolbar are properly enabled + (e.g. Copy All/Copy Current, Next/Prev Difference/Change).</li> + <li>Ensure that difference markers are properly display at start</li> </ul> <h5>Navigation</h5> <ul> -<li>If you reach the first/last difference you should be prompted to go to the end/start of the current element.</li> -<li>Ensure that you can correctly navigate through differences using the difference markers on the right side of the editor.</li> + <li>If you reach the first/last difference you should be prompted + to go to the end/start of the current element.</li> + <li>Ensure that you can correctly navigate through differences + using the difference markers on the right side of the editor.</li> </ul> <h5>Merging</h5> <ul> -<li>Ensure that Copy All/Copy Current actions work as expected.</li> -<li>Ensure that when the Copy All action is used all difference markers disappear.</li> -<li>Ensure that when the Copy Current action is used a proper difference marker disappears.</li> -<li>Ensure you can Undo an action.</li> + <li>Ensure that Copy All/Copy Current actions work as expected.</li> + <li>Ensure that when the Copy All action is used all difference + markers disappear.</li> + <li>Ensure that when the Copy Current action is used a proper + difference marker disappears.</li> + <li>Ensure you can Undo an action.</li> </ul> <h5>Saving</h5> <ul> -<li>If you edit a local resource the dirty state indicator should appear over the resource.</li> -<li>If you edit a local resource and the resource is also opened in a different editor the dirty state should appear on that editor too.</li> -<li>If you edit both of the resources being compare (both are local), changes should be saved to both of them.</li> -<li>If you edit a resource and close the editor you should be prompted to save or abandon changes.</li> -<li>If you edit both of the resources and close the editor you should be prompted to select which resources to save using the Save Resources dialog.</li> -<li>Ensure you can Undo a change.</li> -<li>Ensure that changes are saved correctly to the underlying resource.</li> + <li>If you edit a local resource the dirty state indicator should + appear over the resource.</li> + <li>If you edit a local resource and the resource is also opened + in a different editor the dirty state should appear on that editor too.</li> + <li>If you edit both of the resources being compare (both are + local), changes should be saved to both of them.</li> + <li>If you edit a resource and close the editor you should be + prompted to save or abandon changes.</li> + <li>If you edit both of the resources and close the editor you + should be prompted to select which resources to save using the Save + Resources dialog.</li> + <li>Ensure you can Undo a change.</li> + <li>Ensure that changes are saved correctly to the underlying + resource.</li> </ul> <h5>Concurrent edition</h5> <ul> -<li>Scenario 1 -<ol> -<li>Compare two local resources using the Compare Editor.</li> -<li>Open one of them in the default editor (F3) and edit it.</li> -<li>Ensure that the resource gets the dirty state indicator over both editors (i.e default and Compare).</li> -<li>If you save the resource in the default editor the dirty state indicator should go off for both editors.</li> -<li>Ensure that changes are saved correctly to the underlying resource.</li> -</ol> -</li> -<li>Scenario 2a -<ol> -<li>Compare two local resources using the Compare Editor.</li> -<li>Open one of them in the default editor (F3) and edit it.</li> -<li>Ensure that the resource gets the dirty state indicator over both editors (i.e default and Compare).</li> -<li>If you close the default editor you should be prompted to save changes, exiting without saving or cancel.</li> -<li>Select exit without saving (button named "No").</li> -<li>Ensure that the resource under the Compare Editor is still in the dirty state.</li> -<li>Ensure that changes are the same as made using the default editor.</li> -<li>Ensure that changes can be saved to the underlying resource from the Compare Editor.</li> -<li>Ensure that changes are saved correctly to the underlying resource.</li> -</ol> -</li> -<li>Scenario 2b -<ol> -<li>Compare two local resources using the Compare Editor.</li> -<li>Open one of them in the default editor (F3) and edit it.</li> -<li>Ensure that the resource gets the dirty state indicator over both editors (i.e default and Compare).</li> -<li>If you close the default editor you should be prompted to save changes, exiting without saving or cancel.<li> -<li>Select to save changes (button named "Yes").</li> -<li>Ensure that the dirty state indicator for the resource goes off.</li> -<li>Ensure that changes are saved correctly to the underlying resource.</li> -<li>Ensure you can Undo changes.</li> -</ol> -</li> -<li>Scenario 3 -<ol> -<li>Compare two local resources using the Compare Editor.</li> -<li>Open both files in default editors (F3) and edit them.</li> -<li>Ensure that the resource gets the dirty state indicator over all editors (i.e two default and Compare).</li> -<li>Ensure that changes made in one of editors are correctly handled by others.</li> -<li>Ensure that changes are saved correctly to underlying resources.</li> -<li>Ensure you can Undo changes.</li> -</ol> -</li> + <li>Scenario 1 + <ol> + <li>Compare two local resources using the Compare Editor.</li> + <li>Open one of them in the default editor (F3) and edit it.</li> + <li>Ensure that the resource gets the dirty state indicator over + both editors (i.e default and Compare).</li> + <li>If you save the resource in the default editor the dirty + state indicator should go off for both editors.</li> + <li>Ensure that changes are saved correctly to the underlying + resource.</li> + </ol> + </li> + <li>Scenario 2a + <ol> + <li>Compare two local resources using the Compare Editor.</li> + <li>Open one of them in the default editor (F3) and edit it.</li> + <li>Ensure that the resource gets the dirty state indicator over + both editors (i.e default and Compare).</li> + <li>If you close the default editor you should be prompted to + save changes, exiting without saving or cancel.</li> + <li>Select exit without saving (button named "No").</li> + <li>Ensure that the resource under the Compare Editor is still in + the dirty state.</li> + <li>Ensure that changes are the same as made using the default + editor.</li> + <li>Ensure that changes can be saved to the underlying resource + from the Compare Editor.</li> + <li>Ensure that changes are saved correctly to the underlying + resource.</li> + </ol> + </li> + <li>Scenario 2b + <ol> + <li>Compare two local resources using the Compare Editor.</li> + <li>Open one of them in the default editor (F3) and edit it.</li> + <li>Ensure that the resource gets the dirty state indicator over + both editors (i.e default and Compare).</li> + <li>If you close the default editor you should be prompted to + save changes, exiting without saving or cancel.</li> + <li>Select to save changes (button named "Yes").</li> + <li>Ensure that the dirty state indicator for the resource goes + off.</li> + <li>Ensure that changes are saved correctly to the underlying + resource.</li> + <li>Ensure you can Undo changes.</li> + </ol> + </li> + <li>Scenario 3 + <ol> + <li>Compare two local resources using the Compare Editor.</li> + <li>Open both files in default editors (F3) and edit them.</li> + <li>Ensure that the resource gets the dirty state indicator over + all editors (i.e two default and Compare).</li> + <li>Ensure that changes made in one of editors are correctly + handled by others.</li> + <li>Ensure that changes are saved correctly to underlying + resources.</li> + <li>Ensure you can Undo changes.</li> + </ol> + </li> </ul> <h5>Common Ancestor</h5> <ul> -<li>Ensure that a resource acting as a common ancestor is the one selected in the dialog.</li> -<li>Ensure you can switch between Two- and Three-way compare when a common ancestor is available.</li> -<li>Ensure you can show/hide the Common Ancestor Pane.</li> + <li>Ensure that a resource acting as a common ancestor is the one + selected in the dialog.</li> + <li>Ensure you can switch between Two- and Three-way compare when + a common ancestor is available.</li> + <li>Ensure you can show/hide the Common Ancestor Pane.</li> </ul> -</body></html> +</body> +</html> diff --git a/tests/org.eclipse.team.tests.cvs.core/html/DNDCFile00001.html b/tests/org.eclipse.team.tests.cvs.core/html/DNDCFile00001.html index e900b1c3d..51afd14b9 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/DNDCFile00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/DNDCFile00001.html @@ -1,19 +1,27 @@ -<html><head><title>Drag and Drop CVS File</title> +<html> +<head> +<title>Drag and Drop CVS File</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Drag and Drop CVS File</h2> +</head> +<body> +<h2>Drag and Drop CVS File</h2> <p>Since: 3.2 RC2 <br> -Last Modified: $Date: 2006/04/25 20:20:14 $</p> +Last Modified: $Date: 2006/04/25 20:40:39 $</p> <p><b>Purpose:</b> Test the DND mechanism for CVS files.</p> <ol> - <li>Open the History view.</li> - <li>Drag the CVS file over to it.</li> - <li>Ensure the the history view shows the appropriate history (i.e. all revisions - present and proper filename in the title bar).</li> + <li>Open the History view.</li> + <li>Drag the CVS file over to it.</li> + <li>Ensure the the history view shows the appropriate history + (i.e. all revisions present and proper filename in the title bar).</li> </ol> -<p>Drag another file over to the History View from a project that is <b>not</b> shared with a CVS repository. Repeat the above -and make sure that the View updates.</p> -</body></html>
\ No newline at end of file + +<p>Drag another file over to the History View from a project that is +<b>not</b> shared with a CVS repository. Repeat the above and make sure +that the View updates.</p> + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/DNDUMFile00001.html b/tests/org.eclipse.team.tests.cvs.core/html/DNDUMFile00001.html index 8a04fd2ad..3a59ddad2 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/DNDUMFile00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/DNDUMFile00001.html @@ -1,20 +1,27 @@ -<html><head><title>Drag and Drop Unmapped File</title> +<html> +<head> +<title>Drag and Drop Unmapped File</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Drag and Drop Unmapped File</h2> +</head> +<body> +<h2>Drag and Drop Unmapped File</h2> <p>Since: 3.2 RC2 <br> -Last Modified: $Date: 2006/04/25 20:20:14 $</p> +Last Modified: $Date: 2006/04/25 20:40:39 $</p> <p><b>Purpose:</b> Test the DND mechanism for unmapped files.</p> <ol> - <li>Open the History view.</li> - <li>Drag the local file over to it.</li> - <li>Ensure the the history view shows the appropriate history (i.e. all revisions - present and proper filename in the title bar).</li> + <li>Open the History view.</li> + <li>Drag the local file over to it.</li> + <li>Ensure the the history view shows the appropriate history + (i.e. all revisions present and proper filename in the title bar).</li> </ol> -<p>Drag another file over to the History View from a project that is <i>shared with a CVS repository.</i> Repeat the above -and make sure that the View updates.</p> -</body></html>
\ No newline at end of file +<p>Drag another file over to the History View from a project that is +<i>shared with a CVS repository.</i> Repeat the above and make sure that +the View updates.</p> + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/auth_problems00001.html b/tests/org.eclipse.team.tests.cvs.core/html/auth_problems00001.html index bd0d82d64..142ea93cf 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/auth_problems00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/auth_problems00001.html @@ -1,16 +1,18 @@ -<html><head><title>Authentication Problems</title> +<html> +<head> +<title>Authentication Problems</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Authentication Problems</h2> +</head> +<body> +<h2>Authentication Problems</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2004/06/01 20:28:37 $</p> -<p> +<p>Test the error reporting when authentication fails due to either, +invalid username, password, hostname. This should be tried with each CVS +connection method: pserver, extssh, ext.</p> -Test the error reporting when authentication fails due to either, invalid username, password, hostname. This should be -tried with each CVS connection method: pserver, extssh, ext. - -</p> - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/branch00001.html b/tests/org.eclipse.team.tests.cvs.core/html/branch00001.html index 213bbed7d..186f65e66 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/branch00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/branch00001.html @@ -1,25 +1,34 @@ -<html><head><title>Branching</title> +<html> +<head> +<title>Branching</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Branching</h2> +</head> +<body> +<h2>Branching</h2> <p>Since: 3.1 M4<br> -Last Modified: $Date: 2007/05/18 13:54:37 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> <ol> -<li>Choose Team>Branch from the context menu of the Navigator. -<li>Enter a branch tag. -<li>Verify that a version tag is proposed for the branch. -<li>Click OK and verify that the tags are applied and the local project is mapped to the branch. + <li>Choose Team>Branch from the context menu of the Navigator. + <li>Enter a branch tag.</li> + <li>Verify that a version tag is proposed for the branch.</li> + <li>Click OK and verify that the tags are applied and the local + project is mapped to the branch.</li> </ol> -<p> -Some things to try: +<p>Some things to try: <ul> - <li>Uncheck the "Start working in the branch" option and verify that the local project is not moved to the branch. - <li>Branch a loaded version and verify that the tag from the project is used as the root. - <li>Ensure that the content assist on the branch text widget shows branches from other projects in the workspace - that do not exist on the project being branched. - <li>Branch with local changes and ensure that they remain and can be committed to the branch. + <li>Uncheck the "Start working in the branch" option and verify + that the local project is not moved to the branch.</li> + <li>Branch a loaded version and verify that the tag from the + project is used as the root.</li> + <li>Ensure that the content assist on the branch text widget shows + branches from other projects in the workspace that do not exist on the + project being branched.</li> + <li>Branch with local changes and ensure that they remain and can + be committed to the branch.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/change_sets00001.html b/tests/org.eclipse.team.tests.cvs.core/html/change_sets00001.html index c1a9c754b..0598becc3 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/change_sets00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/change_sets00001.html @@ -1,65 +1,75 @@ -<html><head><title>Change Sets</title> +<html> +<head> +<title>Change Sets</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Change Sets Layout</h2> +</head> +<body> +<h2>Change Sets Layout</h2> <p>Since: 3.1 M2<br> Last Modified: $Date$</p> <h3>Change Sets for incoming changes</h3> -To perform these scenarios you will need to get one or more projects -in your workspace that have many incoming changes. Preferably -all the changes will have commit comments and some files will share -a comment. Once you have this setup, you can perform the following sub-scenarios. +To perform these scenarios you will need to get one or more projects in +your workspace that have many incoming changes. Preferably all the +changes will have commit comments and some files will share a comment. +Once you have this setup, you can perform the following sub-scenarios. <h4>Enabling/disabling Change Sets</h4> <ol> -<li>Synchronize the projects with HEAD, enable change set mode and -ensure that the files appear in the proper change sets. Also ensure that -the proper sub-layout is used by expanding some of the nodes in the tree. -<p> -<li>With some nodes expanded and additionally one or more selected, -disable Change Sets. The same nodes should remain expanded and selected. -<p> -<li>With the same nodes selected and expanded, re-enable change sets. -The expansion should remain. There may be more expanded if the same -expanded project or folder appears in multiple change sets. The selection -will remain unless there are two entries for the same resource (i.e. if a project -was selected and it appears in multiple sets, it will no longer be expanded). + <li>Synchronize the projects with HEAD, enable change set mode and + ensure that the files appear in the proper change sets. Also ensure + that the proper sub-layout is used by expanding some of the nodes in + the tree.</li> + <li>With some nodes expanded and additionally one or more + selected, disable Change Sets. The same nodes should remain expanded + and selected.</li> + <li>With the same nodes selected and expanded, re-enable change + sets. The expansion should remain. There may be more expanded if the + same expanded project or folder appears in multiple change sets. The + selection will remain unless there are two entries for the same + resource (i.e. if a project was selected and it appears in multiple + sets, it will no longer be expanded).</li> </ol> -You should also confirm that markers and conflicts are properly propagated to -parent nodes. + +You should also confirm that markers and conflicts are properly +propagated to parent nodes. <h4>Change Set Modes</h4> <ol> -<li>Switch between the various modes and ensure that the displayed nodes are correct. -Also ensure that expansion and selection is maintained. -<li>Only Incoming and Outgoing mode show change sets. + <li>Switch between the various modes and ensure that the displayed + nodes are correct. Also ensure that expansion and selection is + maintained.</li> + <li>Only Incoming and Outgoing mode show change sets.</li> </ol> <h4>Updating</h4> -With several nodes expanded, perform an update on one or more files -that are incoming changes. -Ensure that the updated files are removed from the view and that -other expanded nodes remain expanded. +With several nodes expanded, perform an update on one or more files that +are incoming changes. Ensure that the updated files are removed from the +view and that other expanded nodes remain expanded. -<h3>Outgoing Sets</h3> +<h3>Outgoing Sets</h3> The following aspects of outgoing change sets should be tested: <ol> -<li>Modified files can be added to a new or existing change set. Ensure that -when they are added, the file remains visible in the Sync view. -<li>Files in a change set can be transfered to another change set -<li>If there is a default change set, any modified file that is not already -part of a change set is placed in the default set. Files that are already -in a set should stay in that set if more changes are made to the files. -<li>The title and comment of a change set can be changed. -<li>Layout and modes changes work properly for outgoing change sets in the -Synchronize view. -<li>Committing one or more files in a change set will result in a commit -dialog that is primed with the comment from the set. -<li>change sets (including which is the default), are preserved across restarts. + <li>Modified files can be added to a new or existing change set. + Ensure that when they are added, the file remains visible in the Sync + view.</li> + <li>Files in a change set can be transfered to another change set</li> + <li>If there is a default change set, any modified file that is + not already part of a change set is placed in the default set. Files + that are already in a set should stay in that set if more changes are + made to the files.</li> + <li>The title and comment of a change set can be changed.</li> + <li>Layout and modes changes work properly for outgoing change + sets in the Synchronize view.</li> + <li>Committing one or more files in a change set will result in a + commit dialog that is primed with the comment from the set.</li> + <li>change sets (including which is the default), are preserved + across restarts.</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/checkoutwizard00001.html b/tests/org.eclipse.team.tests.cvs.core/html/checkoutwizard00001.html index e143cccc5..27b4a9a2b 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/checkoutwizard00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/checkoutwizard00001.html @@ -1,35 +1,48 @@ -<html><head><title>Check Out Wizard</title> +<html> +<head> +<title>Check Out Wizard</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body> +</head> +<body> <h2>Checkout Wizard</h2> <p>Since: <br> -Last Modified: $Date: 2007/05/18 13:54:37 $</p><body> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> -<p>The checkout wizard should be available from the following parts of the workbench: -import, new project, empty workspace CVS synchronize action, toolbar in CVS perspective. -The checkout wizard is also available from the context menu of the repositories view -as the Checkout As menu item.</p> +<p>The checkout wizard should be available from the following parts +of the workbench: import, new project, empty workspace CVS synchronize +action, toolbar in CVS perspective. The checkout wizard is also +available from the context menu of the repositories view as the Checkout +As menu item.</p> -<p>The following variants should be tested: +The following variants should be tested: <ul> -<li>Create a new repository location and checkout a project entirely from the wizard. -<li>Check out a tag -<li>Check out a project that does not contain a .project file. This should result in -a second wizard that allows project configuration (e.g. Java project). + <li>Create a new repository location and checkout a project + entirely from the wizard.</li> + <li>Check out a tag</li> + <li>Check out a project that does not contain a .project file. + This should result in a second wizard that allows project configuration + (e.g. Java project).</li> </ul> <h3>Repositories View Checkout Variants</h3> -These tests require an existing repository which contains projects, at least one of which -does not contain a .project file. +These tests require an existing repository which contains projects, at +least one of which does not contain a .project file. + <ol> - <li>Perform "Check Out" on a single project. Ensure that repeating results in overwrite prompt.</li> - <li>Perform "Check Out" on multiple projects.</li> - <li>Perform "Check Out As..." on a single project (that contains a .project file) and enter custom name and/or custom location.</li> - <li>Perform "Check Out As..." on a single remote project that does not have a .project file and - ensure that the user is prompted for the project type to create.</li> - <li>Perform "Check Out As..." on multiple projects and enter a custom parent location.</li> - <li>Perform "Check Out As..." and specify a tag.</li> + <li>Perform "Check Out" on a single project. Ensure that repeating + results in overwrite prompt.</li> + <li>Perform "Check Out" on multiple projects.</li> + <li>Perform "Check Out As..." on a single project (that contains a + .project file) and enter custom name and/or custom location.</li> + <li>Perform "Check Out As..." on a single remote project that does + not have a .project file and ensure that the user is prompted for the + project type to create.</li> + <li>Perform "Check Out As..." on multiple projects and enter a + custom parent location.</li> + <li>Perform "Check Out As..." and specify a tag.</li> </ol> -</body></html>
\ No newline at end of file + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/commands00001.html b/tests/org.eclipse.team.tests.cvs.core/html/commands00001.html deleted file mode 100644 index c211f4740..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/commands00001.html +++ /dev/null @@ -1,11 +0,0 @@ -<html><head><title>Commands</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><h2>Commands</h2> -<p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p><body> - -Answer comes here. - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/commit00001.html b/tests/org.eclipse.team.tests.cvs.core/html/commit00001.html index abaefb9f1..65fa8859a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/commit00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/commit00001.html @@ -1,9 +1,13 @@ -<html><head><title>Commit</title> +<html> +<head> +<title>Commit</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Commit</h2> +</head> +<body> +<h2>Commit</h2> <p>Since: 3.1 M4<br> -Last Modified: $Date: 2004/12/17 16:10:10 $</p> - -</body></html>
\ No newline at end of file +Last Modified: $Date: 2005/02/04 21:58:25 $</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/commit00002.html b/tests/org.eclipse.team.tests.cvs.core/html/commit00002.html index a16c443b2..d0a4ba382 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/commit00002.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/commit00002.html @@ -1,44 +1,60 @@ -<html><head><title>Committing Changes</title> +<html> +<head> +<title>Committing Changes</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Committing Changes</h2> +</head> +<body> +<h2>Committing Changes</h2> <p>Since: 3.1 M4<br> -Last Modified: $Date: 2005/02/04 21:58:25 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> <h3>Committing changes to existing files</h3> <ol> - <li>Edit some existing files in a CVS project - <li>Choose Team>Commit on the project from the Navigator - <li>The commit dialog should show a preview of the files that are to be committed and allow a commit comment to be entered. + <li>Edit some existing files in a CVS project</li> + <li>Choose Team>Commit on the project from the Navigator</li> + <li>The commit dialog should show a preview of the files that are + to be committed and allow a commit comment to be entered.</li> </ol> -<p> -Some things to try: + +<p>Some things to try: <ul> - <li>Committing a project (or selected resources) that contain no changes will prompt to indicate this. - <li>Files can be removed from the preview area and these will be excluded from the commit. - <li>Clicking OK without entering a comment should prompt. - <li>Emptying the preview area will disable the Finish and show a "no changes" message. - <li>Try different page layouts (compressed, tree and flat) + <li>Committing a project (or selected resources) that contain no + changes will prompt to indicate this.</li> + <li>Files can be removed from the preview area and these will be + excluded from the commit.</li> + <li>Clicking OK without entering a comment should prompt.</li> + <li>Emptying the preview area will disable the Finish and show a + "no changes" message.</li> + <li>Try different page layouts (compressed, tree and flat)</li> </ul> <h3>Committing new files</h3> <ol> - <li>Add a few new files to a project including some with unknown extensions and some with no extensions. - <li>Choose Team>Commit on the project from the Navigator - <li>The first page of the commit wizard will allow you to configure the file types for any new files whose content type - cannot be determined. - <ul> - <li>Configure some to be remembered and others to be only applied to this commit (verify after that this was done properly) - </ul> - <li>Click Next and verify that the content type was determined properly. - <li>Choose to ignore one of the files and verify that the file is removed and the .cvsignore appears. + <li>Add a few new files to a project including some with unknown + extensions and some with no extensions.</li> + <li>Choose Team>Commit on the project from the Navigator</li> + <li>The first page of the commit wizard will allow you to + configure the file types for any new files whose content type cannot be + determined.</li> + <ul> + <li>Configure some to be remembered and others to be only applied + to this commit (verify after that this was done properly)</li> + </ul> + <li>Click Next and verify that the content type was determined + properly.</li> + <li>Choose to ignore one of the files and verify that the file is + removed and the .cvsignore appears.</li> </ol> <h3>Committing files contained in a Change Set</h3> <ol> - <li>From the Synchronize view, select all the changes from the same Change Set. - <li>Choose Commit and verify that the comment in the commit dialog is the one from the change Set. + <li>From the Synchronize view, select all the changes from the + same Change Set.</li> + <li>Choose Commit and verify that the comment in the commit dialog + is the one from the change Set.</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/connections00001.html b/tests/org.eclipse.team.tests.cvs.core/html/connections00001.html index d884b1339..1a9f69bbe 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/connections00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/connections00001.html @@ -1,22 +1,38 @@ -<html><head><title>Connections</title> +<html> +<head> +<title>Connections</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Connections</h2> +</head> +<body> +<h2>Connections</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/01 20:28:37 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> + +<p>Test that authentication, connection errors result in appropriate +error messages and that these don't pollute the log file or console. To +setup for these tests ensure there are a couple of shared projects in +your workspace.</p> -<p>Test that authentication, connection errors result in appropriate error messages and that these don't pollute the log file or console. To setup for these tests -ensure there are a couple of shared projects in your workspace.</p> <ul> -<li>Clear you log file before starting the tests and turn on the CVS quick diff provider. -<li>Perform an update, a synchronize, and open a file. The log should be empty and the operations should succeed. -<li>Disconnect from the network. -<li>Open a file. The CVS quick diff will fail and an error should be in the log. -<li>Synchronize all the shared projects. One error explaining the failures should be returned. -<li>Change the connection properties of one of the projects to point to an non-existing location. Then synchronize again, the error message should indicate that some succeeded and -others failed. But the user should no that the operation did complete and skipped the failed projects. -<li>Expand the invalid location in the CVS repositories view. An appropriate error should be shown. + <li>Clear you log file before starting the tests and turn on the + CVS quick diff provider.</li> + <li>Perform an update, a synchronize, and open a file. The log + should be empty and the operations should succeed.</li> + <li>Disconnect from the network.</li> + <li>Open a file. The CVS quick diff will fail and an error should + be in the log.</li> + <li>Synchronize all the shared projects. One error explaining the + failures should be returned.</li> + <li>Change the connection properties of one of the projects to + point to an non-existing location. Then synchronize again, the error + message should indicate that some succeeded and others failed. But the + user should no that the operation did complete and skipped the failed + projects.</li> + <li>Expand the invalid location in the CVS repositories view. An + appropriate error should be shown.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/cvsHistory00001.html b/tests/org.eclipse.team.tests.cvs.core/html/cvsHistory00001.html index 06238e49e..0d0ab471e 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/cvsHistory00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/cvsHistory00001.html @@ -1,11 +1,14 @@ -<html><head><title>CVS History</title> +<html> +<head> +<title>CVS History</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>CVS History</h2> +</head> +<body> +<h2>CVS History</h2> <p>Since: <br> -Last Modified: $Date: 2005/05/05 20:20:14 $</p> - +Last Modified: $Date: 2006/04/25 20:40:39 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/datetags_repoview00001.html b/tests/org.eclipse.team.tests.cvs.core/html/datetags_repoview00001.html index d125561ab..bc12103c7 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/datetags_repoview00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/datetags_repoview00001.html @@ -1,43 +1,55 @@ -<html><head><title>Tags</title> +<html> +<head> +<title>Tags</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Tags</h2> +</head> +<body> +<h2>Tags</h2> <p>Since: 3.0<br> -Last Modified: $Date: 2004/06/01 19:14:48 $</p><body> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> +<body> <h3>Refresh Branches and Versions</h3> <ol> - <li>Select a repository location and perform "Refresh Branches and Versions...". - <li>Select one or more projects that contain a .project file and have been tagged with branch and version tags and click finish.</li> - <li>Expand the repository entry to view ... - <ul> - <li>projects in HEAD,</li> - <li>branches and projects in BRANCHES,</li> - <li>projects and versions in VERSIONS.</li> - </ul> + <li>Select a repository location and perform "Refresh Branches and + Versions...".</li> + <li>Select one or more projects that contain a .project file and + have been tagged with branch and version tags and click finish.</li> + <li>Expand the repository entry to view ... + <ul> + <li>projects in HEAD,</li> + <li>branches and projects in BRANCHES,</li> + <li>projects and versions in VERSIONS.</li> + </ul> + </li> </ol> <h3>Configure Branches and Versions</h3> <ol> - <li>Select a project in the repositories view and perform "Configure Branches and Versions...". - <li>Select some branch and version tags to be remembered.</li> - <li>Expand the repository entry to view ... - <ul> - <li>projects in HEAD,</li> - <li>branches and projects in BRANCHES,</li> - <li>projects and versions in VERSIONS.</li> - </ul> + <li>Select a project in the repositories view and perform + "Configure Branches and Versions...".</li> + <li>Select some branch and version tags to be remembered.</li> + <li>Expand the repository entry to view ... + <ul> + <li>projects in HEAD,</li> + <li>branches and projects in BRANCHES,</li> + <li>projects and versions in VERSIONS.</li> + </ul> + </li> </ol> <h3>Date Tags</h3> -The ability to create Date tags should be available from the following locations: +The ability to create Date tags should be available from the following +locations: <ul> -<li>Repositories view</li> -<li>Configure Branches and Versions dialog -<li>Tag selection dialogs (Compare with and Replace with Branch or Version) + <li>Repositories view</li> + <li>Configure Branches and Versions dialog</li> + <li>Tag selection dialogs (Compare with and Replace with Branch or + Version)</li> </ul> - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/encoding00001.html b/tests/org.eclipse.team.tests.cvs.core/html/encoding00001.html deleted file mode 100644 index fc245df72..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/encoding00001.html +++ /dev/null @@ -1,11 +0,0 @@ -<html><head><title>Encoding Support</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><body><h2>Encoding Support</h2> -<p>Since: 3.0 M9<br> -Last Modified: $Date: 2004/05/31 20:05:52 $</p> - -Answer comes here. - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/ext_connection_method00001.html b/tests/org.eclipse.team.tests.cvs.core/html/ext_connection_method00001.html deleted file mode 100644 index a7ebdbc7b..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/ext_connection_method00001.html +++ /dev/null @@ -1,11 +0,0 @@ -<html><head><title>EXT</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><body><h2>EXT</h2> -<p>Since: 2.0 <br> -Last Modified: $Date: 2004/05/31 20:05:52 $</p> - -<h3>Ext connection method</h3> - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/failures00001.html b/tests/org.eclipse.team.tests.cvs.core/html/failures00001.html index 39a385a29..2e851a5df 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/failures00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/failures00001.html @@ -1,11 +1,14 @@ -<html><head><title>Failure Cases</title> +<html> +<head> +<title>Failure Cases</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Failure Cases</h2> +</head> +<body> +<h2>Failure Cases</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p><body> - +Last Modified: $Date: 2004/06/01 15:23:56 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/groupByDateUMFile00001.html b/tests/org.eclipse.team.tests.cvs.core/html/groupByDateUMFile00001.html index 9dfaecd47..16ec9f54a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/groupByDateUMFile00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/groupByDateUMFile00001.html @@ -1,22 +1,38 @@ -<html><head><title>Group Revisions by Date</title> +<html> +<head> +<title>Group Revisions by Date</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Group Revisions by Date</h2> +</head> +<body> +<h2>Group Revisions by Date</h2> <p>Since: 3.2 RC2 <br> -Last Modified: $Date: 2006/04/25 20:40:39 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> -<p><b>Purpose:</b> Test the group by date mechanism for both local history and CVS history.</p> +<p><b>Purpose:</b> Test the group by date mechanism for both local +history and CVS history.</p> <ol> - <li>Open the History view.</li> - <li>Roll back your system clock 1 day, make a change to your local unmapped file and save it.</li> - <li>Roll back your system clock to the beginning of the month and make some changes to the local unmapped file and save it.</li> - <li>Roll back your system clock to anywhere before the beginning of the current month, make a change to the local unmapped file and save it.</li> - <li>Reset your clock to the current date and show the file's history (DND or [Team>Show Local History]/[Team>Show History] for local and CVS files respectively).</li> - <li>Verify that the revisions appear in the appropriate categories: Today, Yesterday, This Month and Previous.</li> - <li>Click the Group by Revisions Date button and make sure that the categories toggle on and off.</li> + <li>Open the History view.</li> + <li>Roll back your system clock 1 day, make a change to your local + unmapped file and save it.</li> + <li>Roll back your system clock to the beginning of the month and + make some changes to the local unmapped file and save it.</li> + <li>Roll back your system clock to anywhere before the beginning + of the current month, make a change to the local unmapped file and save + it.</li> + <li>Reset your clock to the current date and show the file's + history (DND or [Team>Show Local History]/[Team>Show History] for local + and CVS files respectively).</li> + <li>Verify that the revisions appear in the appropriate + categories: Today, Yesterday, This Month and Previous.</li> + <li>Click the Group by Revisions Date button and make sure that + the categories toggle on and off.</li> </ol> -<p>The above should be tested with history from both an unmanaged file and a CVS file.</p> -</body></html>
\ No newline at end of file +<p>The above should be tested with history from both an unmanaged +file and a CVS file.</p> + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/keys00001.html b/tests/org.eclipse.team.tests.cvs.core/html/keys00001.html index a223426b7..ecdea4a97 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/keys00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/keys00001.html @@ -1,12 +1,17 @@ -<html><head><title>Key Bindings</title> +<html> +<head> +<title>Key Bindings</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Key Bindings</h2> +</head> +<body> +<h2>Key Bindings</h2> <p>Since: 3.1<br> -Last Modified: $Date: 2005/05/05 20:20:14 $</p> +Last Modified: $Date$</p> -<p>Activate the CVS menu and assign keybindings to the various CVS commands. -Ensure that they work as expected. +<p>Activate the CVS menu and assign keybindings to the various CVS +commands. Ensure that they work as expected.</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/latest_revision_commit_set00001.html b/tests/org.eclipse.team.tests.cvs.core/html/latest_revision_commit_set00001.html deleted file mode 100644 index ab064196e..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/latest_revision_commit_set00001.html +++ /dev/null @@ -1,11 +0,0 @@ -<html><head><title>Latest revision commit sets</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><h2>Latest revision commit sets</h2> -<p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p><body> - -Answer comes here. - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/localHistoryUnsharedFiles00001.html b/tests/org.eclipse.team.tests.cvs.core/html/localHistoryUnsharedFiles00001.html index d2ba1a3ca..ef85201e6 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/localHistoryUnsharedFiles00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/localHistoryUnsharedFiles00001.html @@ -1,25 +1,36 @@ -<html><head><title>Local History for Unshared Files</title> +<html> +<head> +<title>Local History for Unshared Files</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Local History for Unshared Files</h2> +</head> +<body> +<h2>Local History for Unshared Files</h2> <p>Since: 3.2 RC2<br> -Last Modified: $Date: 2006/04/25 20:40:39 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> <p>This section tests the History View's behavior towards files that reside in projects that have not been mapped to any Repository Provider.</p> + <hr></hr> + <h2>Setup Procedure for all Unshared Local History Tests</h2> -<p>All of the tests require the following steps completed prior to any test case -execution. These steps need only be done once for this entire subsection. These steps -ensure that some local history is generated for the unmapped file.</p> +<p>All of the tests require the following steps completed prior to +any test case execution. These steps need only be done once for this +entire subsection. These steps ensure that some local history is +generated for the unmapped file.</p> <ol> - <li>Create a new Java project and add a new class to it.</li> - <li>Add a field to the class and save.</li> - <li>Add another field to the class and save.</li> - <li>Add a method to the class and save.</li> - <li>Add another method to the class and save.</li> + <li>Create a new Java project and add a new class to it.</li> + <li>Add a field to the class and save.</li> + <li>Add another field to the class and save.</li> + <li>Add a method to the class and save.</li> + <li>Add another method to the class and save.</li> </ol> -<p>Now that the file has some history to it, you can proceed with this test suite.</p> -</body></html>
\ No newline at end of file + +<p>Now that the file has some history to it, you can proceed with +this test suite.</p> + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/logical00001.html b/tests/org.eclipse.team.tests.cvs.core/html/logical00001.html index 20bf63bb2..a999321fb 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/logical00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/logical00001.html @@ -1,9 +1,13 @@ -<html><head><title>Logical Resource Support</title> +<html> +<head> +<title>Logical Resource Support</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Logical Resource Support</h2> +</head> +<body> +<h2>Logical Resource Support</h2> <p>Since: 3.1 <br> -Last Modified: $Date: 2005/05/05 20:20:14 $</p> - -</body></html>
\ No newline at end of file +Last Modified: $Date$</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/logical00002.html b/tests/org.eclipse.team.tests.cvs.core/html/logical00002.html index 3b00b1dae..b02a92294 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/logical00002.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/logical00002.html @@ -1,13 +1,18 @@ -<html><head><title>Java Packages</title> +<html> +<head> +<title>Java Packages</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Java Packages</h2> +</head> +<body> +<h2>Java Packages</h2> <p>Since: 3.1<br> -Last Modified: $Date: 2005/05/05 20:20:14 $</p> +Last Modified: $Date$</p> -<p>Ensure that CVS operations such as Update and Commit are performed only -on the files in a Java package and not on the subpackages when the operations -are launched from the Java Packages Explorer. +<p>Ensure that CVS operations such as Update and Commit are +performed only on the files in a Java package and not on the subpackages +when the operations are launched from the Java Packages Explorer.</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/logical00003.html b/tests/org.eclipse.team.tests.cvs.core/html/logical00003.html index 3a5a63d0d..b0eba70c2 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/logical00003.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/logical00003.html @@ -1,15 +1,20 @@ -<html><head><title>Working Sets</title> +<html> +<head> +<title>Working Sets</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Working Sets</h2> +</head> +<body> +<h2>Working Sets</h2> <p>Since: 3.1<br> -Last Modified: $Date: 2005/05/05 20:20:14 $</p> +Last Modified: $Date$</p> -<p> -Configure the Java Packages Explorer to show Working Sets. Populate the -working sets with various combinations of shared and unshared projects and -ensure that CVS operations can be performed directly on the working sets if they -contain at least one shared project. +<p>Configure the Java Packages Explorer to show Working Sets. +Populate the working sets with various combinations of shared and +unshared projects and ensure that CVS operations can be performed +directly on the working sets if they contain at least one shared +project.</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/misc00001.html b/tests/org.eclipse.team.tests.cvs.core/html/misc00001.html index 1bf08d9f5..62d61a057 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/misc00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/misc00001.html @@ -1,11 +1,14 @@ -<html><head><title>Misc</title> +<html> +<head> +<title>Misc</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Misc</h2> +</head> +<body> +<h2>Misc</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p><body> - +Last Modified: $Date: 2004/06/01 15:23:56 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/modeSwitching00001.html b/tests/org.eclipse.team.tests.cvs.core/html/modeSwitching00001.html index 0feab39f7..0c2ff247f 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/modeSwitching00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/modeSwitching00001.html @@ -1,34 +1,44 @@ -<html><head><title>Mode Switching</title> +<html> +<head> +<title>Mode Switching</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Mode Switching</h2> +</head> +<body> +<h2>Mode Switching</h2> <p>Since: 3.2 RC2 <br> -Last Modified: $Date: 2006/04/25 20:40:39 $</p> +Last Modified: $Date: 2006/04/25 21:31:43 $</p> <p><b>Purpose:</b> Test the mode switching for the CVS History Page.</p> <h3>Basic Mode Testing</h3> -<p> + <ol> - <li>Open the History view.</li> - <li>Open any file that is being managed by CVS.</li> - <li>Edit the file and save.</li> - <li>Show the history for the file.</li> - <li>Click on the Local and Remote Revisions button. Verify that you can see both remote revisions and local revisions.</li> - <li>Click on the Local Revisions button. Verify that you can see only local revisions. Note: <i>No background fetching should occur when you switch modes!</i></li> - <li>Click on the Remote Revisions button. Verify that you can see only remote revisions. Note: <i>No background fetching should occur when you switch modes!</i></li></li> + <li>Open the History view.</li> + <li>Open any file that is being managed by CVS.</li> + <li>Edit the file and save.</li> + <li>Show the history for the file.</li> + <li>Click on the Local and Remote Revisions button. Verify that + you can see both remote revisions and local revisions.</li> + <li>Click on the Local Revisions button. Verify that you can see + only local revisions. Note: <i>No background fetching should occur + when you switch modes!</i></li> + <li>Click on the Remote Revisions button. Verify that you can see + only remote revisions. Note: <i>No background fetching should occur + when you switch modes!</i></li> </ol> -</p> <h3>Mode Persistence Testing</h3> -<p> + <ol> - <li>Open the History view.</li> - <li>Show the history for the file.</li> - <li>Click on one of the modes, remember it and close the history view.</li> - <li>Show the history for a file again and verify that it is in fact the same mode that you had set prior to closing the history view.</li> + <li>Open the History view.</li> + <li>Show the history for the file.</li> + <li>Click on one of the modes, remember it and close the history + view.</li> + <li>Show the history for a file again and verify that it is in + fact the same mode that you had set prior to closing the history view.</li> </ol> -</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/passwords00001.html b/tests/org.eclipse.team.tests.cvs.core/html/passwords00001.html deleted file mode 100644 index b04631613..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/passwords00001.html +++ /dev/null @@ -1,11 +0,0 @@ -<html><head><title>Password Management</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><body><h2>Password Management</h2> -<p>Since: 3.0 M9<br> -Last Modified: $Date: 2004/05/31 20:05:52 $</p> - -<h3>Password Management</h3> - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/perf00001.html b/tests/org.eclipse.team.tests.cvs.core/html/perf00001.html index 411b7d9a4..27ea27968 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/perf00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/perf00001.html @@ -1,11 +1,15 @@ -<html><head><title>Performance</title> +<html> +<head> +<title>Performance</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Performance</h2> +</head> +<body> +<h2>Performance</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p><body> - -This section contains various performance tests as well as a record of previous performance test results for future reference. - -</body></html>
\ No newline at end of file +Last Modified: $Date: 2004/05/31 20:24:10 $</p> +This section contains various performance tests as well as a record of +previous performance test results for future reference. +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/perf00002.html b/tests/org.eclipse.team.tests.cvs.core/html/perf00002.html index be6678b61..a67226bbb 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/perf00002.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/perf00002.html @@ -1,22 +1,26 @@ -<html><head><title>Timings</title> +<html> +<head> +<title>Timings</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Timings</h2> +</head> +<body> +<h2>Timings</h2> <p>Since: 3.0<br> -Last Modified: $Date: 2007/05/18 13:54:37 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> This section contains various timing results and comparisons. <h3>Overview</h3> -The purpose of this section is to provide a small set of tests that can +The purpose of this section is to provide a small set of tests that can be used to benchmark the Eclipse CVS client. The areas tested are: <ol> -<li>Checkout -<li>Synchronizing -<li>Updating + <li>Checkout</li> + <li>Synchronizing</li> + <li>Updating</li> </ol> <h3>Setup</h3> @@ -24,96 +28,103 @@ be used to benchmark the Eclipse CVS client. The areas tested are: The following should be considered when obtaining timings: <ul> -<li>The Progress view in verbose mode can add 20% or more to times. -In regular mode, it can still add a bit to the time. For these timings, -the view was open but hidden. -<li>The Console view can add as much as 20% to times. For these tests, -the console was turned off entirely. -<li>Running an Eclipse operation several times will "warm-up" the code path -due to JIT. The timings for Eclipse were usually the second or third -timing obtained. + <li>The Progress view in verbose mode can add 20% or more to + times. In regular mode, it can still add a bit to the time. For these + timings, the view was open but hidden.</li> + <li>The Console view can add as much as 20% to times. For these + tests, the console was turned off entirely.</li> + <li>Running an Eclipse operation several times will "warm-up" the + code path due to JIT. The timings for Eclipse were usually the second + or third timing obtained.</li> </ul> The following numbers were obtained on a 2.8GHz PC running GTK, Sun 14.2 -with autobuild off and operations run in the foreground. The project used was -org.eclipse.jdt.tests.refactoring. It has a large number of folders and files -which give interesting times. The date the timings were obtained were May 31st, 2004 -so similar numbers can be obtained for comparison using the project snapshot at that time -(which can be obtained using a Date tag). +with autobuild off and operations run in the foreground. The project +used was org.eclipse.jdt.tests.refactoring. It has a large number of +folders and files which give interesting times. The date the timings +were obtained were May 31st, 2004 so similar numbers can be obtained for +comparison using the project snapshot at that time (which can be +obtained using a Date tag). <h3>Checkout</h3> -Checkout of org.eclipse.jdt.tests.refactoring as of 2004/05/31. The timings are -in "mm:ss" and were obtained by observation (i.e. stopwatch). +Checkout of org.eclipse.jdt.tests.refactoring as of 2004/05/31. The +timings are in "mm:ss" and were obtained by observation (i.e. +stopwatch). <ul> -<li>Eclipse 3.0 over pserver: 3:00 to 3:30 (several timings) -<ul> -<li>Timings increased slightly with progress view visible and considerably -with progress view in verbose mode. -</ul> -<li>CLI over pserver: 3:00 (1 timing) + <li>Eclipse 3.0 over pserver: 3:00 to 3:30 (several timings) + <ul> + <li>Timings increased slightly with progress view visible and + considerably with progress view in verbose mode. + </ul> + </li> + <li>CLI over pserver: 3:00 (1 timing)</li> </ul> <h3>Synchronize</h3> -Synchronizing of org.eclipse.jdt.tests.refactoring as of 2004/05/31. The timings are -in "mm:ss" and were obtained by observation (i.e. stopwatch). +Synchronizing of org.eclipse.jdt.tests.refactoring as of 2004/05/31. The +timings are in "mm:ss" and were obtained by observation (i.e. +stopwatch). <h4>Synchronize with no changes</h4> <ul> -<li>Eclipse 3.0 over pserver: 0:45 -<li>CLI over pserver: 0:42 ("cvs -n update") + <li>Eclipse 3.0 over pserver: 0:45</li> + <li>CLI over pserver: 0:42 ("cvs -n update")</li> </ul> <h4>Synchronize with all outgoing, no incoming</h4> <ul> -<li>Eclipse 3.0 over pserver: 1:00 -<li>CLI over pserver: 2:20 ("cvs -n update") + <li>Eclipse 3.0 over pserver: 1:00</li> + <li>CLI over pserver: 2:20 ("cvs -n update")</li> </ul> <h4>Synchronize with incoming changes</h4> -Incoming changes were simulated by loading version v20040106 and -then removing the tag (using a special utility action). This resulted -in 393 incoming changes. +Incoming changes were simulated by loading version v20040106 and then +removing the tag (using a special utility action). This resulted in 393 +incoming changes. <ul> -<li>Eclipse 3.0 over pserver: 0:55 -<li>CLI over pserver: 0:45 ("cvs -n update") + <li>Eclipse 3.0 over pserver: 0:55</li> + <li>CLI over pserver: 0:45 ("cvs -n update")</li> </ul> -The timing for Eclipse also includes the status command to fetch the revisions for the 393 incoming changes. +The timing for Eclipse also includes the status command to fetch the +revisions for the 393 incoming changes. <h3>Update</h3> -These timings were obtained using Team>Update for Eclipse and "cvs update ." for the CLI. +These timings were obtained using Team>Update for Eclipse and "cvs +update ." for the CLI. <h4>Update with no changes</h4> <ul> -<li>Eclipse 3.0 over pserver: 1:15, 1:25 (2 timings) -<li>CLI over pserver: 1:15 ("cvs update") + <li>Eclipse 3.0 over pserver: 1:15, 1:25 (2 timings)</li> + <li>CLI over pserver: 1:15 ("cvs update")</li> </ul> -<h4>Update with all false outgoing changes (using touch) </h4> +<h4>Update with all false outgoing changes (using touch)</h4> <ul> -<li>Eclipse 3.0 over pserver: 2:20 -<li>CLI over pserver: 2:20 + <li>Eclipse 3.0 over pserver: 2:20</li> + <li>CLI over pserver: 2:20</li> </ul> <h4>Update with incoming changes</h4> -Incoming changes were simulated by loading version v20040106 and -then removing the tag (using a special utility action). This resulted -in 393 incoming changes. +Incoming changes were simulated by loading version v20040106 and then +removing the tag (using a special utility action). This resulted in 393 +incoming changes. <ul> -<li>Eclipse 3.0 over pserver: 1:55 -<li>CLI over pserver: 1:55 ("cvs -n update") + <li>Eclipse 3.0 over pserver: 1:55</li> + <li>CLI over pserver: 1:55 ("cvs -n update")</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/perf00003.html b/tests/org.eclipse.team.tests.cvs.core/html/perf00003.html deleted file mode 100644 index 0dfcb0495..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/perf00003.html +++ /dev/null @@ -1,11 +0,0 @@ -<html><head><title>Memory Footprint</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><h2>Memory Footprint</h2> -<p>Since: <br> -Last Modified: $Date: 2004/05/31 20:24:10 $</p><body> - -This section contains some accumulated memory usage statistics - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/perf00004.html b/tests/org.eclipse.team.tests.cvs.core/html/perf00004.html index a0b9d0698..357c89a10 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/perf00004.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/perf00004.html @@ -1,14 +1,18 @@ -<html><head><title>Resource Data Structures</title> +<html> +<head> +<title>Resource Data Structures</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Resource Data Structures</h2> +</head> +<body> +<h2>Resource Data Structures</h2> <p>Since: 3.0<br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> -This section contains results on memory footprint of CVS in the Core resource -plugin data structures. More specifically, CVS uses the session and persistent property -caches along with the synchronizer. +This section contains results on memory footprint of CVS in the Core +resource plugin data structures. More specifically, CVS uses the session +and persistent property caches along with the synchronizer. <h3>CVS Workspace Sync info caches</h3> @@ -16,18 +20,20 @@ Checking of the cache usage requires the use of the Core spy tools. To obtain the memory footprint, perform the following steps. <ol> -<li>Install the Core Spy Tools -<li>Launch Eclipse -<li>Checkout several projects -<li>Open the Element Tree Spy to get the memory footprint. At the -time of writing, CVS is the main user of these structures. In future -test, ensure that others are not contributing to the tally. -<li>Disconnect all the projects -<li>The Element Tree Spy memory footprint should be reduced accordingly + <li>Install the Core Spy Tools</li> + <li>Launch Eclipse</li> + <li>Checkout several projects</li> + <li>Open the Element Tree Spy to get the memory footprint. At the + time of writing, CVS is the main user of these structures. In future + test, ensure that others are not contributing to the tally.</li> + <li>Disconnect all the projects</li> + <li>The Element Tree Spy memory footprint should be reduced + accordingly</li> </ol> -The following snapshot of the resource element tree was taken after checking out all of the projects -(294 as of 2004/05/31) in dev.eclipse.org. +The following snapshot of the resource element tree was taken after +checking out all of the projects (294 as of 2004/05/31) in +dev.eclipse.org. <pre> Total resource count: 89,466 @@ -81,17 +87,20 @@ The top 20 equal but non-identical strings are: </pre> <h3>CVS Merge memory usage</h3> -Merging in CVS makes use of the Core synchronizer. Perform the following steps -with the Core Spy Tool installed to -ensure proper memory management. +Merging in CVS makes use of the Core synchronizer. Perform the following +steps with the Core Spy Tool installed to ensure proper memory +management. <ol> -<li>Checkout one or more projects -<li>Open the Element Tree Spy to get the memory footprint. -<li>Perform a merge -<li>Open the Element Tree Spy to get the memory footprint. The only increase -should be in the synchronizer. -<li>Remove the merge from the sync view -<li>The Element Tree Spy memory footprint should be reduced accordingly + <li>Checkout one or more projects</li> + <li>Open the Element Tree Spy to get the memory footprint.</li> + <li>Perform a merge</li> + <li>Open the Element Tree Spy to get the memory footprint. The + only increase should be in the synchronizer.</li> + <li>Remove the merge from the sync view</li> + <li>The Element Tree Spy memory footprint should be reduced + accordingly</li> </ol> -</body></html>
\ No newline at end of file + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/perf00005.html b/tests/org.eclipse.team.tests.cvs.core/html/perf00005.html index 8bec63ba7..35a3d04a6 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/perf00005.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/perf00005.html @@ -1,31 +1,39 @@ -<html><head><title>Looking For Leaks</title> +<html> +<head> +<title>Looking For Leaks</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Looking For Leaks</h2> +</head> +<body> +<h2>Looking For Leaks</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/01 13:53:59 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <h3>Removing synchronize view entries</h3> <ol> -<li>Start with an empty synchronize view -<li>Create an entry in the Synchronize view for each of the following cases: + <li>Start with an empty synchronize view</li> + <li>Create an entry in the Synchronize view for each of the + following cases: <ul> - <li>Team>Synchronize - <li>Compare with>Branch or Version - <li>Team>Merge + <li>Team>Synchronize</li> + <li>Compare with>Branch or Version</li> + <li>Team>Merge</li> </ul> -<li>Open the context menu -<li>Select all mode and layout combinations -<li>Remove the entry (making the sync view empty). -<li>Select an item in another view -<li>Using a memory profiler, look for instances of the following classes: + </li> + <li>Open the context menu</li> + <li>Select all mode and layout combinations</li> + <li>Remove the entry (making the sync view empty).</li> + <li>Select an item in another view</li> + <li>Using a memory profiler, look for instances of the following + classes: <ul> - <li>ISynchronizeParticipant - <li>SynchronizeModelElement - <li>SyncInfo/SyncInfoSet + <li>ISynchronizeParticipant + <li>SynchronizeModelElement + <li>SyncInfo/SyncInfoSet </ul> + </li> </ol> <h3>Closing the Synchronize view</h3> @@ -33,4 +41,5 @@ Last Modified: $Date: 2004/06/01 13:53:59 $</p> Close all instances of the Synchronize view and ensure that no instances of ISynchronizeView remain. -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/perf00006.html b/tests/org.eclipse.team.tests.cvs.core/html/perf00006.html index 9518d2d54..b56dec81f 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/perf00006.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/perf00006.html @@ -1,31 +1,35 @@ -<html><head><title>Team Data Structures</title> +<html> +<head> +<title>Team Data Structures</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Team Data Structures</h2> +</head> +<body> +<h2>Team Data Structures</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> -The Team component provides several data structures that can be used to -cache resource synchronization state and resource variants for improved -performance. The plan is to provide tools to interrogate these caches in the 3.1 timeframe. - -These caches include: +The Team component provides several data structures that can be used to +cache resource synchronization state and resource variants for improved +performance. The plan is to provide tools to interrogate these caches in +the 3.1 timeframe. These caches include: <ul> -<li>Resource Variant cache -<li>SubsciberParticipant/SyncInfoSet + <li>Resource Variant cache</li> + <li>SubsciberParticipant/SyncInfoSet</li> </ul> <h3>CVS Specific data structures</h3> -CVS uses several caches to improve performance. Tools should be provided to query the -size of these caches as well. +CVS uses several caches to improve performance. Tools should be provided +to query the size of these caches as well. <ul> -<li>Console (caches contents while not visible) -<li>Resource History View log entry cache -<li>Commit Sets log entry cache + <li>Console (caches contents while not visible)</li> + <li>Resource History View log entry cache</li> + <li>Commit Sets log entry cache</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/perf00007.html b/tests/org.eclipse.team.tests.cvs.core/html/perf00007.html index 405bd3eeb..02722dd2c 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/perf00007.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/perf00007.html @@ -1,18 +1,24 @@ -<html><head><title>Scalability</title> +<html> +<head> +<title>Scalability</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Scalability</h2> +</head> +<body> +<h2>Scalability</h2> <p>Since: <br> -Last Modified: $Date: 2007/05/18 13:54:37 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> -<p>The following scenario can be used to test a large number of incoming additions:</p> +<p>The following scenario can be used to test a large number of +incoming additions:</p> <ol> -<li>Load org.eclipse.jdt.core.tests.model from dev.eclipse.org -<li>Disconnect Formatter folder and delete it -<li>Synchronize and the contents show up as incoming additions -<li>Perform an Update in the project in the sync view. + <li>Load org.eclipse.jdt.core.tests.model from dev.eclipse.org</li> + <li>Disconnect Formatter folder and delete it</li> + <li>Synchronize and the contents show up as incoming additions</li> + <li>Perform an Update in the project in the sync view.</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/pinHistoryView00001.html b/tests/org.eclipse.team.tests.cvs.core/html/pinHistoryView00001.html index 537a8edea..aa860df5e 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/pinHistoryView00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/pinHistoryView00001.html @@ -1,32 +1,41 @@ -<html><head><title>Pin History View</title> +<html> +<head> +<title>Pin History View</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Pin History View</h2> +</head> +<body> +<h2>Pin History View</h2> <p>Since: 3.2 RC2<br> -Last Modified: $Date: 2006/04/25 20:40:39 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> <p><b>Purpose:</b> Test the pinning behavior of the history view.</p> <h3>Simple Pinning</h3> -<p> + <ol> - <li>With a file history in the History View, hit the Pin button.</li> - <li>DND a file onto the pinned history view.</li> - <li>Verify that a new history view instance opens with the history of the new file displayed.</li> - <li>Drag another file onto the pinned instance and verify that it too goes to the new unpinned view.</li> + <li>With a file history in the History View, hit the Pin button.</li> + <li>DND a file onto the pinned history view.</li> + <li>Verify that a new history view instance opens with the history + of the new file displayed.</li> + <li>Drag another file onto the pinned instance and verify that it + too goes to the new unpinned view.</li> </ol> -Repeat the above using both a CVS file and an unmanaged file. -</p> +<p>Repeat the above using both a CVS file and an unmanaged file.</p> <h3>More Pinning</h3> -<p>If a one of the views already contains a file, that file should always update the pinned -view. +<p>If a one of the views already contains a file, that file should +always update the pinned view.</p> + <ol> - <li>With a file history in the History View, hit the Pin button.</li> - <li>DND a file onto the pinned history view.</li> - <li>Verify that a new history view instance opens with the history of the new file displayed.</li> - <li>Now show the history for the original file in the pinned view. The pin view should come to the fore front.</li> + <li>With a file history in the History View, hit the Pin button.</li> + <li>DND a file onto the pinned history view.</li> + <li>Verify that a new history view instance opens with the history + of the new file displayed.</li> + <li>Now show the history for the original file in the pinned view. + The pin view should come to the fore front.</li> </ol> -</p> -</body></html>
\ No newline at end of file + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/project_sets00001.html b/tests/org.eclipse.team.tests.cvs.core/html/project_sets00001.html index db0168448..f04ddf377 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/project_sets00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/project_sets00001.html @@ -1,16 +1,27 @@ -<html><head><title>Project Sets</title> +<html> +<head> +<title>Project Sets</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Project Sets</h2> +</head> +<body> +<h2>Project Sets</h2> <p>Since: 2.1 <br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> <ul> -<li>Create a project set from a workspace with multiple projects shared with CVS. The shared projects in the workspace should include projects shared with the following: branch, version, date and HEAD. -<li>Start with an empty workspace and import the projects using the import projects sets wizard. Try running Project Set import in the background too. -<li>You should be prompted for a password and username for the locations. -<li>Ensure that the projects are checked out correctly and against the correct tag. + <li>Create a project set from a workspace with multiple projects + shared with CVS. The shared projects in the workspace should include + projects shared with the following: branch, version, date and HEAD.</li> + <li>Start with an empty workspace and import the projects using + the import projects sets wizard. Try running Project Set import in the + background too.</li> + <li>You should be prompted for a password and username for the + locations.</li> + <li>Ensure that the projects are checked out correctly and against + the correct tag.</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/quickdiff00001.html b/tests/org.eclipse.team.tests.cvs.core/html/quickdiff00001.html index 20709aea5..48c95b338 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/quickdiff00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/quickdiff00001.html @@ -1,4 +1,6 @@ -<html><head><title>Quick Diff</title> +<html> +<head> +<title>Quick Diff</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> @@ -6,27 +8,24 @@ <body> <h2>Quick Diff</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2007/05/23 13:19:14 $</p> -<p>Enable CVS quick diff for text and java files via the General > Editors > Quick Diff preference. Then try the following -scenarios:</p> +<p>Enable CVS quick diff for text and java files via the General > +Editors > Quick Diff preference. Then try the following scenarios:</p> <ol> - -<li>Open a file and make changes to it. You will see the quickdiff annotations -marking the changes. Next, run Replace With > Latest from HEAD. The annotations are -removed and the file is clean. - -<li>Same as 1 but this time instead commit the file. The quickdiff annotations -are removed and the file is clean. - -<li>Checkout two copies of the same project. Open file1 from both projects. Make -changes to file1 in project1 and commit the change. Synchronize project2 and -file1 from project1 will show the quickdiff annotations for the new incoming -changes. - -<li>Same as previous but this time actually update the file. The files quickdiff -annotations are removed and the file is clean. + <li>Open a file and make changes to it. You will see the quickdiff + annotations marking the changes. Next, run Replace With > Latest from + HEAD. The annotations are removed and the file is clean.</li> + <li>Same as 1 but this time instead commit the file. The quickdiff + annotations are removed and the file is clean.</li> + <li>Checkout two copies of the same project. Open file1 from both + projects. Make changes to file1 in project1 and commit the change. + Synchronize project2 and file1 from project1 will show the quickdiff + annotations for the new incoming changes.</li> + <li>Same as previous but this time actually update the file. The + files quickdiff annotations are removed and the file is clean.</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/refreshHistory00002.html b/tests/org.eclipse.team.tests.cvs.core/html/refreshHistory00002.html index 5a8cbf8c8..462a25de9 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/refreshHistory00002.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/refreshHistory00002.html @@ -1,34 +1,51 @@ -<html><head><title>Refresh</title> +<html> +<head> +<title>Refresh</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Refresh</h2> +</head> +<body> +<h2>Refresh</h2> <p>Since: 3.2 RC2<br> -Last Modified: $Date: 2006/04/25 20:40:39 $</p> - -<p><b>Purpose:</b> Test the two types of refresh behavior available in the history view</p> +Last Modified: $Date: 2007/05/18 13:54:38 $</p> +<p><b>Purpose:</b> Test the two types of refresh behavior available +in the history view</p> <h3>Automatic Refresh</h3> -<p> When a local file is modified and saved, a refresh event is sent out and the history view should show the newest revision. This -will work for both local history and CVS history files. (CVS files need to have the history view in the appropriate viewing mode: either -"Remote and Local Revisions" or "Local Revisions".) + +<p>When a local file is modified and saved, a refresh event is sent +out and the history view should show the newest revision. This will work +for both local history and CVS history files. (CVS files need to have +the history view in the appropriate viewing mode: either "Remote and +Local Revisions" or "Local Revisions".)</p> + <ol> - <li>With a file history in the History View, and the viewer in an appropriate mode if a CVS file, open an editor on the workspace - copy of the file in the history view.</li> - <li>Edit the file and save.</li> - <li>Verify that a new local revision gets added to the history view which reflects your change.</li> + <li>With a file history in the History View, and the viewer in an + appropriate mode if a CVS file, open an editor on the workspace copy of + the file in the history view.</li> + <li>Edit the file and save.</li> + <li>Verify that a new local revision gets added to the history + view which reflects your change.</li> </ol> -</p> + <h3>Manual Refresh</h3> -<p> There is also a Refresh button on the toolbar. This is mainly useful for CVS file histories if you want to check if any revisions have been committed. -Note that its not really of any use for local revisions as they are updated automatically. + +<p>There is also a Refresh button on the toolbar. This is mainly +useful for CVS file histories if you want to check if any revisions have +been committed. Note that its not really of any use for local revisions +as they are updated automatically.</p> + <ol> - <li>With a CVS file history in the History View, make a change to the file and save. (You should see the local version updated in the history view.)</li> - <li>Commit the file.</li> - <li>Hit the Refresh toolbar button and verify that the new revision gets displayed in the history view,</li> + <li>With a CVS file history in the History View, make a change to + the file and save. (You should see the local version updated in the + history view.)</li> + <li>Commit the file.</li> + <li>Hit the Refresh toolbar button and verify that the new + revision gets displayed in the history view,</li> </ol> -</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/repoview_basics00001.html b/tests/org.eclipse.team.tests.cvs.core/html/repoview_basics00001.html index 6b1383883..acd7753d1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/repoview_basics00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/repoview_basics00001.html @@ -1,44 +1,55 @@ -<html><head><title>Basics</title> +<html> +<head> +<title>Basics</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Basics</h2> +</head> +<body> +<h2>Basics</h2> <p>Since: <br> -Last Modified: $Date: 2005/05/10 18:44:21 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> <h3>Adding and Discarding Locations</h3> -<p>You should be able to create a repository location from the toolbar of the view or via the context menu. -Try expanding the location, the HEAD, Versions and Branches categories. Also, -try the failures cases from <a href="connections00001.html">Connections</a>. -Things to try: +<p>You should be able to create a repository location from the +toolbar of the view or via the context menu. Try expanding the location, +the HEAD, Versions and Branches categories. Also, try the failures cases +from <a href="connections00001.html">Connections</a>. Things to try:</p> + <ul> -<li>Create repo locations for different connection types: ext, pserver, extssh. -<li>Create a repo location by pasting a location string into the host field (e.g. -:pserver:anonymous@dev.eclipse.org:/home/eclipse). -<li>Expanding project nodes should process the children in the background and the -view should remain responsive while this is happening. When children nodes are added to the -tree the tree shouldn't be too jumpy. -<li>Discard a location and ensure it is removed. Also ensure that discarding is not permitted when -projects in the local workspace are shared with the location. + <li>Create repo locations for different connection types: ext, + pserver, extssh.</li> + <li>Create a repo location by pasting a location string into the + host field (e.g. :pserver:anonymous@dev.eclipse.org:/home/eclipse).</li> + <li>Expanding project nodes should process the children in the + background and the view should remain responsive while this is + happening. When children nodes are added to the tree the tree shouldn't + be too jumpy.</li> + <li>Discard a location and ensure it is removed. Also ensure that + discarding is not permitted when projects in the local workspace are + shared with the location.</li> </ul> -</p> <h3>Repository Location Properties</h3> -View a location's properties page and ensure that information is correct and can be changed. -Ensure that the sharing information for any projects mapped to the location are also changed. +View a location's properties page and ensure that information is correct +and can be changed. Ensure that the sharing information for any projects +mapped to the location are also changed. <h3>Modules</h3> <h3>Working with modules</h3> <ul> - <li>Expanding HEAD or the Versions category should display the modules defined in the CVSROOT/modules file</li> - <li>Check Out and Checkout As should be available on modules and should work as expected</li> - <li>Performing a "Configure Branches and Versions" on the module allows the user to set the autorefresh file and add some tags. - Ensure that the module now appears properly in association with those tags.</li> -</ol> - + <li>Expanding HEAD or the Versions category should display the + modules defined in the CVSROOT/modules file</li> + <li>Check Out and Checkout As should be available on modules and + should work as expected</li> + <li>Performing a "Configure Branches and Versions" on the module + allows the user to set the autorefresh file and add some tags. Ensure + that the module now appears properly in association with those tags.</li> +</ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/sharingbasics00001.html b/tests/org.eclipse.team.tests.cvs.core/html/sharingbasics00001.html index 1f79ae54d..efe3dd127 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/sharingbasics00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/sharingbasics00001.html @@ -1,17 +1,25 @@ -<html><head><title>Basics</title> +<html> +<head> +<title>Basics</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Basics</h2> +</head> +<body> +<h2>Basics</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2004/06/01 19:14:48 $</p> <p>Single select a project and select share.</p> <ul> -<li>Should only be available if the project is not shared. -<li>Menu item should be available from the Project top level menu. -<li>Wizard should allow you to cancel at any time and un-map the project. Note that some resources may of been committed via the wizard that will remain committed. -<li>Should be able to share as a repository root {".") or a folder at any level (i.e. a folder name with one or more paths). + <li>Should only be available if the project is not shared.</li> + <li>Menu item should be available from the Project top level menu.</li> + <li>Wizard should allow you to cancel at any time and un-map the + project. Note that some resources may of been committed via the wizard + that will remain committed.</li> + <li>Should be able to share as a repository root {".") or a folder + at any level (i.e. a folder name with one or more paths).</li> </ul> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/showHistoryUMFile00001.html b/tests/org.eclipse.team.tests.cvs.core/html/showHistoryUMFile00001.html index 4a2673f8b..e74be7704 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/showHistoryUMFile00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/showHistoryUMFile00001.html @@ -1,20 +1,29 @@ -<html><head><title>Show History Unmapped File</title> +<html> +<head> +<title>Show History Unmapped File</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Show History Unmapped File</h2> +</head> +<body> +<h2>Show History Unmapped File</h2> <p>Since: 3.2 RC2 <br> -Last Modified: $Date: 2006/04/25 20:20:14 $</p> +Last Modified: $Date: 2006/04/25 20:40:39 $</p> -<p><b>Purpose:</b> Test the page activation mechanism for unmapped files.</p> +<p><b>Purpose:</b> Test the page activation mechanism for unmapped +files.</p> <ol> - <li>Open the History view.</li> - <li>Select the local file, right click and select Team>Show Local History.</li> - <li>Ensure the the history view shows the appropriate history (i.e. all revisions - present and proper filename in the title bar).</li> + <li>Open the History view.</li> + <li>Select the local file, right click and select Team>Show Local + History.</li> + <li>Ensure the the history view shows the appropriate history + (i.e. all revisions present and proper filename in the title bar).</li> </ol> -<p>Populate the History View with another file from a project that is <i>shared with a CVS repository.</i> Repeat the above -and make sure that the View updates.</p> -</body></html>
\ No newline at end of file +<p>Populate the History View with another file from a project that +is <i>shared with a CVS repository.</i> Repeat the above and make sure +that the View updates.</p> + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/sync00001.html b/tests/org.eclipse.team.tests.cvs.core/html/sync00001.html index 0487c5a39..01ed7e272 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/sync00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/sync00001.html @@ -1,40 +1,55 @@ -<html><head><title>Scenarios</title> +<html> +<head> +<title>Scenarios</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Scenarios</h2> +</head> +<body> +<h2>Scenarios</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/01 19:14:48 $</p> +Last Modified: $Date: 2007/05/18 13:54:38 $</p> <h3>Making Manual Changes</h3> -<p>Create a conflicting file change. Manually edit the left source pane in - the sync view. Hit "Save" on the popup menu. The file should remain a Conflict. Choose - Mark as Merged in the popup menu of the tree. The file should change to -an outgoing change. Commit the outgoing change.</p> + +<p>Create a conflicting file change. Manually edit the left source +pane in the sync view. Hit "Save" on the popup menu. The file should +remain a Conflict. Choose Mark as Merged in the popup menu of the tree. +The file should change to an outgoing change. Commit the outgoing +change.</p> + <h3>Merging Conflicts</h3> -<p>Try Override and Update with different combinations of Auto-Mergeable -and Non-Mergeable conflicts in the selection. If all conflicts are Non-Mergeable, - then the only choice is to replace with remote or cancel. If one or more -conflicts are Auto-Mergeable, the choices are (a) Auto-Merge any applicable -files, and replace the rest with remote, (b) Replace all files with remote -or (c) Cancel.</p> + +<p>Try Override and Update with different combinations of +Auto-Mergeable and Non-Mergeable conflicts in the selection. If all +conflicts are Non-Mergeable, then the only choice is to replace with +remote or cancel. If one or more conflicts are Auto-Mergeable, the +choices are (a) Auto-Merge any applicable files, and replace the rest +with remote, (b) Replace all files with remote or (c) Cancel.</p> + <h3>Removing from View</h3> -<p>Choose Remove from View. Selected nodes should disappear. Refresh the -view. The nodes should reappear.</p> + +<p>Choose Remove from View. Selected nodes should disappear. Refresh +the view. The nodes should reappear.</p> <h3>Working with Branches</h3> -<p>Try any and all of the above, but use a branch instead of HEAD. Behavior - should be identical. The sync view decorator should show you the name of -the branch.</p> + +<p>Try any and all of the above, but use a branch instead of HEAD. +Behavior should be identical. The sync view decorator should show you +the name of the branch.</p> + <h3>Using Mixed Tags</h3> -<p>Using Team->Branch, Replace With->Branch or Version, and Team->Tag - as Version, you can create a project which has different tags mixed into -it. For example, one folder may be shared as V2_0, a single file may be attached - to the branch NEW_FEATURE_BRANCH, and the root of the project may be attached - to HEAD. We need to test usage of these projects in the sync view. For example, - if developer 1 has project P shared with HEAD, and folder P/F is shared -with branch B, have developer 2 release a change to folder F in HEAD, and -have developer 1 perform a sync. In this case developer 1 should not see -the incoming change.</p> - -</body></html>
\ No newline at end of file + +<p>Using Team->Branch, Replace With->Branch or Version, and +Team->Tag as Version, you can create a project which has different +tags mixed into it. For example, one folder may be shared as V2_0, a +single file may be attached to the branch NEW_FEATURE_BRANCH, and the +root of the project may be attached to HEAD. We need to test usage of +these projects in the sync view. For example, if developer 1 has project +P shared with HEAD, and folder P/F is shared with branch B, have +developer 2 release a change to folder F in HEAD, and have developer 1 +perform a sync. In this case developer 1 should not see the incoming +change.</p> + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/syncRestart00001.html b/tests/org.eclipse.team.tests.cvs.core/html/syncRestart00001.html index 63143a85b..2725c90ba 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/syncRestart00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/syncRestart00001.html @@ -1,27 +1,33 @@ -<html><head><title>Restart Behavior</title> +<html> +<head> +<title>Restart Behavior</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Restart Behavior</h2> +</head> +<body> +<h2>Restart Behavior</h2> <p>Since: 3.3<br> Last Modified: $Date$</p> <h1>Synchronization Restart Behavior</h1> -<p>CVS Synchronizations can be configured to populate or synchronize +<p>CVS Synchronizations can be configured to populate or synchronize after a restart. To test this, do the following:</p> <ol> -<li>Create a CVS synchronization of each persisted type (Workspace and Merge).</li> -<li>Restart and see the page that allows you to populate or restart.</li> -<li>Choose to remember the operation</li> -<li>Pick an operation and ensure that the behavior is respected -</li> + <li>Create a CVS synchronization of each persisted type (Workspace + and Merge).</li> + <li>Restart and see the page that allows you to populate or + restart.</li> + <li>Choose to remember the operation</li> + <li>Pick an operation and ensure that the behavior is respected</li> </ol> -You will want to repeat these steps for both operations -(Synchronize and Populate) and you should also repeat them -using the preference page available from the view menu in the -Synchronize view. +You will want to repeat these steps for both operations (Synchronize and +Populate) and you should also repeat them using the preference page +available from the view menu in the Synchronize view. -</body></html>
\ No newline at end of file + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/tags00001.html b/tests/org.eclipse.team.tests.cvs.core/html/tags00001.html index df86d41df..51919bcbf 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/tags00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/tags00001.html @@ -1,9 +1,13 @@ -<html><head><title>Tags</title> +<html> +<head> +<title>Tags</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Tags</h2> +</head> +<body> +<h2>Tags</h2> <p>Since: 3.1 M4<br> -Last Modified: $Date: 2004/12/17 16:10:10 $</p> - -</body></html>
\ No newline at end of file +Last Modified: $Date: 2005/02/04 21:58:25 $</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/tags00002.html b/tests/org.eclipse.team.tests.cvs.core/html/tags00002.html index 8f9c04134..97df99829 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/tags00002.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/tags00002.html @@ -1,31 +1,39 @@ -<html><head><title>Tag Selection in Dialogs</title> +<html> +<head> +<title>Tag Selection in Dialogs</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Tag Selection in Dialogs</h2> +</head> +<body> +<h2>Tag Selection in Dialogs</h2> <p>Since: 3.1 M4<br> -Last Modified: $Date: 2004/12/17 16:10:10 $</p> +Last Modified: $Date: 2005/02/04 21:58:25 $</p> Tag lists appear in many dialogs: + <ul> -<li>Replace with Branch or Version -<li>Compare with Branch or Version -<li>Share of existing project -<li>Switch to Another Branch or Versions -<li>Tag with Existing -<li>Tag as Version + <li>Replace with Branch or Version</li> + <li>Compare with Branch or Version</li> + <li>Share of existing project</li> + <li>Switch to Another Branch or Versions</li> + <li>Tag with Existing</li> + <li>Tag as Version</li> </ul> -<p> -In each of these places, typing in the tag text field will filter the list of shown tags. -The option to Refresh and Configure tags should also be present. Refreshing behavior should be as follows: +<p>In each of these places, typing in the tag text field will filter +the list of shown tags. The option to Refresh and Configure tags should +also be present. Refreshing behavior should be as follows:</p> <ol> - <li>If an auto-refresh file (.project by default) exists and has tags, the tags are obtained from the file. - <li>If there is no auto-refresh file, the log command is used to determine if there are any tags in the files - that are direct children of the remote folder. - <li>If no tags are found, the user is prompted to either perform a deep log to find any tags or configure the - tags manually. + <li>If an auto-refresh file (.project by default) exists and has + tags, the tags are obtained from the file.</li> + <li>If there is no auto-refresh file, the log command is used to + determine if there are any tags in the files that are direct children + of the remote folder.</li> + <li>If no tags are found, the user is prompted to either perform a + deep log to find any tags or configure the tags manually.</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/tags00003.html b/tests/org.eclipse.team.tests.cvs.core/html/tags00003.html index fdf22b358..b1d080579 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/tags00003.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/tags00003.html @@ -1,24 +1,36 @@ -<html><head><title>Tag Caching</title> +<html> +<head> +<title>Tag Caching</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Tag Caching</h2> +</head> +<body> +<h2>Tag Caching</h2> <p>Since: 3.1 M4<br> -Last Modified: $Date: 2005/02/04 21:58:25 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> -Discovered tags are cached locally to improve performance. Caching is done in the following ways: +Discovered tags are cached locally to improve performance. Caching is +done in the following ways: <ol> -<li>Tags discovered for local resources are cached with the remote folder that the resource's project is mapped to. -<li>Tags discovered for remote resources are cached with the resource if it is a folder or the resource's parent if it is a file. + <li>Tags discovered for local resources are cached with the remote + folder that the resource's project is mapped to.</li> + <li>Tags discovered for remote resources are cached with the + resource if it is a folder or the resource's parent if it is a file.</li> </ol> To test this, you can try one or more of the following: + <ol> -<li>Perform Compare With on folders and subfolders in the repositories view. The first time, you will need to perform a Refresh \ -but subsequent times, the tags should be cached. -<li>Load non-root folders as projects and ensure tags are cached and obtained properly. -<li>Perform Tag with Existing in the History view and ensure that tags are obtained from the file + <li>Perform Compare With on folders and subfolders in the + repositories view. The first time, you will need to perform a Refresh \ + but subsequent times, the tags should be cached.</li> + <li>Load non-root folders as projects and ensure tags are cached + and obtained properly.</li> + <li>Perform Tag with Existing in the History view and ensure that + tags are obtained from the file</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/teamupdate00001.html b/tests/org.eclipse.team.tests.cvs.core/html/teamupdate00001.html deleted file mode 100644 index acbfc8e96..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/teamupdate00001.html +++ /dev/null @@ -1,13 +0,0 @@ -<html><head><title>Update</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><h2>Update</h2> -<p>Since: 2.0<br> -Last Modified: $Date: 2004/05/31 20:01:23 $</p><body> - -<h3>Update Wizard</h3> -<p>You can run an update and open the console to see the files that are being updated.</p> -<p>You can run the update and switch to another branch, this should keep your outgoing changes and update all other non-changed files.</p> - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/toolbarButtonsUMFile00001.html b/tests/org.eclipse.team.tests.cvs.core/html/toolbarButtonsUMFile00001.html index 2e7122983..317b76da7 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/toolbarButtonsUMFile00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/toolbarButtonsUMFile00001.html @@ -1,30 +1,47 @@ -<html><head><title>Common Toolbar Buttons</title> +<html> +<head> +<title>Common Toolbar Buttons</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Common Toolbar Buttons</h2> +</head> +<body> +<h2>Common Toolbar Buttons</h2> <p>Since: 3.2 RC2 <br> -Last Modified: $Date: 2006/04/25 20:40:39 $</p> +Last Modified: $Date: 2007/09/06 15:23:00 $</p> -<p><b>Purpose:</b> Test the functionality of the various buttons common to both the Local File History page and the CVS History page</p> +<p><b>Purpose:</b> Test the functionality of the various buttons +common to both the Local File History page and the CVS History page</p> + +Note: Even though the functionality is the same for both pages, the +tests should be conducted on both an unmanaged file and a CVS file as +each history page has its own respective implementation for the +following actions. -Note: Even though the functionality is the same for both pages, the tests should be conducted on both an unmanaged file and a CVS file as each history page has its own respective implementation for the following actions. <hr></hr> + <h3>Compare Mode</h3> -<p> + <ol> - <li>With a file history in the History View and the Compare Mode button <b>off</b>, click on any revision and - verify that it opens that revision.</li> - <li>Click the Compare Mode button <b>on</b> and verify that clicking on any local file revision will now bring up the compare editor.</li> - <li>Verify that turning the Compare Mode button off again switches back to Open mode.</li> + <li>With a file history in the History View and the Compare Mode + button <b>off</b>, click on any revision and verify that it opens that + revision.</li> + <li>Click the Compare Mode button <b>on</b> and verify that + clicking on any local file revision will now bring up the compare + editor.</li> + <li>Verify that turning the Compare Mode button off again switches + back to Open mode.</li> </ol> -</p> + <hr></hr> + <h3>Collapse All</h3> -<p> + <ol> - <li>With a file history in the History View, and the Group by Date button <b>on</b>, click the Collapse All button.</li> - <li>Verify that all of the items in the tree are collapsed.</li> + <li>With a file history in the History View, and the Group by Date + button <b>on</b>, click the Collapse All button.</li> + <li>Verify that all of the items in the tree are collapsed.</li> </ol> -</p> -</body></html>
\ No newline at end of file + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/update00001.html b/tests/org.eclipse.team.tests.cvs.core/html/update00001.html deleted file mode 100644 index 8049625cf..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/html/update00001.html +++ /dev/null @@ -1,13 +0,0 @@ -<html><head><title>Update</title> -<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> -<meta NAME="keywords" content=""> -<meta NAME="since" content=""> -</head><h2>Update</h2> -<p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p><body> - -<h3>Update Wizard</h3> -<p>You can run an update and open the console to see the files that are being updated.</p> -<p>You can run the update and switch to another branch, this should keep your outgoing changes and update all other non-changed files.</p> - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/update_command00001.html b/tests/org.eclipse.team.tests.cvs.core/html/update_command00001.html index f6290ea98..a528ee045 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/update_command00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/update_command00001.html @@ -1,12 +1,19 @@ -<html><head><title>Updating</title> +<html> +<head> +<title>Updating</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Updating</h2> +</head> +<body> +<h2>Updating</h2> <p>Since: 2.0 <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> -<p>You can run an update and open the console to see the files that are being updated.</p> -<p>You can run the update and switch to another branch, this should keep your outgoing changes and update all other non-changed files.</p> +<p>You can run an update and open the console to see the files that +are being updated.</p> +<p>You can run the update and switch to another branch, this should +keep your outgoing changes and update all other non-changed files.</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/validate_edit00001.html b/tests/org.eclipse.team.tests.cvs.core/html/validate_edit00001.html index d8d511c8c..75301572f 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/validate_edit00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/validate_edit00001.html @@ -1,9 +1,13 @@ -<html><head><title>Validate Edit</title> +<html> +<head> +<title>Validate Edit</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Validate Edit</h2> +</head> +<body> +<h2>Validate Edit</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p><body> - -</body></html>
\ No newline at end of file +Last Modified: $Date: 2004/06/10 21:32:44 $</p> +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/validate_edit_editing_files00001.html b/tests/org.eclipse.team.tests.cvs.core/html/validate_edit_editing_files00001.html index 54f52795f..0a8d56854 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/validate_edit_editing_files00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/validate_edit_editing_files00001.html @@ -1,144 +1,205 @@ -<html><head><title>Editing Files</title> +<html> +<head> +<title>Editing Files</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Editing Files</h2> +</head> +<body> +<h2>Editing Files</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/14 20:44:55 $</p> -<p> -These tests are to sanity check editors behavior relating to calling validateEdit. The tests will -try to cover all cases where files are changed by the validateEdit handler and changes are made -to the read-only bit. -</p><p> -These test cases outline the expected behavior of single file editors in terms -of calling validateEdit and handling of error conditions. All scenarios assume -that a repository provider is mapped to a project and has created a sandbox -with files that are marked read-only. -</p><p> -The -<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.team.examples.filesystem/"> -org.eclipse.team.example.filesystem</a> plugin is a repository provider -that simulates a pessimistic workflow. You can use it to run these tests and validate (no pun intended) your validateEdit -editor support. To use the pessimistic provider, share a project with the repository provider called "File -System Pessimistic Example" and then you can add to control the files and -checkin/checkout will toggle the read-only bit and touch the file. You can -change the behavior of the validateEdit call via the pessimistic preference -page. For example, you can force the operation to fail and update contents of the file -when checked out. -</p> -<p> -These tests should be run against the following combinations of tools: +Last Modified: $Date: 2007/05/18 13:54:37 $</p> + +<p>These tests are to sanity check editors behavior relating to +calling validateEdit. The tests will try to cover all cases where files +are changed by the validateEdit handler and changes are made to the +read-only bit.</p> + +<p>These test cases outline the expected behavior of single file +editors in terms of calling validateEdit and handling of error +conditions. All scenarios assume that a repository provider is mapped to +a project and has created a sandbox with files that are marked +read-only.</p> + +<p>The <a + href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.team.examples.filesystem/"> +org.eclipse.team.example.filesystem</a> plugin is a repository provider that +simulates a pessimistic workflow. You can use it to run these tests and +validate (no pun intended) your validateEdit editor support. To use the +pessimistic provider, share a project with the repository provider +called "File System Pessimistic Example" and then you can add to control +the files and checkin/checkout will toggle the read-only bit and touch +the file. You can change the behavior of the validateEdit call via the +pessimistic preference page. For example, you can force the operation to +fail and update contents of the file when checked out.</p> + +<p>These tests should be run against the following combinations of +tools:</p> + <ul> -<li>Different repository providers -<li>Single file editors (java, text) -<li>Multiple file editors (manifest editor, ...) + <li>Different repository providers</li> + <li>Single file editors (java, text)</li> + <li>Multiple file editors (manifest editor, ...)</li> </ul> + <!-- ------------------------------------------------------------------------------ --> + <h3>S1: Repository provider enabled and files are readable</h3> <ol> -<li>Open a file that is not marked read-only in a project configured with a repository provider. -<li>Start editing the file, validate edit should not be called. + <li>Open a file that is not marked read-only in a project + configured with a repository provider.</li> + <li>Start editing the file, validate edit should not be called.</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S2: Validate edit called on first edit</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit returns OK, the users edit is accepted and shows up in the editor, and the file can be edited normally. -<li>The user saves the file, and then can continue editing without validateEdit being called. + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit returns OK, the users edit is accepted and shows + up in the editor, and the file can be edited normally.</li> + <li>The user saves the file, and then can continue editing without + validateEdit being called.</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S2b: Validate edit canceled</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit is canceled, the users edit is not accepted and the file cannot be edited. -<li>The user should still be able to browse the contents of the file and trying to edit it again + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit is canceled, the users edit is not accepted and + the file cannot be edited.</li> + <li>The user should still be able to browse the contents of the + file and trying to edit it again</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S2b: Validate edit fails with an error</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit is canceled, the users edit is not accepted and the file cannot be edited. User should -be shown the error returned from the validateEdit provider. -<li>The user should still be able to browse the contents of the file and trying to edit it again + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit is canceled, the users edit is not accepted and + the file cannot be edited. User should be shown the error returned from + the validateEdit provider.</li> + <li>The user should still be able to browse the contents of the + file and trying to edit it again</li> </ol> + <!-- ------------------------------------------------------------------------------ --> -<h3>S3: Validate edit called on subsequent edits if file changes state</h3> + +<h3>S3: Validate edit called on subsequent edits if file changes +state</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit returns OK, the user's edit is accepted and the file can be edited normally. -<li>The user saves the file, and then can continue editing without validateEdit being called. -<li>The user saves the file and then checks in the file while the editor is still open. -<li>After the checkin completes the user continues editing the file. -<li>Validate edit should be called again. + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit returns OK, the user's edit is accepted and the + file can be edited normally.</li> + <li>The user saves the file, and then can continue editing without + validateEdit being called.</li> + <li>The user saves the file and then checks in the file while the + editor is still open.</li> + <li>After the checkin completes the user continues editing the + file.</li> + <li>Validate edit should be called again.</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S4: Validate edit not called after contents changed</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit returns OK, the user's edit is accepted and the file can be edited normally. -<li>The user saves the file, and then can continue editing without validateEdit being called. -<li>The user saves the file and keeps the editor opened. -<li>The user then un-checks out the file and new file contents are retrieved from the server. -<li>The new file contents are loaded into the editor and validateEdit is not called. -<li> + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit returns OK, the user's edit is accepted and the + file can be edited normally.</li> + <li>The user saves the file, and then can continue editing without + validateEdit being called.</li> + <li>The user saves the file and keeps the editor opened.</li> + <li>The user then un-checks out the file and new file contents are + retrieved from the server.</li> + <li>The new file contents are loaded into the editor and + validateEdit is not called.</li> + <li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S5: Validate edit changes file contents editor not-dirty</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit returns OK and brings in new content from the server. -<li>The new content is loaded automatically because the editor isn't dirty yet. + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit returns OK and brings in new content from the + server.</li> + <li>The new content is loaded automatically because the editor + isn't dirty yet.</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S6: Validate edit changes file contents editor dirty</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit returns OK and the file on disk doesn't change. -<li>The user continues editing the file and then checks it in. -<li>The editor remains open and dirty, the user continues editing. -<li>validateEdit is called because the file is now read-only and returns OK and brings in new content from the server. -<li>The editor detects the timestamp change and prompts about the conflict and provides -<a href="#reload_options">options</a> to the user. -<li>After the user selects his option and the user continues editing, the editor -will call validateEdit. + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit returns OK and the file on disk doesn't change.</li> + <li>The user continues editing the file and then checks it in.</li> + <li>The editor remains open and dirty, the user continues editing.</li> + + <li>validateEdit is called because the file is now read-only and + returns OK and brings in new content from the server.</li> + <li>The editor detects the timestamp change and prompts about the + conflict and provides <a href="#reload_options">options</a> to the + user.</li> + <li>After the user selects his option and the user continues + editing, the editor will call validateEdit.</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S7: Read-only editors refreshing on checkout</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Checkout the file that brings in new content from the server. -<li>The editor should update with the new content from the server. + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Checkout the file that brings in new content from the server.</li> + <li>The editor should update with the new content from the server.</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S8: validate called on editor save</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit returns OK and the file on disk doesn't change. -<li>The editor remains open and dirty, the user continues editing. -<li>The user checks-n the file and then closes the editor. -<li>The user is prompted to save the file, then validate edit is called, and -the file is checked-out then saved. + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit returns OK and the file on disk doesn't change.</li> + <li>The editor remains open and dirty, the user continues editing.</li> + <li>The user checks-n the file and then closes the editor.</li> + <li>The user is prompted to save the file, then validate edit is + called, and the file is checked-out then saved.</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S9: validate called on editor save with new contents</h3> <ol> -<li>Open a file that has been checked out as read-only from a repository provider. -<li>Start editing the file, validateEdit should be called. -<li>validateEdit returns OK and the file on disk doesn't change. -<li>The editor remains open and dirty, the user continues editing. -<li>The user checks-n the file and then closes the editor. -<li>The user is prompted to save the file, then validate edit is called, and -the file is checked-out then saved. + <li>Open a file that has been checked out as read-only from a + repository provider.</li> + <li>Start editing the file, validateEdit should be called.</li> + <li>validateEdit returns OK and the file on disk doesn't change.</li> + <li>The editor remains open and dirty, the user continues editing.</li> + <li>The user checks-n the file and then closes the editor.</li> + <li>The user is prompted to save the file, then validate edit is + called, and the file is checked-out then saved.</li> </ol> -</p> + <!-- <hr> @@ -178,4 +239,6 @@ Suggestion: +-----------+------------------+----------------------------------------+ </pre> --> -</body></html>
\ No newline at end of file + +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/validate_edit_refactoring00001.html b/tests/org.eclipse.team.tests.cvs.core/html/validate_edit_refactoring00001.html index e9b8167cd..5b16166e6 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/validate_edit_refactoring00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/validate_edit_refactoring00001.html @@ -1,39 +1,53 @@ -<html><head><title>Refactoring</title> +<html> +<head> +<title>Refactoring</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Refactoring</h2> +</head> +<h2>Refactoring</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/10 21:32:44 $</p><body> +Last Modified: $Date: 2004/06/14 20:44:55 $</p> +<body> -These tests are a sanity check that workbench, JDT and other tools refactorings behave -properly with respect to validate Edit. For a repository providers that supports -a pessimistic workflow, the following scenarios should result in the invocation -of the validate edit callback and should include a UI context which allows prompting. -<p> -The following scenarios are stated in terms of the Navigator view and JDT. Other tools -should translate them to a set of scenarios that make sense for the tool. +<p>These tests are a sanity check that workbench, JDT and other +tools refactorings behave properly with respect to validate Edit. For a +repository providers that supports a pessimistic workflow, the following +scenarios should result in the invocation of the validate edit callback +and should include a UI context which allows prompting. +<p>The following scenarios are stated in terms of the Navigator view +and JDT. Other tools should translate them to a set of scenarios that +make sense for the tool.</p> <!-- ------------------------------------------------------------------------------ --> + <h3>S1: Search and Replace</h3> <ol> -<li>Select one or more projects or folders and choose Search/File. -<li>Enter a string known to exist in multiple files and click Replace -<li>Enter a new string that differs from the one searched for. + <li>Select one or more projects or folders and choose Search/File.</li> + <li>Enter a string known to exist in multiple files and click + Replace</li> + <li>Enter a new string that differs from the one searched for.</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S2: Single file content modification</h3> <ol> -<li>Open a Java file that is read-only -<li>Perform any of the Java Source operations (e.g. toggle comment) -<li>Ensure that validate edit is invoked + <li>Open a Java file that is read-only</li> + <li>Perform any of the Java Source operations (e.g. toggle + comment)</li> + <li>Ensure that validate edit is invoked</li> </ol> + <!-- ------------------------------------------------------------------------------ --> + <h3>S3: Multiple file content modification</h3> <ol> -<li>Ensure all files in your workspace are read-only -<li>Perform a Java/Refactoring such as a method or class rename. -<li>Ensure that validate edit is invoked at most once per project involved. + <li>Ensure all files in your workspace are read-only</li> + <li>Perform a Java/Refactoring such as a method or class rename.</li> + <li>Ensure that validate edit is invoked at most once per project + involved.</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/watch_edit00001.html b/tests/org.eclipse.team.tests.cvs.core/html/watch_edit00001.html index 1569a9847..2085c094f 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/watch_edit00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/watch_edit00001.html @@ -1,11 +1,14 @@ -<html><head><title>Watch/Edit</title> +<html> +<head> +<title>Watch/Edit</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><h2>Watch/Edit</h2> +</head> +<body> +<h2>Watch/Edit</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p><body> - +Last Modified: $Date: 2004/06/01 15:23:56 $</p> Answer comes here. - -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/watch_edit_basic00001.html b/tests/org.eclipse.team.tests.cvs.core/html/watch_edit_basic00001.html index 2bd513ee5..316335459 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/watch_edit_basic00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/watch_edit_basic00001.html @@ -1,43 +1,68 @@ -<html><head><title>Basic scenarios</title> +<html> +<head> +<title>Basic scenarios</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Basic scenarios</h2> +</head> +<body> +<h2>Basic scenarios</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/02 16:07:33 $</p> +Last Modified: $Date: 2007/05/18 13:54:37 $</p> -<p>To setup, goto the CVS preference page and enable watch edit for all projects checked out from CVS. And then set the prompt option to always prompt.</p> +<p>To setup, goto the CVS preference page and enable watch edit for +all projects checked out from CVS. And then set the prompt option to +always prompt.</p> <ol> -<li>Check out a project from CVS and verify that the files are marked as read-only. -<li>Open a file and edit it. You should be prompted to edit it. Say yes. There should be a brief pause, then you can edit the file. -<li>Open another file and start editing it. You should be prompted to edit it. Say no. The file will remain read-only and you won't be allowed to edit it. -<li>Open a file and edit it. Say yes to the prompt. commit the file and edit again. You should be prompted a second time. -<li>Open a file and edit it. Say yes to the prompt. Replace the file from the repository and edit again. You should be prompted to edit again. -<li>Open a file and edit it. Un-plug your network connection. Say yes to the prompt to send a notification. There should be a pause, then the file should be editable. -<li>Checkout another copy of the project. Edit a file, then try to edit the same file in the another project copy. You should be notified that the file is currently being edited by someone else. + <li>Check out a project from CVS and verify that the files are + marked as read-only.</li> + <li>Open a file and edit it. You should be prompted to edit it. + Say yes. There should be a brief pause, then you can edit the file.</li> + <li>Open another file and start editing it. You should be prompted + to edit it. Say no. The file will remain read-only and you won't be + allowed to edit it.</li> + <li>Open a file and edit it. Say yes to the prompt. commit the + file and edit again. You should be prompted a second time.</li> + <li>Open a file and edit it. Say yes to the prompt. Replace the + file from the repository and edit again. You should be prompted to edit + again.</li> + <li>Open a file and edit it. Un-plug your network connection. Say + yes to the prompt to send a notification. There should be a pause, then + the file should be editable.</li> + <li>Checkout another copy of the project. Edit a file, then try to + edit the same file in the another project copy. You should be notified + that the file is currently being edited by someone else.</li> </ol> <p>Saving files - setup is the same as previous</p> <ol> -<li>Check out a project from CVS and verify that the files are marked as read-only. -<li>Open a file and edit it. You should be prompted to edit it. Say yes. There should be a brief pause, then you can edit the file. -<li>Edit the file but don't save it. -<li>Edit the file in a system editor outside of Eclipse, then in the resource navigator, commit the file. The resource's decorator will change. Ignore all the prompts -about saving the un-saved file. -<li>Return to the unsaved editor and try typing. You should be prompted to call validate edit again. + <li>Check out a project from CVS and verify that the files are + marked as read-only.</li> + <li>Open a file and edit it. You should be prompted to edit it. + Say yes. There should be a brief pause, then you can edit the file.</li> + <li>Edit the file but don't save it.</li> + <li>Edit the file in a system editor outside of Eclipse, then in + the resource navigator, commit the file. The resource's decorator will + change. Ignore all the prompts about saving the un-saved file.</li> + <li>Return to the unsaved editor and try typing. You should be + prompted to call validate edit again.</li> </ol> <p>validateEdit fails</p> <ol> -<li>Check out a project from CVS and verify that the files are marked as read-only. -<li>Disconnect from network so that the validateEdit would fail. -<li>Open a file and edit it. You should be prompted to edit it. Say yes. There should be a pause then the error should be reported in the -editor pane showing the exception that occurred. + <li>Check out a project from CVS and verify that the files are + marked as read-only.</li> + <li>Disconnect from network so that the validateEdit would fail.</li> + <li>Open a file and edit it. You should be prompted to edit it. + Say yes. There should be a pause then the error should be reported in + the editor pane showing the exception that occurred.</li> </ol> <p>Refactoring</p> <ol> -<li>Check out a project from CVS and verify that the files are marked as read-only. + <li>Check out a project from CVS and verify that the files are + marked as read-only.</li> </ol> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/watch_edit_editorsview00001.html b/tests/org.eclipse.team.tests.cvs.core/html/watch_edit_editorsview00001.html index 22b2bb003..1a2ac9e6d 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/watch_edit_editorsview00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/watch_edit_editorsview00001.html @@ -1,9 +1,14 @@ -<html><head><title>Editors View</title> +<html> +<head> +<title>Editors View</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Editors View</h2> +</head> +<body> +<h2>Editors View</h2> <p>Since: <br> -Last Modified: $Date: 2004/06/01 15:23:56 $</p> +Last Modified: $Date: 2004/06/01 20:28:37 $</p> <p>Test that you can properly show the editors on a file.</p> -</body></html>
\ No newline at end of file +</body> +</html>
\ No newline at end of file |