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 2008/04/28 02:22:11 UTC

svn commit: r652033 - in /jakarta/jmeter/trunk: src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java xdocs/changes.xml

Author: sebb
Date: Sun Apr 27 17:22:08 2008
New Revision: 652033

URL: http://svn.apache.org/viewvc?rev=652033&view=rev
Log:
JUnit sampler GUI now also finds Test classes defined in user.classpath

Modified:
    jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java?rev=652033&r1=652032&r2=652033&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java Sun Apr 27 17:22:08 2008
@@ -21,6 +21,7 @@
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.List;
@@ -66,9 +67,25 @@
     private static final String ONETIMETEARDOWN = "oneTimeTearDown"; //$NON-NLS-1$
     private static final String SUITE = "suite"; //$NON-NLS-1$
     
-    private static final String[] SPATHS = new String[] {
-            JMeterUtils.getJMeterHome() + "/lib/junit/", //$NON-NLS-1$
-    };
+    private static final String[] SPATHS;
+
+    static {
+        String paths[];
+        String ucp = JMeterUtils.getProperty("user.classpath");
+        if (ucp!=null){
+            String parts[] = ucp.split(File.pathSeparator);
+            paths = new String[parts.length+1];
+            paths[0] = JMeterUtils.getJMeterHome() + "/lib/junit/"; //$NON-NLS-1$
+            for(int i=0; i < parts.length; i++){
+                paths[i+1]=parts[i];
+            }
+        } else {
+            paths = new String[]{
+                JMeterUtils.getJMeterHome() + "/lib/junit/" //$NON-NLS-1$
+            };
+        }
+        SPATHS = paths;
+    }
 
     private JLabeledTextField constructorLabel =
         new JLabeledTextField(

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=652033&r1=652032&r2=652033&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sun Apr 27 17:22:08 2008
@@ -120,6 +120,7 @@
 <li>Bug 40850 - BeanShell memory leak</li>
 <li>Ensure ResponseCode and ResponseMessage are set for successful JDBC samples</li>
 <li>FTPSampler now detects and reports failure to open the remote file</li>
+<li>Class directories defined in search_paths and user.classpath no longer need trailing "/"</li>
 </ul>
 
 <h4>Improvements</h4>
@@ -168,6 +169,7 @@
 <li>The supplied TCPClient implementation no longer treats tcp.eolByte=0 as special.
 To skip EOL checking, set tcp.eolByte=1000 (or some other value which is not a valid byte)
 </li>
+<li>JUnit sampler GUI now also finds Test classes defined in user.classpath</li>
 </ul>
 
 <h4>Non-functional changes</h4>



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