svn commit: r1742796 - /jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java

[se...@apache.org]

Author: sebb
Date: Sun May  8 10:49:01 2016
New Revision: 1742796

URL: http://svn.apache.org/viewvc?rev=1742796&view=rev
Log:
Convert to JUnit4

Modified:
    jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java

Modified: jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java?rev=1742796&r1=1742795&r2=1742796&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/resources/TestPropertiesFiles.java Sun May  8 10:49:01 2016
@@ -23,18 +23,23 @@ import java.io.FileInputStream;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import org.apache.jmeter.junit.JMeterTestCaseJUnit3;
+import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.util.JMeterUtils;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import org.junit.Test;
 
-public class TestPropertiesFiles extends JMeterTestCaseJUnit3 {
+public class TestPropertiesFiles extends JMeterTestCase {
     
 
+    @Test
     public void testUserProperties() throws Exception {
         Properties props = loadProps(new File(JMeterUtils.getJMeterBinDir(), "user.properties"));
         assertTrue("user.properties should not contain any enabled properties", props.isEmpty());
     }
 
     // The keys in jmeter.properties and reportgenerator.properties should be distinct
+    @Test
     public void testDefaultProperties() throws Exception {
         Properties jmeter = loadProps(new File(JMeterUtils.getJMeterBinDir(), "jmeter.properties"));
         Properties report = loadProps(new File(JMeterUtils.getJMeterBinDir(), "reportgenerator.properties"));