[hg] main-silver: SVN Functional test - windows optimalization

[Adam Senk < >]

changeset 7d4994f4e254 in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/7d4994f4e254
description:
        SVN Functional test - windows optimalization

diffstat:

 subversion/nbproject/project.properties                                      
                                   |   1 -
 
subversion/test/qa-functional/src/org/netbeans/test/subversion/main/branches/CopyTest.java
                      |  33 +++-----
 
subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/CreateProjectVersionedDirTest.java
 |  27 +++----
 
subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/ImportUITest.java
                  |   6 +
 
subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/CommitDataTest.java
                  |   1 +
 
subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/IgnoreTest.java
                      |   2 +
 
subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/DeleteTest.java
                      |  12 +-
 
subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/RefactoringTest.java
                 |  35 +++++----
 8 files changed, 58 insertions(+), 59 deletions(-)

diffs (337 lines):

diff --git a/subversion/nbproject/project.properties 
b/subversion/nbproject/project.properties
--- a/subversion/nbproject/project.properties
+++ b/subversion/nbproject/project.properties
@@ -19,7 +19,6 @@
 
org/netbeans/test/subversion/main/branches/CopyTest.class,org/netbeans/test/subversion/main/branches/CopyUiTest.class,org/netbeans/test/subversion/main/branches/MergeUiTest.class,org/netbeans/test/subversion/main/branches/RevertUiTest.class,org/netbeans/test/subversion/main/branches/SwitchUiTest,\
 
org/netbeans/test/subversion/main/checkout/CheckoutContentTest.class,org/netbeans/test/subversion/main/checkout/CheckoutUITest.class,org/netbeans/test/subversion/main/checkout/CreateProjectVersionedDirTest.class,org/netbeans/test/subversion/main/checkout/ImportUITest.class,org/netbeans/test/subversion/main/checkout/ProxySettingsUITest.class,\
 
org/netbeans/test/subversion/main/commit/CommitDataTest.class,org/netbeans/test/subversion/main/commit/CommitUiTest.class,org/netbeans/test/subversion/main/commit/IgnoreTest.class,\
-org/netbeans/test/subversion/main/delete/DeleteTest.class,org/netbeans/test/subversion/main/delete/FilesViewDoubleRefTest.class,org/netbeans/test/subversion/main/delete/FilesViewRefTest.class,org/netbeans/test/subversion/main/delete/Refactoring.class,\
 
org/netbeans/test/subversion/main/diff/DiffTest.class,org/netbeans/test/subversion/main/diff/ExportDiffPatchTest.class,\
 
org/netbeans/test/subversion/main/properties/SvnPropertiesTest.class,org/netbeans/test/subversion/main/relocate/RelocateTest.class
 
diff --git 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/branches/CopyTest.java
 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/branches/CopyTest.java
--- 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/branches/CopyTest.java
+++ 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/branches/CopyTest.java
@@ -6,7 +6,6 @@
  * To change this template, choose Tools | Template Manager
  * and open the template in the editor.
  */
-
 package org.netbeans.test.subversion.main.branches;
 
 import java.io.File;
@@ -50,7 +49,9 @@
     Operator.DefaultStringComparator oldOperator;
     static Logger log;
     
-    /** Creates a new instance of CopyTest */
+    /**
+     * Creates a new instance of CopyTest
+     */
     public CopyTest(String name) {
         super(name);
     }
