Automated merge with http://hg.netbeans.org/main/contrib
authorTheofanis Oikonomou <theofanis@netbeans.org>
Fri, 08 Jun 2012 20:04:45 +0200
changeset 178369ab550487966
parent 17834 2d7a95417802
parent 17835 7d19ae4dd34e
child 17838 66ad91fc4d72
Automated merge with http://hg.netbeans.org/main/contrib
     1.1 --- a/python.testrunner/manifest.mf	Thu Jun 07 19:52:15 2012 -0400
     1.2 +++ b/python.testrunner/manifest.mf	Fri Jun 08 20:04:45 2012 +0200
     1.3 @@ -2,5 +2,5 @@
     1.4  AutoUpdate-Show-In-Client: false
     1.5  OpenIDE-Module: org.netbeans.modules.python.testrunner
     1.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/python/testrunner/Bundle.properties
     1.7 -OpenIDE-Module-Specification-Version: 1.5
     1.8 +OpenIDE-Module-Specification-Version: 1.6
     1.9  
     2.1 --- a/python.testrunner/nbproject/project.xml	Thu Jun 07 19:52:15 2012 -0400
     2.2 +++ b/python.testrunner/nbproject/project.xml	Fri Jun 08 20:04:45 2012 +0200
     2.3 @@ -53,7 +53,8 @@
     2.4                      <build-prerequisite/>
     2.5                      <compile-dependency/>
     2.6                      <run-dependency>
     2.7 -                        <specification-version>1.16</specification-version>
     2.8 +                        <release-version>1</release-version>
     2.9 +                        <specification-version>1.26</specification-version>
    2.10                      </run-dependency>
    2.11                  </dependency>
    2.12                  <dependency>
     3.1 --- a/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PythonTestMethodNode.java	Thu Jun 07 19:52:15 2012 -0400
     3.2 +++ b/python.testrunner/src/org/netbeans/modules/python/testrunner/ui/PythonTestMethodNode.java	Fri Jun 08 20:04:45 2012 +0200
     3.3 @@ -76,14 +76,14 @@
     3.4      @Override
     3.5      public Action getPreferredAction() {
     3.6          // the location to jump from the node
     3.7 -        String testLocation = getTestLocation(testcase, project);
     3.8 +        String testLocation = getTestLocation(testcase, getProject());
     3.9          String stackTrace = getTestCaseLineFromStackTrace(testcase);
    3.10          String jumpToLocation = stackTrace != null
    3.11                  ? stackTrace
    3.12                  : testLocation;
    3.13  
    3.14          return jumpToLocation == null
    3.15 -                ? new JumpToTestAction(testcase, project, NbBundle.getMessage(PythonTestMethodNode.class, "LBL_GoToSource"), false)
    3.16 +                ? new JumpToTestAction(testcase, getProject(), NbBundle.getMessage(PythonTestMethodNode.class, "LBL_GoToSource"), false)
    3.17                  : new JumpToCallStackAction(this, jumpToLocation);
    3.18      }
    3.19      
    3.20 @@ -152,8 +152,8 @@
    3.21          List<Action> actions = new ArrayList<Action>();
    3.22          actions.add(getPreferredAction());
    3.23          actions.add(new DiffViewAction(testcase));
    3.24 -        actions.add(new RunTestMethodAction(testcase, project, NbBundle.getMessage(PythonTestMethodNode.class, "LBL_RerunTest"), false));
    3.25 -        actions.add(new RunTestMethodAction(testcase, project, NbBundle.getMessage(PythonTestMethodNode.class, "LBL_DebugTest"), true));
    3.26 +        actions.add(new RunTestMethodAction(testcase, getProject(), NbBundle.getMessage(PythonTestMethodNode.class, "LBL_RerunTest"), false));
    3.27 +        actions.add(new RunTestMethodAction(testcase, getProject(), NbBundle.getMessage(PythonTestMethodNode.class, "LBL_DebugTest"), true));
    3.28  //        actions.add(new DisplayOutputForNodeAction(testcase.getOutput(), testcase.getSession()));
    3.29          return actions.toArray(new Action[actions.size()]);
    3.30      }