svn commit: r1789195 - /jmeter/trunk/test/src/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java

[pmouawad]

Author: pmouawad
Date: Tue Mar 28 19:08:24 2017
New Revision: 1789195

URL: http://svn.apache.org/viewvc?rev=1789195&view=rev
Log:
Bug 60112 - Report / Dashboard : Add ability to customize APDEX thresholds per 
Transaction name
Move file
Bugzilla Id: 60112

Modified:
    
jmeter/trunk/test/src/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java

Modified: 
jmeter/trunk/test/src/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java?rev=1789195&r1=1789194&r2=1789195&view=diff
==============================================================================
--- 
jmeter/trunk/test/src/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
 (original)
+++ 
jmeter/trunk/test/src/org/apache/jmeter/report/dashboard/ApdexPerTransactionTest.java
 Tue Mar 28 19:08:24 2017
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.report.config.ReportGeneratorConfiguration;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.oro.text.regex.PatternMatcher;
@@ -39,7 +40,7 @@ import org.slf4j.LoggerFactory;
 
 import jodd.props.Props;
 
-public class ApdexPerTransactionTest {
+public class ApdexPerTransactionTest extends JMeterTestCase {
        
        private static final Logger log = 
LoggerFactory.getLogger(ApdexPerTransactionTest.class);
        
@@ -56,8 +57,8 @@ public class ApdexPerTransactionTest {
                final String REPORT_GENERATOR_KEY_APDEX_PER_TRANSACTION = 
REPORT_GENERATOR_KEY_PREFIX
                    + KEY_DELIMITER + "apdex_per_transaction";
                
-               File rgp = new File("test/resources/", 
"reportgenerator_test.properties");
-               merged.putAll(loadProps(rgp));
+               merged.putAll(loadProps(
+                       new 
File(this.getClass().getResource("reportgenerator_test.properties").getFile())));
                props.load(merged);
                final String apdexPerTransaction = getOptionalProperty(props, 
                        REPORT_GENERATOR_KEY_APDEX_PER_TRANSACTION,