Section 1: General CVS Tests

CVS Repositories View

Adding and Discarding Locations

These test require an existing repository which contains projects.
  1. Add a location to the view.
  2. Ensure that invalid location information is handled properly in the New Location Wizard.
  3. View location properties page and ensure that information is correct and can be changed.
  4. Also change property values when local projects are shared with the location and ensure the project's sharing information is changed when the location's properties are changed.
  5. 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.

Project Checkout

These test require an existing repository which contains projects, at least one of which does not contain a .project file. Ensure that repeating each operation results in the proper overwrite prompting.
  1. Perform "Checkout as Project" on a single project. Ensure that repeating results in overwrite prompt.
  2. Perform "Checkout as Project" on multiple projects.
  3. Perform "Checkout as..." on a single project (that contains a .project file) and enter custom name and/or custom location.
  4. Perform "Checkout 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.
  5. Perform "Checkout as..." on multipe projects and enter a custom parent location.

Browsing Tags

These test require an existing repository which contains projects that have been tagged with both version and branch tags.

Refresh Branches and Versions

  1. Select a repository location and perform "Refresh Branches and Versions...".
  2. Select one or more projects that contain a .project file and have been tagged with branch and version tags and click finish.
  3. Expand the respository entry to view ...

Configure Branches and Versions

  1. Select a project in the repositories view and perform "Configure Branches and Versions...".
  2. Select some branch and version tags to be remembered.
  3. Expand the respository entry to view ...

Working with modules

These tests require a CVSROOT/modules file on the server that contains valid module definitions.
  1. Switch the Repositories View and ensure that the modules are displayed properly.
  2. Perform "Checkout as Module" and ensure that the module is checkout out properly. Also ensure that repeating results in overwrite prompt.
  3. Perform a "Configure Branches and Versions" on the module, set the autorefresh file and add some tags. Ensure that the module now appears properly in association with those tags.

Project Sharing

Project sharing and disconnecting

  1. Sharing with no CVS folders against existing project
  2. Sharing with CVS folders
  3. Sharing new project with no CVS folders
  4. Disconnect: keeping and deleting CVS folders, reconnecting (as above)

Project sets

  1. Create one, delete projects, load set and ensure got projects back
  2. Test against HEAD, project on branch/version.

CVS workflow

Common workflows

To perform the tests properly, check out the same remote project into two local projects.
  1. Commit and Update with incomming, outgoing and conflicting changes and ensure proper behavior.
  2. Update/commit with very large files (> 8 meg)
  3. Replace with (latest, base, branch, version, revision)
  4. Compare with (latest, base, branch, version, revision)
  5. Ensure you are prompted for unsaved changes before performing a CVS action
  6. Tag as Version and ensure that remote is tagged properly.
  7. Tag as Version with dirty local resources and ensure proper prompting.
  8. Change ASCII/Binary Property on projects and resources and ensure proper behavior.

Ignoring resources

  1. Ignoring resources
  2. “Add to .cvsignore”
  3. Add to global ignore list, ensure its now ignored

Global Actions

Test the following CVS global actions in the CVS Repository Exploring perspective.
  1. Synchronize All
  2. New Repository Location

Decorators

  1. Change all the options, apply, see them redraw correctly
  2. Add/remove items, ensure dirty markers update
  3. Add to version control and see decorator change
  4. Performance with large trees expanded
  5. Collapse large tree, exit workspace, restart (should not be as expensive as if tree had been left expanded)

Patching

Creating patches and then comparing with them. In particular,
  1. added files
  2. deleted files
  3. added or deleted folders with added or deleted files in them
  4. binary files

Watch/Edit

  1. Turn on watch/edit in preferences (Team/CVS/Watch/Edit)
  2. Turn on the CVS decorators
  3. Check out a project and ensure all files are read-only
  4. Open a file in an editor and start typing. Ensure that decorator an file changes and file is no longer read-only.
  5. Perform a Team/Show CVS Editors on the file and/or project.
  6. Perform a Team/Unedit on the file to ensure that file is returned to base contents and is read-only. (or perform a Team/Commit and ensure the file is returned to being read-only).

Working with Modules

These test require valid moduel definitions in the CVSROOT/modules file of the repository
  1. Checkout a module and ensure success.
  2. Perform other CVS tests on the local project as if it were a regular project.

Misc

  1. Mixing tags within a project.
  2. Properties pages for projects, folders and files.
  3. CVS Console: ensure written to
  4. Check canceling everywhere there's a progress monitor
  5. Does it cancel in reasonable time?
  6. Is the workspace in an ok state after?
  7. Compression switches, ensure data transfered ok (commit, update)

Section 2: CVS Synchronize View

