Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Valenta2005-05-10 16:16:42 +0000
committerMichael Valenta2005-05-10 16:16:42 +0000
commit11ad0b3543066b1d8d97c8377c76f8105ae4d87a (patch)
treefca350d822652f07c128d89da10c5ef018306327 /tests
parent01f222cd85836ac9cb282d3a594d824553459044 (diff)
downloadeclipse.platform.team-11ad0b3543066b1d8d97c8377c76f8105ae4d87a.tar.gz
eclipse.platform.team-11ad0b3543066b1d8d97c8377c76f8105ae4d87a.tar.xz
eclipse.platform.team-11ad0b3543066b1d8d97c8377c76f8105ae4d87a.zip
Updating test plan
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00022.html9
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00037.html12
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00046.html5
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html46
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/keys00001.html12
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/toc.xml2
6 files changed, 55 insertions, 31 deletions
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 5544d1aad..a53fed91a 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/00022.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00022.html
@@ -3,8 +3,8 @@
<meta NAME="keywords" content="">
<meta NAME="since" content="">
</head><body><h2>Performing a Merge</h2>
-<p>Since: 3.1 M4<br>
-Last Modified: $Date: 2004/12/17 16:10:10 $</p>
+<p>Since: 3.1<br>
+Last Modified: $Date: 2004/06/01 19:14:48 $</p>
<h3>Scenario 1: One Time Merge</h3>
@@ -28,6 +28,11 @@ 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 intro the workspace. Try both the
+case with a base tag and without it.
<h3>Removing a Merge</h3>
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 1475ad87b..c3164ec59 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/00037.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00037.html
@@ -3,12 +3,16 @@
<meta NAME="keywords" content="">
<meta NAME="since" content="">
</head><body><h2>Customizations</h2>
-<p>Since: 2.0 <br>
-Last Modified: $Date: 2004/06/02 16:07:33 $</p>
+<p>Since: 3.1 <br>
+Last Modified: $Date: 2004/06/02 18:01:36 $</p>
-<p>You should be able to customize the label decorations via the preference page. The customizations will
+<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
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 e87baa02c..12de174a8 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/00046.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00046.html
@@ -4,7 +4,7 @@
<meta NAME="since" content="">
</head><body><h2>With another branch of version</h2>
<p>Since: <br>
-Last Modified: $Date: 2004/03/09 20:51:17 $</p>
+Last Modified: $Date: 2004/06/01 15:23:56 $</p>
<p>Check the following for all cases of replace:
<ul>
@@ -13,4 +13,7 @@ Last Modified: $Date: 2004/03/09 20:51:17 $</p>
<li>if a branch is loaded, that you can commit to it.
</ul>
+<p>
+Also ensure that the tag filtering in the dialog works properly.
+
</body></html> \ No newline at end of file
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html b/tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html
index cd37204bb..3bf598ff2 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html
@@ -2,45 +2,43 @@
<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 Sets Layout</h2>
+</head><body><h2>Change Sets Layout</h2>
<p>Since: 3.1 M2<br>
-Last Modified: $Date: 2004/09/21 18:59:41 $</p>
+Last Modified: $Date: 2004/09/21 20:19:25 $</p>
-<h3>Commit Sets for incoming changes</h3>
+<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. Perferably
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 Commit Sets</h4>
+<h4>Enabling/disabling Change Sets</h4>
<ol>
-<li>Synchronize the projects with HEAD, enable commit set mode and
-ensure that the files appear in the proper commit sets. Also ensure that
+<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 Commit Sets. The same nodes should remain expanded and selected.
+disable Change Sets. The same nodes should remain expanded and selected.
<p>
-<li>With the same nodes selected and expanded, re-enable commit sets.
+<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 commit sets. The selection
+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 apears in multiple sets, it will no longer be expanded).
</ol>
You should also confirm that markers and conflicts are properly propogated to
parent nodes.
-<h4>Commit Set Layouts</h4>
+<h4>Change Set Layouts</h4>
Now try the various sub-layouts (Flat, Tree and Compressed) and ensure that switching
is performant and that the resulting tree nodes are correct.
-<h4>Commit Set Modes</h4>
+<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 seleciton is maintained.
-<li>Add a conflict and repeat the above, ensuring the results are correct.
-Note that a conflict will appear twice in each mode, once within an incoming
-commit set and once within the outgoing commit set (more on this below).
+<li>Only Incomign and Outgoing mode shw change sets.
</ol>
<h4>Updating</h4>
@@ -49,22 +47,22 @@ that are incoming changes.
Ensure that the updated files are removed from the view and that
other expanded nodes remain expanded.
-<h3>Outgoing Commit Sets</h3>
+<h3>Outgoing Sets</h3>
-The following aspects of outgoing commit sets should be tested.
+The following aspects of outgoing change sets should be tested.
<ol>
-<li>Modified files can be added to a new or existing commit set. Ensure that
+<li>Modified files can be added to a new or existing change set. Ensure that
when they are added, he file remains visible in the Sync view.
-<li>Files in a commit set can be transfered to another commit set
-<li>If there is a default commit set, any modified file that is not already
-part of a commit set is placed in the default set. Files that are already
+<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 commit set can be changed.
-<li>Layout and modes changes work properly for outgoing commit sets in the
+<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>Commiting one or more files in a commit set will result in a commit
+<li>ing one or more files in a change set will result in a commit
dialog that is primed with the comment from the set.
-<li>Commit sets (including which is the default), are preserved accross restarts.
+<li>change sets (including which is the default), are preserved accross restarts.
</ol>
</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
new file mode 100644
index 000000000..a223426b7
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/keys00001.html
@@ -0,0 +1,12 @@
+<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>
+<p>Since: 3.1<br>
+Last Modified: $Date: 2005/05/05 20:20:14 $</p>
+
+<p>Activate the CVS menu and assign keybindings to the various CVS commands.
+Ensure that they work as expected.
+
+</body></html> \ No newline at end of file
diff --git a/tests/org.eclipse.team.tests.cvs.core/toc.xml b/tests/org.eclipse.team.tests.cvs.core/toc.xml
index 8904b16de..96b0f78d6 100644
--- a/tests/org.eclipse.team.tests.cvs.core/toc.xml
+++ b/tests/org.eclipse.team.tests.cvs.core/toc.xml
@@ -140,6 +140,8 @@
</topic>
<topic label="EXT" href="html/ext_connection_method00001.html">
</topic>
+ <topic label="Key Bindings" href="html/keys00001.html">
+ </topic>
</topic>
<topic label="Validate Edit" href="html/validate_edit00001.html">
<topic label="Editing Files" href="html/validate_edit_editing_files00001.html">

Back to the top