@@ -72,21 +73,18 @@
          return NbModuleSuite.create(
                  NbModuleSuite.createConfiguration(CopyTest.class).addTest(
                     "testCreateNewCopySwitch",
-                    "testCreateNewCopy"
-                 )
-                 .enableModules(".*")
-                 .clusters(".*")
-        );
+                "testCreateNewCopy").enableModules(".*").clusters(".*"));
      }
     
     public void testCreateNewCopySwitch() throws Exception {
-        try {
+
             MessageHandler mh = new MessageHandler("Checking out");
             log.addHandler(mh);
             
             TestKit.closeProject(PROJECT_NAME);
-            if (TestKit.getOsName().indexOf("Mac") > -1)
+        if (TestKit.getOsName().indexOf("Mac") > -1) {
                 NewProjectWizardOperator.invoke().close();
+        }
 
             TestKit.showStatusLabels();
             
@@ -154,20 +152,17 @@
             assertEquals("Wrong annotation of node!!!", "[ release01]", 
status);
             stream.flush();
             stream.close();
-        } catch (Exception e) {
-            throw new Exception("Test failed: " + e);
-        } finally {
+
             TestKit.closeProject(PROJECT_NAME);
-        }
+
     }
     
     public void testCreateNewCopy() throws Exception {
         
//JemmyProperties.setCurrentTimeout("ComponentOperator.WaitComponentTimeout", 
30000);
         
//JemmyProperties.setCurrentTimeout("DialogWaiter.WaitDialogTimeout", 30000);
-        try {
+
             MessageHandler mh = new MessageHandler("Checking out");
             log.addHandler(mh);
-
             TestKit.closeProject(PROJECT_NAME);
             TestKit.showStatusLabels();
             
@@ -254,7 +249,7 @@
             nodeFile = new Node(new SourcePackagesNode(PROJECT_NAME), 
"javaapp" + "|Main.java");
             nodeIDE = (org.openide.nodes.Node) nodeFile.getOpenideNode();
             //String color = TestKit.getColor(nodeIDE.getHtmlDisplayName());
-            new EventTool().waitNoEvent(1000);
+        new EventTool().waitNoEvent(10000);
             //String color = TestKit.getColor(nodeIDE.getHtmlDisplayName());
             HtmlName=nodeIDE.getHtmlDisplayName();
             new EventTool().waitNoEvent(1000);
@@ -305,10 +300,8 @@
             
             stream.flush();
             stream.close();
-        } catch (Exception e) {
-            throw new Exception("Test failed: " + e);
-        } finally {
+
             TestKit.closeProject(PROJECT_NAME);
+
         }
     }
-}
diff --git 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/CreateProjectVersionedDirTest.java
 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/CreateProjectVersionedDirTest.java
--- 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/CreateProjectVersionedDirTest.java
+++ 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/CreateProjectVersionedDirTest.java
@@ -6,7 +6,6 @@
  * To change this template, choose Tools | Template Manager
  * and open the template in the editor.
  */
-
 package org.netbeans.test.subversion.main.checkout;
 
 import java.io.File;
@@ -44,7 +43,9 @@
     Operator.DefaultStringComparator oldOperator;
     static Logger log;
     
-    /** Creates a new instance of CreateProjectVersionedDirTest */
+    /**
+     * Creates a new instance of CreateProjectVersionedDirTest
+     */
     public CreateProjectVersionedDirTest(String name) {
         super(name);
     }
@@ -65,20 +66,17 @@
     public static Test suite() {
          return NbModuleSuite.create(
                  
NbModuleSuite.createConfiguration(CreateProjectVersionedDirTest.class).addTest(
-                    "testCreateNewProject"
-                 )
-                 .enableModules(".*")
-                 .clusters(".*")
-        );
+                "testCreateNewProject").enableModules(".*").clusters(".*"));
      }
     
     public void testCreateNewProject() throws Exception {
-        try {
+
             MessageHandler mh = new MessageHandler("Checking out");
             log.addHandler(mh);
             TestKit.closeProject(PROJECT_NAME);
-            if (TestKit.getOsName().indexOf("Mac") > -1)
+        if (TestKit.getOsName().indexOf("Mac") > -1) {
                 new NewProjectWizardOperator().invoke().close();
+        }
             
             comOperator = new Operator.DefaultStringComparator(true, true);
             oldOperator = (DefaultStringComparator) 
Operator.getDefaultStringComparator();
@@ -115,14 +113,13 @@
             npwo.selectProject("Java Application");
             npwo.next();
             NewJavaProjectNameLocationStepOperator npnlso = new 
NewJavaProjectNameLocationStepOperator();
-            new JTextFieldOperator(npnlso, 1).setText(work.getAbsolutePath() 
+ File.separator + PROJECT_NAME + File.separator+ "src"); // NOI18N
-            new JTextFieldOperator(npnlso, 0).setText(PROJECT_NAME); // 
NOI18N
+        new JTextFieldOperator(npnlso, 1).setText(work.getAbsolutePath() + 
File.separator + PROJECT_NAME+"2" + File.separator + "src"); // NOI18N
+        new JTextFieldOperator(npnlso, 0).setText(PROJECT_NAME+"2"); // 
NOI18N
             new NewProjectWizardOperator().finish();
             TestKit.waitForScanFinishedSimple();
-        } catch (Exception e) {
-            throw new Exception("Test failed: " + e);
-        } finally {
+
             TestKit.closeProject(PROJECT_NAME);
+        TestKit.closeProject(PROJECT_NAME+"2");
+
         }    
     }