Change Type Action Result
Incoming File Change Update Remote contents become local. Try with both Text and Binary files.
Incoming File Change Override and Commit Only in Both mode. Prompt for release comment. Cancel aborts, OK commits local file to server.
Incoming File Addition Update Remote contents become local. Try with both Text and Binary files.
Incoming File Addition Override and Commit Only in Both mode. Prompt for release comment. Cancel aborts, OK commits deletion to server.
Incoming File Deletion Update Local file is deleted.
Incoming File Deletion Override and Commit Only in Both mode. Prompt for release comment. Cancel aborts, OK commits local file to server.
Outgoing File Change Commit Prompt for release comment. Cancel aborts, OK commits local file to server.
Outgoing File Change Override and Update Only in Both mode. Remote contents become local. Try with both Text and Binary files.
Outgoing File Addition Add to Version Control Adds the file to version control. The icon should change in the sync view, and Commit should now be enabled.
Outgoing File Addition Add to .cvsignore 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.
Outgoing File Addition Commit Commit is only enabled on an outgoing addition if it has first been added to version control. Prompt for release comment. Cancel aborts, OK commits local file to server.
Outgoing File Addition Override and Update Only in Both mode. Local file is deleted.
Outgoing File Deletion Commit Prompt for release comment. Cancel aborts, OK commits deletion to server.
Outgoing File Deletion Override and Update Only in Both mode. File is re-created, remote contents become local.
Conflicting File Change Override and Commit Prompt for release comment. Cancel aborts, OK commits local file to server. Applies to both auto-mergeable and non-mergeable conflicts.
Auto-mergeable Conflicting File Change Override and Update Auto-mergeable conflicts have a two-way red/green arrow. Dialog prompts user to either auto-merge or replace. If user chooses auto-merge, then remote changes are merged in with local changes. File should still be dirty, local changes should still be present, CVS markup should not be present, and no .# files should have been created. If user chooses replace, 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. If the user chooses cancel nothing happens.
Non-mergeable Conflicting File Change Override and Update 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.
Conflicting File Addition Add to Version Control Adds the file to version control. The icon should change in the sync view, and Override and Commit should now be enabled.
Conflicting File Addition Override and Commit Override and Commit is only enabled on an outgoing addition if it has first been added to version control. Prompt to warn of conflicting changes. If OK, prompt for release comment. Cancel aborts either dialog. OK commits local file to server.
Conflicting File Addition Override and Update Remote contents become local.

Variations

Container Selection

Normally, selecting a folder is the same as selecting all of the individual files underneath it. (The exception to this is if the folder itself is changed, such as a conflicting addition). Performing any of the above operations on a folder should behave as if the files underneath it were selected.

Note that if an action is not specified for a change type, it does not apply to that change type. This is important in container selection.

For example: Commit does not apply to conflicting changes. If you select a folder with an Outgoing Change and a Conflicting Change in it, Commit will apply to the Outgoing Change but not to the Conflicting Change.

Multi-Selection

If multiple resources are selected, an action is enabled if it applies to any one or more of the selected resources. Choosing that action will apply the action only to those resources for which it is applicable.

For example: Commit does not apply to conflicting changes. Selecting an Outgoing Change and a Conflicting Change will result in Commit being enabled. Choosing Commit will apply to the Outgoing Change but not to the Conflicting Change.

Multi-Selection and Container Selection may be used in any combination with predictable results.

Specific Scenaria

Making Manual Changes

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; you should get a prompt telling you to Mark as Merged when finished. Choose Mark as Merged in the popup menu of the tree. The file should change to an outgoing change. Commit the outgoing change.

Merging Conflicts

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.

Removing from View

Choose Remove from View. Selected nodes should disappear. Refresh the view. The nodes should reappear.

Synchronize Outgoing Changes

If you choose Synchronize Outgoing Changes from the navigator, the sync view should be populated with only the Outgoing Changes and Conflicts . This operation should be significantly faster in many cases. In this case, ensure that Refresh does not cause Incoming Changes to appear.

Working with Branches

Try any and all of the above, but use a branch instead of HEAD. Behaviour should be identical. The sync view decorator should show you the name of the branch.

Using Mixed Tags

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.

Section 3: Migration from 2.0 to 2.1

The below tests require a workspace created using 2.0 which contains projects checked out from a CVS repository.

Migrating a workspace project created using 2.0 to 2.1

  1. Start Eclipse 2.1 on top of a workspace from 2.0
  2. Select a project that was shared with a CVS repository and chose Team/Share Project…
  3. Select the Repository location to share with or enter it if it does not appear in the list.
  4. Upon finish, the user will be prompted to select either HEAD or the branch to compare against.
  5. The Synchronize view will then be opened and all files will appear as incoming, outgoing or conflicting additions.
  6. To see the real conflicts, enable “Compare File Contents” available from the drop down menu in the title bar of the Synchronize View.
  7. Resolve the real incoming, outgoing additions  and conflicts as appropriate (see sync view test plan for a description of sync state resolution)
  8. When all conflicts are resolved, disable “Compare File Contents” and perform an “Override and Update” on the remaining conflicting additions to update the sync info of the local resources.
  9. Ensure local copy contains the proper contents (can use Compare With/Latest from Repository)

Section 4: Branching and Merging

Main branching scenario

Here's the main sequence of steps performed over the life cycle of a simple branch.
  1. Load or create a shared project with shared content
  2. Perform a Team/Branch...
  3. Ensure that the tag on the local resources has been updated (either using the CVS decorators or resource properties)
  4. Make some changes to local resources and commit them (working in a branch is similar to working in HEAD. See the Synchronize test plan for detaits).
  5. Load HEAD
  6. Optionaly, make some changes to HEAD (may or may not be committed)
  7. Perform a Team/Merge... to merge the branch with HEAD. Merging is similar to synchronizing but only incoming and conflicting changes are shown. See the Synchronize test plan for detaits

Variations

Comparing branch, root version and HEAD

After any of the above steps that modify the local content or the remote content, the success of the operation can ne validated by comparing the local workspace copy with either HEAD, the branch or the root version specified when creating the branch.

Branch with local changes

Before branching, make some local changes but do not commit them. Changes can include additions and deletions. After branches ensure that the changes are still there. On merging ensure that any created or deleted resources appear properly in the merge editor.

Don't start working in the branch

When the branch is created, do not start working in the branch. Ensure that the workspace was not modified but that the branch and root version exists remotely (using Comapre With/Branch or Version...)

Branch on a folder or file

Branching can also be performed on a folder or file.

Merge from Head to a branch

Make some changes to a branch and to HEAD. Merge the changes from HEAD into the branch before merging the branch with HEAD.