You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/09/04 19:02:10 UTC

cvs commit: jakarta-jmeter/src/junit/org/apache/jmeter/protocol/java/control/gui JUnitTestSamplerGui.java

sebb        2005/09/04 10:02:10

  Modified:    src/junit/org/apache/jmeter/protocol/java/control/gui Tag:
                        rel-2-1 JUnitTestSamplerGui.java
  Log:
  Only look for JUnit tests in lib/junit directory
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.13.2.2  +13 -12    jakarta-jmeter/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
  
  Index: JUnitTestSamplerGui.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- JUnitTestSamplerGui.java	2 Sep 2005 00:59:24 -0000	1.13.2.1
  +++ JUnitTestSamplerGui.java	4 Sep 2005 17:02:10 -0000	1.13.2.2
  @@ -20,8 +20,8 @@
   import java.awt.BorderLayout;
   import java.awt.event.ActionEvent;
   import java.awt.event.ActionListener;
  +import java.io.IOException;
   import java.lang.reflect.Method;
  -import java.util.ArrayList;
   import java.util.List;
   
   import javax.swing.JCheckBox;
  @@ -44,8 +44,8 @@
   import org.apache.log.Logger;
   
   /**
  - * The <code>JavaTestSamplerGui</code> class provides the user interface
  - * for the {@link JavaSampler}.
  + * The <code>JUnitTestSamplerGui</code> class provides the user interface
  + * for the {@link JUnitTestSampler}.
    * 
    * @version $Revision$ on $Date$
    */
  @@ -60,7 +60,9 @@
       public static final String ONETIMESETUP = "oneTimeSetUp";
       public static final String ONETIMETEARDOWN = "oneTimeTearDown";
       public static final String SUITE = "suite";
  -    protected String[] SPATHS = null;
  +    private static final String[] SPATHS = new String[] {
  +            JMeterUtils.getJMeterHome() + "/lib/junit/",
  +    };
   
       JLabeledTextField constructorLabel =
           new JLabeledTextField(
  @@ -111,7 +113,7 @@
       private static transient Logger log = LoggingManager.getLoggerForClass();
   
       /**
  -     * Constructor for JavaTestSamplerGui
  +     * Constructor for JUnitTestSamplerGui
        */
       public JUnitTestSamplerGui()
       {
  @@ -141,9 +143,6 @@
       private JPanel createClassPanel()
       {
           METHODLIST = new java.util.ArrayList();
  -        SPATHS = new String[2];
  -        SPATHS[0] = JMeterUtils.getSearchPaths()[0];
  -        SPATHS[1] = JMeterUtils.getJMeterHome() + "/lib/junit/";
   
           try
           {
  @@ -153,9 +152,12 @@
                       SPATHS,
                       new Class[] { TestCase.class });
           }
  -        catch (Exception e)
  +        catch (IOException e)
           {
  -            log.debug("Exception getting interfaces.", e);
  +            log.error("Exception getting interfaces.", e);
  +        } 
  +        catch (ClassNotFoundException e) {
  +            log.error("Exception getting interfaces.", e);
           }
   
           JLabel label =
  @@ -335,7 +337,6 @@
       public Class[] filterClasses(Class[] clz) {
           if (clz != null && clz.length > 0){
               Class[] nclz = null;
  -            ArrayList matches = new ArrayList();
               return nclz;
           } else {
               return clz;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org