-}
diff --git 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/ImportUITest.java
 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/ImportUITest.java
--- 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/ImportUITest.java
+++ 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/checkout/ImportUITest.java
@@ -268,7 +268,13 @@
             for (int i = 0; i < actual.length; i++) {
                 actual[i] = model.getValueAt(i, 1).toString();
             }
+            if (TestKit.getOsName().indexOf("Win") > -1) {
+            assertEquals("Incorrect count of records for addition!!!", 11, 
model.getRowCount());
+            }else{
             assertEquals("Incorrect count of records for addition!!!", 10, 
model.getRowCount());
+              
+            }
+                
          //   assertEquals("Some records were omitted from addition", 10, 
TestKit.compareThem(expected, actual, false));
             //try to change commit actions
             cso.selectCommitAction("project.xml", "Add As Text");
diff --git 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/CommitDataTest.java
 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/CommitDataTest.java
--- 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/CommitDataTest.java
+++ 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/CommitDataTest.java
@@ -383,6 +383,7 @@
             TestKit.waitText(mh);
             
             Node nodeTest;
+            new EventTool().waitNoEvent(5000);
             for (int i = 0; i < expected.length; i++) {
                 nodeTest = new Node(new SourcePackagesNode(PROJECT_NAME), 
"javaapp|" + expected[i]);
                 nodeIDE = (org.openide.nodes.Node) nodeTest.getOpenideNode();
diff --git 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/IgnoreTest.java
 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/IgnoreTest.java
--- 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/IgnoreTest.java
+++ 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/commit/IgnoreTest.java
@@ -19,6 +19,7 @@
 import org.netbeans.jellytools.NbDialogOperator;
 import org.netbeans.jellytools.NewProjectWizardOperator;
 import org.netbeans.jellytools.nodes.Node;
+import org.netbeans.jemmy.EventTool;
 import org.netbeans.jemmy.JemmyException;
 import org.netbeans.jemmy.TimeoutExpiredException;
 import org.netbeans.jemmy.operators.JButtonOperator;
@@ -138,6 +139,7 @@
             
             node = new Node(new SourcePackagesNode(PROJECT_NAME), 
"javaapp|NewClass");
             org.openide.nodes.Node nodeIDE = (org.openide.nodes.Node) 
node.getOpenideNode();
+            new EventTool().waitNoEvent(5000);
             String color = TestKit.getColor(nodeIDE.getHtmlDisplayName());
             String status = TestKit.getStatus(nodeIDE.getHtmlDisplayName());
             assertEquals("Wrong color of node - file color should be 
ignored!!!", TestKit.IGNORED_COLOR, color);
diff --git 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/DeleteTest.java
 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/DeleteTest.java
--- 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/DeleteTest.java
+++ 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/DeleteTest.java
@@ -18,6 +18,7 @@
 import org.netbeans.jellytools.NbDialogOperator;
 import org.netbeans.jellytools.NewProjectWizardOperator;
 import org.netbeans.jellytools.nodes.Node;
+import org.netbeans.jemmy.EventTool;
 import org.netbeans.jemmy.operators.JButtonOperator;
 import org.netbeans.jemmy.operators.JTableOperator;
 import org.netbeans.jemmy.operators.Operator;
@@ -79,7 +80,7 @@
      }
     
     public void testDeleteRevert() throws Exception {
-        try {
+       
             MessageHandler mh = new MessageHandler("Checking out");
             log.addHandler(mh);
 
@@ -130,8 +131,9 @@
             node.performPopupAction("Subversion|Show Changes");
 
             TestKit.waitText(mh);
-
+            new EventTool().waitNoEvent(5000);
             node.performPopupActionNoBlock("Delete");
+            new EventTool().waitNoEvent(5000);
             NbDialogOperator dialog = new NbDialogOperator("Delete");
             JButtonOperator btn = new JButtonOperator(dialog, "OK");
             btn.push();
@@ -188,11 +190,9 @@
                 e = ex;
             }
             assertNull("Reverted file should be visible!!!", e);
-        } catch (Exception e) {
-            throw new Exception("Test failed: " + e);
-        } finally {
+        
             TestKit.closeProject(PROJECT_NAME);
-        }    
+         
     }
     
     public void testDeleteCommit() throws Exception {
diff --git 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/RefactoringTest.java
 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/RefactoringTest.java
--- 
a/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/RefactoringTest.java
+++ 
b/subversion/test/qa-functional/src/org/netbeans/test/subversion/main/delete/RefactoringTest.java
@@ -51,7 +51,9 @@
     Operator.DefaultStringComparator oldOperator;
     static Logger log;
 
-    /** Creates a new instance of RefactoringTest */
+    /**
+     * Creates a new instance of RefactoringTest
+     */
     public RefactoringTest(String name) {
         super(name);
     }
@@ -76,13 +78,14 @@
     }
 
     public void testRefactoring() throws Exception {
-        try {
+
             MessageHandler mh = new MessageHandler("Checking out");
             log.addHandler(mh);
 
             TestKit.closeProject(PROJECT_NAME);
-            if (TestKit.getOsName().indexOf("Mac") > -1)
+        if (TestKit.getOsName().indexOf("Mac") > -1) {
                 new NewProjectWizardOperator().invoke().close();
+        }
            
             JTableOperator table;
             stream = new PrintStream(new File(getWorkDir(), getName() + 
".log"));
@@ -130,8 +133,12 @@
             node = new Node(new SourcePackagesNode(PROJECT_NAME), "javaapp");
             node.select();
             node.performPopupActionNoBlock("Refactor|Rename...");
-            NbDialogOperator dialog = new NbDialogOperator("Rename");
-            new EventTool().waitNoEvent(2000);
+        NbDialogOperator dialog;
+        new EventTool().waitNoEvent(5000);
+
+        dialog = new NbDialogOperator("Rename");
+
+        new EventTool().waitNoEvent(5000);
             JTextFieldOperator txt = new JTextFieldOperator(dialog);
             txt.setText("javaapp_ren");
             JButtonOperator btn = new JButtonOperator(dialog, "Refactor");
@@ -199,20 +206,14 @@
             assertNotNull("Unexpected behavior - Versioning view should be 
empty!!!", e);
 
             /*
-            e = null;
-            try {
-                node = new Node(new SourcePackagesNode(PROJECT_NAME), 
"javaapp|Main.java");
-                node.select();
-            } catch (Exception ex) {
-                e = ex;
-            }
-            assertNotNull("Unexpected behavior - File shouldn't be in 
explorer!!!", e);
+         * e = null; try { node = new Node(new 
SourcePackagesNode(PROJECT_NAME),
+         * "javaapp|Main.java"); node.select(); } catch (Exception ex) { e = 
ex;
+         * } assertNotNull("Unexpected behavior - File shouldn't be in
+         * explorer!!!", e);
             *
             */
-        } catch (Exception e) {
-            throw new Exception("Test failed: " + e);
-        } finally {
+
             TestKit.closeProject(PROJECT_NAME);
+
         }
     }
-}