1.1 --- a/vcs.advanced/test/qa-functional/src/complete/pvcs_profile/AdditionalFeatures.java	Wed Sep 25 10:34:30 2002 +0000
     1.2 +++ b/vcs.advanced/test/qa-functional/src/complete/pvcs_profile/AdditionalFeatures.java	Wed Sep 25 10:49:43 2002 +0000
     1.3 @@ -42,8 +42,9 @@
     1.4      public static String VERSIONING_MENU = "Versioning";
     1.5      public static String MOUNT_MENU = VERSIONING_MENU + "|Mount Version Control|Generic VCS";
     1.6      public static String GET = "PVCS|Get";
     1.7 -    public static String DIFF = "PVCS|Diff";
     1.8      public static String PUT = "PVCS|Put";
     1.9 +    public static String DIFF = "Diff";
    1.10 +    public static String REFRESH_REVISIONS = "Refresh Revisions";
    1.11      public static String VERSIONING_EXPLORER = "Versioning Explorer";
    1.12      public static String ADD_TO_GROUP = "Include in VCS Group|<Default Group>";
    1.13      public static String VCS_GROUPS = "VCS Groups";
    1.14 @@ -146,7 +147,7 @@
    1.15          new Action(VERSIONING_MENU + "|" + VERSIONING_EXPLORER, VERSIONING_EXPLORER).perform(A_FileNode);
    1.16          VersioningFrameOperator versioningExplorer = new VersioningFrameOperator();
    1.17          filesystemNode = new Node(versioningExplorer.treeVersioningTreeView(), filesystem);
    1.18 -        new Action(null, DIFF).performPopup(new Node(filesystemNode, "A_File.java [Current]|1.0  Initial revision."));
    1.19 +        new Action(null, DIFF).perform(new Node(filesystemNode, "A_File.java [Current]|1.0  Initial revision."));
    1.20          versioningExplorer.close();
    1.21          EditorOperator editor = new EditorOperator("Diff: A_File.java");
    1.22          JEditorPaneOperator headRevision = new JEditorPaneOperator(editor, 0);
    1.23 @@ -185,11 +186,11 @@
    1.24          workingDirectory = workingPath.substring(0, workingPath.indexOf("AdditionalFeatures")) + "RepositoryCreation" + File.separator + "testCreateDatabase";
    1.25          String filesystem = "PVCS " + workingDirectory + File.separator + "Work";
    1.26          Node filesystemNode = new Node(new ExplorerOperator().repositoryTab().getRootNode(), filesystem);
    1.27 -        Node A_FileNode = new Node( filesystemNode, "A_File [Current]");
    1.28 -        new Action(VERSIONING_MENU + "|" + ADD_TO_GROUP, ADD_TO_GROUP).perform(A_FileNode);
    1.29 +        Node B_FileNode = new Node( filesystemNode, "test [Current]|B_File [Current]");
    1.30 +        new Action(VERSIONING_MENU + "|" + ADD_TO_GROUP, ADD_TO_GROUP).perform(B_FileNode);
    1.31          new Action(VERSIONING_MENU + "|" + VCS_GROUPS, null).performMenu();
    1.32          VCSGroupsFrameOperator groupsWindow = new VCSGroupsFrameOperator();
    1.33 -        new Node(groupsWindow.treeVCSGroupsTreeView(), "<Default Group>|A_File [Current]").select();
    1.34 +        new Node(groupsWindow.treeVCSGroupsTreeView(), "<Default Group>|B_File [Current]").select();
    1.35          System.out.println(". done !");
    1.36      }
    1.37  
    1.38 @@ -200,15 +201,15 @@
    1.39          System.out.print(".. Testing checking in from VCS group ..");
    1.40          String filesystem = "PVCS " + workingDirectory + File.separator + "Work";
    1.41          Node filesystemNode = new Node(new ExplorerOperator().repositoryTab().getRootNode(), filesystem);
    1.42 -        Node A_FileNode = new Node( filesystemNode, "A_File [Current]");
    1.43 -        new Action(VERSIONING_MENU + "|" + GET, GET).perform(A_FileNode);
    1.44 -        GetCommandOperator getCommand = new GetCommandOperator("A_File.java");
    1.45 +        Node B_FileNode = new Node( filesystemNode, "test [Current]|B_File [Current]");
    1.46 +        new Action(VERSIONING_MENU + "|" + GET, GET).perform(B_FileNode);
    1.47 +        GetCommandOperator getCommand = new GetCommandOperator("B_File.java");
    1.48          getCommand.checkLockForTheCurrentUser(true);
    1.49          getCommand.checkCheckOutWritableWorkfile(true);
    1.50          getCommand.ok();
    1.51          Thread.sleep(5000);
    1.52 -        BufferedWriter writer = new BufferedWriter(new FileWriter(workingDirectory + File.separator + "Work" + File.separator + "A_File.java"));
    1.53 -        writer.write("/** This is testing A_File.java file.\n */\n public class Testing_File {\n     int i = 1;\n }\n");
    1.54 +        BufferedWriter writer = new BufferedWriter(new FileWriter(workingDirectory + File.separator + "Work" + File.separator + "test" + File.separator + "B_File.java"));
    1.55 +        writer.write("/** This is testing B_File.java file.\n */\n public class B_File {\n     int i = 1;\n }\n");
    1.56          writer.flush();
    1.57          writer.close();
    1.58          new Action(VERSIONING_MENU + "|" + VCS_GROUPS, null).performMenu();
    1.59 @@ -218,15 +219,17 @@
    1.60          new TextFieldProperty(new PropertySheetOperator(), "Description").setValue("Checked in from VCS group.");
    1.61          defaultGroup.select();
    1.62          new Action(null, PUT).performPopup(defaultGroup);
    1.63 -        PutCommandOperator putCommand = new PutCommandOperator("A_File.java");
    1.64 +        PutCommandOperator putCommand = new PutCommandOperator("B_File.java");
    1.65          if (!putCommand.getChangeDescription().equals("Checked in from VCS group.\n"))
    1.66              captureScreen("Error: Group description was not propagated into checkin dialog.");
    1.67          putCommand.ok();
    1.68          MainWindowOperator.getDefault().waitStatusText("Command Refresh finished.");
    1.69 -        new Action(VERSIONING_MENU + "|" + VERSIONING_EXPLORER, VERSIONING_EXPLORER).perform(A_FileNode);
    1.70 +        new Action(VERSIONING_MENU + "|" + VERSIONING_EXPLORER, VERSIONING_EXPLORER).perform(B_FileNode);
    1.71          VersioningFrameOperator versioningExplorer = new VersioningFrameOperator();
    1.72          filesystemNode = new Node(versioningExplorer.treeVersioningTreeView(), filesystem);
    1.73 -        new Node(filesystemNode, "A_File.java [Current]|1.2  Checked in from VCS group.").select();
    1.74 +        new Action(null, REFRESH_REVISIONS).perform(new Node(filesystemNode, "test [Current]|B_File.java [Current]"));
    1.75 +        MainWindowOperator.getDefault().waitStatusText("Command REVISION_LIST finished.");
    1.76 +        new Node(filesystemNode, "test [Current]|B_File.java [Current]|1.1  Checked in from VCS group.").select();
    1.77          versioningExplorer.close();
    1.78          System.out.println(". done !");
    1.79      }
    1.80 @@ -241,8 +244,8 @@
    1.81          groupsWindow.verifyVCSGroup("<Default Group>");
    1.82          GroupVerificationOperator verifyDialog = new GroupVerificationOperator();
    1.83          verifyDialog.checkRemoveFilesFromGroup(true);
    1.84 -        if (!verifyDialog.tabNotChangedFiles().getModel().getValueAt(0, 0).equals("A_File"))
    1.85 -            captureScreen("Error: A_File [Current] was not taken for correction.");
    1.86 +        if (!verifyDialog.tabNotChangedFiles().getModel().getValueAt(0, 0).equals("B_File"))
    1.87 +            captureScreen("Error: B_File [Current] was not taken for correction.");
    1.88          verifyDialog.correctGroup();
    1.89          Thread.sleep(2000);
    1.90          if (new Node(groupsWindow.treeVCSGroupsTreeView(), "<Default Group>").getChildren().length != 0)