Bug 59435 - JMeterTestCase no longer supports JUnit3

Bugzilla Id: 59435

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1784385 13f79535-47bb-0310-9956-ffa450edef68

test/src/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java

@@ -31,7 +31,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.engine.util.CompoundVariable;
 import org.apache.jmeter.junit.JMeterTest;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.junit.JMeterTestCaseJUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -43,7 +43,7 @@ import org.xml.sax.SAXException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class ComponentReferenceFunctionTest extends JMeterTestCaseJUnit3 {
+public class ComponentReferenceFunctionTest extends JMeterTestCaseJUnit {
 
     private static final Logger log = LoggerFactory.getLogger(ComponentReferenceFunctionTest.class);
     

test/src/org/apache/jmeter/functions/PackageTest.java

@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.LinkedList;
 
 import org.apache.jmeter.engine.util.CompoundVariable;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.junit.JMeterTestCaseJUnit;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
@@ -41,7 +41,7 @@ import junit.framework.TestSuite;
 /**
  * Test cases for Functions
  */
-public class PackageTest extends JMeterTestCaseJUnit3 {
+public class PackageTest extends JMeterTestCaseJUnit {
 
     private static final Logger log = LoggerFactory.getLogger(PackageTest.class);
 

test/src/org/apache/jmeter/gui/action/TestLoad.java

@@ -23,7 +23,7 @@ import java.io.FilenameFilter;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.junit.JMeterTestCaseJUnit;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jorphan.collections.HashTree;
 
@@ -33,7 +33,7 @@ import junit.framework.TestSuite;
  * 
  * Test JMX files to check that they can be loaded OK.
  */
-public class TestLoad extends JMeterTestCaseJUnit3 {
+public class TestLoad extends JMeterTestCaseJUnit {
 
     private static final String basedir = new File(System.getProperty("user.dir")).getParent();
     private static final File testfiledir = new File(basedir,"bin/testfiles");

test/src/org/apache/jmeter/junit/JMeterTest.java

@@ -67,7 +67,7 @@ import org.xml.sax.SAXException;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class JMeterTest extends JMeterTestCaseJUnit3 {
+public class JMeterTest extends JMeterTestCaseJUnit {
     private static final Logger log = LoggerFactory.getLogger(JMeterTest.class);
 
     private static Map<String, Boolean> guiTitles;

test/src/org/apache/jmeter/junit/JMeterTestCaseJUnit.java

@@ -35,15 +35,15 @@ import junit.framework.TestCase;
 /*
  * Extend JUnit TestCase to provide common setup
  */
-public abstract class JMeterTestCaseJUnit3 extends TestCase {
+public abstract class JMeterTestCaseJUnit extends TestCase {
     // Used by findTestFile
     private static final String filePrefix;
 
-    public JMeterTestCaseJUnit3() {
+    public JMeterTestCaseJUnit() {
         super();
     }
 
-    public JMeterTestCaseJUnit3(String name) {
+    public JMeterTestCaseJUnit(String name) {
         super(name);
     }
 

test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java

@@ -34,14 +34,14 @@ import java.util.TreeSet;
 import java.util.Vector;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.junit.JMeterTestCaseJUnit;
 import org.apache.jmeter.util.JMeterUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import junit.framework.TestSuite;
 
-public class TestHTMLParser extends JMeterTestCaseJUnit3 {
+public class TestHTMLParser extends JMeterTestCaseJUnit {
     private static final Logger log = LoggerFactory.getLogger(TestHTMLParser.class);
 
     private static final String DEFAULT_UA  = "Apache-HttpClient/4.2.6";

test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java

@@ -29,7 +29,7 @@ import java.net.URLEncoder;
 import java.util.Locale;
 
 import org.apache.jmeter.engine.util.ValueReplacer;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.junit.JMeterTestCaseJUnit;
 import org.apache.jmeter.protocol.http.control.HttpMirrorServer;
 import org.apache.jmeter.protocol.http.control.TestHTTPMirrorThread;
 import org.apache.jmeter.protocol.http.util.EncoderCache;
@@ -56,7 +56,7 @@ import junit.framework.TestSuite;
  * The samples are executed against the HttpMirrorServer, which is 
  * started when the unit tests are executed.
  */
-public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit3 {
+public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit {
     private static final int HTTP_SAMPLER = 0;
     private static final int HTTP_SAMPLER3 = 2;
     

test/src/org/apache/jmeter/testbeans/gui/PackageTest.java

@@ -26,7 +26,7 @@ import java.util.Locale;
 import java.util.ResourceBundle;
 
 import org.apache.jmeter.gui.util.JMeterMenuBar;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.junit.JMeterTestCaseJUnit;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
@@ -46,7 +46,7 @@ import junit.framework.TestSuite;
  * TODO: - Check property files don't have duplicate keys (is this important)
  * 
  */
-public final class PackageTest extends JMeterTestCaseJUnit3 {
+public final class PackageTest extends JMeterTestCaseJUnit {
     private static final Logger log = LoggerFactory.getLogger(PackageTest.class);
 
     private static final Locale defaultLocale = new Locale("en","");

test/src/org/apache/jmeter/testelement/TestElementTest.java

@@ -23,7 +23,7 @@ import java.io.Serializable;
 import java.util.Properties;
 
 import org.apache.jmeter.junit.JMeterTest;
-import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.junit.JMeterTestCaseJUnit;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
@@ -31,7 +31,7 @@ import org.apache.jmeter.testelement.property.PropertyIterator;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class TestElementTest extends JMeterTestCaseJUnit3 {
+public class TestElementTest extends JMeterTestCaseJUnit {
 
     private TestElement testItem;
     

xdocs/changes.xml

@@ -225,6 +225,7 @@ JMeter now requires Java 8. Ensure you use most up to date version.
     <li>Updated to commons-net-3.6 (from 3.5)</li>
     <li>Converted the old pdf tutorials to xml.</li>
     <li><pr>255</pr>Utilised Java 8 (and 7) features to tidy up code. Contributed by Graham Russell (graham at ham1.co.uk)</li>
+    <li><bug>59435</bug>JMeterTestCase no longer supports JUnit3</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->