jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1749211 - in /jmeter/trunk: bin/testfiles/jmetertest.properties build.xml test/src/org/apache/jmeter/junit/JMeterTestCase.java test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit3.java
Date Sun, 19 Jun 2016 22:04:51 GMT
Author: sebb
Date: Sun Jun 19 22:04:51 2016
New Revision: 1749211

URL: http://svn.apache.org/viewvc?rev=1749211&view=rev
Log:
Use jmeter.properties for testing whenever possible
Fix unit tests
Bugzilla Id: 59723

Removed:
    jmeter/trunk/bin/testfiles/jmetertest.properties
Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
    jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit3.java

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1749211&r1=1749210&r2=1749211&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Jun 19 22:04:51 2016
@@ -2703,7 +2703,7 @@ run JMeter unless all the JMeter jars ar
       <sysproperty key="testsaveservice.saveout" value="${testsaveservice.saveout}" />
       <sysproperty key="gump.run" value="${gump.run}" />
       <arg value="${build.test}"/>
-      <arg value="${basedir}/bin/testfiles/jmetertest.properties"/>
+      <arg value="${basedir}/bin/jmeter.properties"/>
       <arg value="org.apache.jmeter.util.JMeterUtils"/>
     </java>
   </target>

Modified: jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java?rev=1749211&r1=1749210&r2=1749211&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java Sun Jun 19 22:04:51
2016
@@ -52,7 +52,7 @@ public abstract class JMeterTestCase {
      */
     static {
         if (JMeterUtils.getJMeterProperties() == null) {
-            String file = "testfiles/jmetertest.properties";
+            String file = "jmeter.properties";
             File f = new File(file);
             if (!f.canRead()) {
                 System.out.println("Can't find " + file + " - trying bin directory");

Modified: jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit3.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit3.java?rev=1749211&r1=1749210&r2=1749211&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit3.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit3.java Sun Jun 19 22:04:51
2016
@@ -58,7 +58,7 @@ public abstract class JMeterTestCaseJUni
      */
     static {
         if (JMeterUtils.getJMeterProperties() == null) {
-            String file = "testfiles/jmetertest.properties";
+            String file = "jmeter.properties";
             File f = new File(file);
             if (!f.canRead()) {
                 System.out.println("Can't find " + file + " - trying bin directory");



Mime
View raw message