root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

refactor: migrate JUnit 3 tests to JUnit 5, remove JUnit 4 test dependency 

Now we have only JUnit 5 on the test compilation classpath, and IDE
no longer suggests multiple different @Test and assertEquals implementations.
This commit is contained in:
Vladimir Sitnikov 2023-12-28 11:37:32 +03:00
parent ae75354d3c
commit c962ec690a
27 changed files with 634 additions and 978 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
View File

@ -23,10 +23,14 @@ plugins {
}
dependencies {
testImplementation("junit:junit")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.hamcrest:hamcrest")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
}
plugins.withId("java-test-fixtures") {
dependencies {
"testFixturesImplementation"("org.junit.jupiter:junit-jupiter")
}
}
tasks.configureEach<Test> {

1
src/bom-testing/build.gradle.kts
View File

@ -39,7 +39,6 @@ dependencies {
// to make runtime classpath consistent with the compile one.
api("com.github.tomakehurst:wiremock-jre8:2.35.1")
api("io.mockk:mockk:1.13.7")
api("junit:junit:4.13.2")
api("net.bytebuddy:byte-buddy:1.14.11")
api("nl.jqno.equalsverifier:equalsverifier:3.15.5")
// activemq-all should not be used as it provides secondary slf4j binding

1
src/components/build.gradle.kts
View File

@ -89,7 +89,6 @@ dependencies {
testImplementation("nl.jqno.equalsverifier:equalsverifier")
testImplementation(testFixtures(projects.src.testkitWiremock))
testFixturesImplementation(testFixtures(projects.src.core))
testFixturesImplementation("junit:junit")
testImplementation("io.mockk:mockk")
}

2
src/components/src/main/java/org/apache/jmeter/config/KeystoreConfigBeanInfo.java
View File

@ -44,7 +44,7 @@ public class KeystoreConfigBeanInfo extends BeanInfoSupport {
PropertyDescriptor p = property(PRELOAD);
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
p.setValue(DEFAULT, "true"); // $NON-NLS-1$
p.setValue(DEFAULT, "True"); // $NON-NLS-1$
p.setValue(NOT_EXPRESSION, Boolean.TRUE);
p.setValue(NOT_OTHER, Boolean.TRUE);
p.setValue(TAGS, new String[]{"True", "False"}); // $NON-NLS-1$ $NON-NLS-2$

2
src/components/src/test/java/org/apache/jmeter/extractor/json/jmespath/TestJMESPathExtractor.java
View File

@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runners.Parameterized.Parameters;
class TestJMESPathExtractor {
private static final String DEFAULT_VALUE = "NONE"; // $NON-NLS-1$
@ -151,7 +150,6 @@ class TestJMESPathExtractor {
+ " {\"missing\": \"different\"}\r\n" + " ],\r\n" + " \"foo\": {\"bar\": \"baz\"}\r\n"
+ "}";
@Parameters
private static Stream<Arguments> dataMatchNumberMoreThanZero() {
return Stream.of(
Arguments.of(TEST_DATA, "people[:3].first", "1", "James", "3"),

1
src/core/build.gradle.kts
View File

@ -123,7 +123,6 @@ dependencies {
testImplementation("io.mockk:mockk")
testFixturesApi(testFixtures(projects.src.jorphan))
testFixturesImplementation("junit:junit")
testFixturesImplementation(projects.src.testkit)
testFixturesImplementation("org.junit.jupiter:junit-jupiter")
}

3
src/core/src/main/java/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
View File

@ -33,6 +33,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.ResourceBundle;
import javax.swing.JPopupMenu;
@ -152,7 +153,7 @@ public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUI
}
public TestBeanGUI(Class<?> testBeanClass) {
super();
Objects.requireNonNull(testBeanClass, "testBeanClass");
log.debug("testing class: {}", testBeanClass);
// A quick verification, just in case:
if (!TestBean.class.isAssignableFrom(testBeanClass)) {

41
src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java
View File

@ -1,41 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to you under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.jmeter.threads;
import org.junit.rules.ExternalResource;
public class JMeterContextServiceHelper extends ExternalResource {
@Override
protected void after() {
JMeterContextService.removeContext();
}
private JMeterContext instance;
public JMeterContext get() {
if (instance == null) {
JMeterContext jMeterContext = new JMeterContext();
JMeterContextService.replaceContext(jMeterContext);
initContext(jMeterContext);
instance = jMeterContext;
}
return instance;
}
protected void initContext(JMeterContext jMeterContext) {}
}

131
src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
View File

@ -1,131 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to you under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.jmeter.junit;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.File;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Locale;
import java.util.MissingResourceException;
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.functions.AbstractFunction;
import org.apache.jmeter.functions.InvalidVariableException;
import org.apache.jmeter.util.JMeterUtils;
import junit.framework.TestCase;
/*
* Extend JUnit TestCase to provide common setup
*/
public abstract class JMeterTestCaseJUnit extends TestCase {
// Used by findTestFile
private static final String filePrefix;
protected JMeterTestCaseJUnit() {
super();
}
protected JMeterTestCaseJUnit(String name) {
super(name);
}
/*
* If not running under AllTests.java, make sure that the properties (and
* log file) are set up correctly.
*
* N.B. This assumes the JUnit test are executed in the
* project root, bin directory or one level down, and all the JMeter jars
* (plus any others needed at run-time) need to be on the classpath.
*/
static {
if (JMeterUtils.getJMeterProperties() == null) {
filePrefix = JMeterTestUtils.setupJMeterHome();
String home = JMeterUtils.getJMeterHome();
System.setProperty("jmeter.home", home); // needed for scripts
JMeterUtils jmu = new JMeterUtils();
try {
jmu.initializeProperties(filePrefix+"jmeter.properties");
} catch (MissingResourceException e) {
System.out.println("** Can't find resources - continuing anyway **");
}
System.out.println("JMeterVersion="+JMeterUtils.getJMeterVersion());
logprop("java.version");
logprop("java.vm.name");
logprop("java.vendor");
logprop("java.home");
logprop("file.encoding");
// Display actual encoding used (will differ if file.encoding is not recognised)
System.out.println("default encoding="+Charset.defaultCharset());
logprop("user.home");
logprop("user.dir");
logprop("user.language");
logprop("user.region");
logprop("user.country");
logprop("user.variant");
System.out.println("Locale="+Locale.getDefault().toString());
logprop("java.class.version");
logprop("java.awt.headless");
logprop("os.name");
logprop("os.version");
logprop("os.arch");
if (Boolean.getBoolean("jmeter.test.log.classpath")) {
logprop("java.class.path");
}
} else {
filePrefix = JMeterTestUtils.setupJMeterHome();
}
}
private static void logprop(String prop) {
System.out.println(prop + "=" + System.getProperty(prop));
}
// Helper method to find a file
protected static File findTestFile(String file) {
File f = new File(file);
if (filePrefix.length() > 0 && !f.isAbsolute()) {
f = new File(filePrefix, file);// Add the offset
}
return f;
}
protected void checkInvalidParameterCounts(AbstractFunction func, int minimum)
throws Exception {
Collection<CompoundVariable> parms = new ArrayList<>();
for (int c = 0; c < minimum; c++) {
assertThrows(InvalidVariableException.class, () -> func.setParameters(parms));
parms.add(new CompoundVariable());
}
func.setParameters(parms);
}
/**
* Returns absolute path of a resource file.
* It allows to have test resources in {@code test/resources/org/apache...} folder
* and reference it as {@code getResourceFilePath("test1.txt")}.
* @param resource argument for klass.getResource. Relative (to current class) or absolute resource path
* @return absolute file path of a resource
*/
protected String getResourceFilePath(String resource) {
return JMeterTestUtils.getResourceFilePath(getClass(), resource);
}
}

58
src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java
View File

@ -1,58 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to you under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.jmeter.junit.categories;
import org.junit.experimental.categories.Category;
import org.junit.runner.Description;
import org.junit.runner.manipulation.Filter;
/**
* Junit Filter that excludes test annotated with a given marker interface
* @since 3.0
*/
public class ExcludeCategoryFilter extends Filter {
private Class<?> excludedClass;
public ExcludeCategoryFilter(Class<?> excludedClass) {
super();
this.excludedClass = excludedClass;
}
@Override
public String describe() {
return "JMeter ExcludeCategoryFilter";
}
@Override
public boolean shouldRun(Description description) {
//TODO : check the class hierarchy and not only the current class
Category cat = description.getAnnotation(Category.class);
if(cat != null) {
Class<?>[] categories = cat.value();
for (Class<?> class1 : categories) {
if(excludedClass.isAssignableFrom(class1)) {
return false;
}
}
}
return true;
}
}

86
src/core/src/testFixtures/java/org/apache/jmeter/resources/PackageTest.java
View File

@ -17,6 +17,11 @@
package org.apache.jmeter.resources;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import java.io.BufferedReader;
import java.io.File;
import java.io.FilenameFilter;
@ -25,6 +30,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@ -37,12 +43,10 @@ import java.util.TreeMap;
import java.util.TreeSet;
import org.apache.jmeter.gui.util.JMeterMenuBar;
import org.junit.runner.Describable;
import org.junit.runner.Description;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
/*
* Created on Nov 29, 2003
@ -64,7 +68,7 @@ import junit.framework.TestSuite;
* why the tests failed.
*/
public class PackageTest extends TestCase implements Describable {
public class PackageTest {
// We assume the test starts in "src/core" directory (which is true for Gradle and IDEs)
private static final File resourceFiledir = new File("src/main/resources");
@ -85,7 +89,7 @@ public class PackageTest extends TestCase implements Describable {
new Object[] { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
// Read resource file saving the keys
private void readRF(String res, List<String> l) throws Exception {
private void readRF(String res, String resourcePrefix, String lang, List<String> l) throws Exception {
InputStream ras = this.getClass().getResourceAsStream(res);
if (ras == null){
if (MESSAGES.equals(resourcePrefix)|| lang.isEmpty()) {
@ -137,7 +141,7 @@ public class PackageTest extends TestCase implements Describable {
}
// Helper method to construct resource name
private String getResName(String lang) {
private String getResName(String lang, String resourcePrefix) {
if (lang.isEmpty()) {
return resourcePrefix+".properties";
} else {
@ -145,18 +149,18 @@ public class PackageTest extends TestCase implements Describable {
}
}
private void check(String resname) throws Exception {
check(resname, true);// check that there aren't any extra entries
private void check(String resname, String resourcePrefix) throws Exception {
check(resname, resourcePrefix, true);// check that there aren't any extra entries
}
/*
* perform the checks on the resources
*
*/
private void check(String resname, boolean checkUnexpected) throws Exception {
private void check(String resname, String resourcePrefix, boolean checkUnexpected) throws Exception {
ArrayList<String> alf = new ArrayList<>(500);// holds keys from file
String res = getResName(resname);
readRF(res, alf);
String res = getResName(resname, resourcePrefix);
readRF(res, resourcePrefix, resname, alf);
Collections.sort(alf);
// Look for duplicate keys in the file
@ -241,7 +245,7 @@ public class PackageTest extends TestCase implements Describable {
static void findFile(File file, Set<String> set,
FilenameFilter filenameFilter) {
File[] foundFiles = file.listFiles(filenameFilter);
assertNotNull("Not a directory: "+file, foundFiles);
assertNotNull(foundFiles, "Not a directory: "+file);
for (File file2 : foundFiles) {
if (file2.isDirectory()) {
findFile(file2, set, filenameFilter);
@ -257,61 +261,35 @@ public class PackageTest extends TestCase implements Describable {
/*
* Use a suite to ensure that the default is done first
*/
public static Test suite() {
TestSuite ts = new TestSuite("Resources PackageTest");
public static Collection<Arguments> languagesAndPrefixes() {
Collection<Arguments> res = new ArrayList<>();
String[] languages = JMeterMenuBar.getLanguages();
for(String prefix : prefixList){
TestSuite pfx = new TestSuite(prefix) ;
pfx.addTest(new PackageTest("testLang","", prefix)); // load the default resource
res.add(arguments("", prefix)); // load the default resource
for(String language : languages){
if (!"en".equals(language)){ // Don't try to check the default language
pfx.addTest(new PackageTest("testLang", language, prefix));
res.add(arguments(language, prefix));
}
}
ts.addTest(pfx);
}
ts.addTest(new PackageTest("checkI18n", "fr"));
// TODO Add these some day
// ts.addTest(new PackageTest("checkI18n", "es"));
// ts.addTest(new PackageTest("checkI18n", "pl"));
// ts.addTest(new PackageTest("checkI18n", "pt_BR"));
// ts.addTest(new PackageTest("checkI18n", "tr"));
// ts.addTest(new PackageTest("checkI18n", Locale.JAPANESE.toString()));
// ts.addTest(new PackageTest("checkI18n", Locale.SIMPLIFIED_CHINESE.toString()));
// ts.addTest(new PackageTest("checkI18n", Locale.TRADITIONAL_CHINESE.toString()));
return ts;
return res;
}
private List<String> failures = new ArrayList<>();
private final String lang;
private final String resourcePrefix; // e.g. "/org/apache/jmeter/resources/messages"
public PackageTest(String testName, String _lang) {
this(testName, _lang, MESSAGES);
}
public PackageTest(String testName, String _lang, String propName) {
super(testName);
lang=_lang;
resourcePrefix = propName;
}
@Override
public Description getDescription() {
return Description.createTestDescription(getClass(), getName() + " " + lang + ": " + resourcePrefix);
}
public void testLang() throws Exception{
check(lang);
@ParameterizedTest
@MethodSource("languagesAndPrefixes")
public void testLang(String lang, String resourcePrefix) throws Exception{
check(lang, resourcePrefix);
}
/**
* Check all messages are available in one language
* @throws Exception if something fails
*/
public void checkI18n() throws Exception {
@ParameterizedTest
@ValueSource(strings = {"fr"})
public void checkI18n(String lang) throws Exception {
Map<String, Map<String,String>> missingLabelsPerBundle = new HashMap<>();
for (String prefix : prefixList) {
Properties messages = new Properties();
@ -319,7 +297,7 @@ public class PackageTest extends TestCase implements Describable {
checkMessagesForLanguage( missingLabelsPerBundle , messages,prefix.substring(1), lang);
}
assertEquals(missingLabelsPerBundle.size()+" missing labels, labels missing:"+printLabels(missingLabelsPerBundle), 0, missingLabelsPerBundle.size());
assertEquals(0, missingLabelsPerBundle.size(), missingLabelsPerBundle.size()+" missing labels, labels missing:"+printLabels(missingLabelsPerBundle));
}
private void checkMessagesForLanguage(Map<String, Map<String, String>> missingLabelsPerBundle,

99
src/dist-check/src/test/java/org/apache/jmeter/functions/ComponentReferenceFunctionTest.java
View File

@ -17,11 +17,16 @@
package org.apache.jmeter.functions;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@ -30,9 +35,13 @@ 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.JMeterTestCaseJUnit;
import org.junit.runner.Describable;
import org.junit.runner.Description;
import org.apache.jmeter.junit.JMeterTestCase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@ -41,47 +50,34 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import junit.framework.Test;
import junit.framework.TestSuite;
public class ComponentReferenceFunctionTest extends JMeterTestCaseJUnit implements Describable {
@TestInstance(TestInstance.Lifecycle.PER_CLASS) // shares funcTitles between tests
public class ComponentReferenceFunctionTest extends JMeterTestCase {
private static final Logger log = LoggerFactory.getLogger(ComponentReferenceFunctionTest.class);
private static Map<String, Boolean> funcTitles;
private Map<String, Boolean> funcTitles;
// Constructor for Function tests
private Function funcItem;
static class Holder {
static final Collection<Function> FUNCTIONS;
public ComponentReferenceFunctionTest(String name) {
super(name);
}
public ComponentReferenceFunctionTest(String testName, Function fi) {
super(testName);// Save the method name
funcItem = fi;
}
@Override
public Description getDescription() {
return Description.createTestDescription(getClass(), getName() + (funcItem != null ? " " + funcItem.getClass() : null));
static {
try {
FUNCTIONS = JMeterTest.getObjects(Function.class)
.stream()
.filter(f -> f.getClass() != CompoundVariable.class)
.map(Function.class::cast)
.collect(Collectors.toList());
} catch (Throwable e) {
throw new RuntimeException(e);
}
}
}
/*
* Test Functions - create the suite of tests
*/
private static Test suiteFunctions() throws Throwable {
TestSuite suite = new TestSuite("Functions");
for (Object item : JMeterTest.getObjects(Function.class)) {
if (item.getClass().equals(CompoundVariable.class)) {
continue;
}
TestSuite ts = new TestSuite(item.getClass().getName());
ts.addTest(new ComponentReferenceFunctionTest("runFunction", (Function) item));
ts.addTest(new ComponentReferenceFunctionTest("runFunction2", (Function) item));
suite.addTest(ts);
}
return suite;
static Collection<Function> functions() throws Throwable {
return Holder.FUNCTIONS;
}
private Element getBodyFromXMLDocument(InputStream stream)
@ -99,6 +95,7 @@ public class ComponentReferenceFunctionTest extends JMeterTestCaseJUnit implemen
/*
* Extract titles from functions.xml
*/
@BeforeAll
public void createFunctionSet() throws Exception {
funcTitles = new HashMap<>(20);
String compref = "../xdocs/usermanual/functions.xml";
@ -121,18 +118,17 @@ public class ComponentReferenceFunctionTest extends JMeterTestCaseJUnit implemen
}
}
@AfterAll
public void checkFunctionSet() throws Exception {
assertEquals(
"Should not have any names left over in funcTitles",
"[]",
JMeterTest.keysWithFalseValues(funcTitles).toString()
);
Assertions.assertEquals("[]", JMeterTest.keysWithFalseValues(funcTitles).toString(), "Should not have any names left over in funcTitles");
}
/*
* run the function test
*/
public void runFunction() throws Exception {
@ParameterizedTest
@MethodSource("functions")
public void runFunction(Function funcItem) throws Exception {
if (funcTitles.size() > 0) {
String title = funcItem.getReferenceKey();
boolean ct = funcTitles.containsKey(title);
@ -146,7 +142,7 @@ public class ComponentReferenceFunctionTest extends JMeterTestCaseJUnit implemen
if (!ct) {
log.warn(s); // Record in log as well
}
assertTrue(s, ct);
Assertions.assertTrue(ct, s);
}
}
}
@ -154,21 +150,12 @@ public class ComponentReferenceFunctionTest extends JMeterTestCaseJUnit implemen
/*
* Check that function descriptions are OK
*/
public void runFunction2() throws Exception {
for (Object o : funcItem.getArgumentDesc()) {
assertTrue("Description must be a String", o instanceof String);
assertFalse("Description must not start with [refkey", ((String) o).startsWith("[refkey"));
@ParameterizedTest
@MethodSource("functions")
public void runFunction2(Function funcItem) throws Exception {
for (String o : funcItem.getArgumentDesc()) {
assertInstanceOf(String.class, o, "Description must be a String");
assertFalse(o.startsWith("[refkey"), "Description must not start with [refkey");
}
}
/*
* Use a suite to allow the tests to be generated at run-time
*/
public static Test suite() throws Throwable {
TestSuite suite = new TestSuite("ComponentReferenceFunctionTest");
suite.addTest(new ComponentReferenceFunctionTest("createFunctionSet"));
suite.addTest(suiteFunctions());
suite.addTest(new ComponentReferenceFunctionTest("checkFunctionSet"));
return suite;
}
}

68
src/dist-check/src/test/java/org/apache/jmeter/gui/action/TestLoad.java
View File

@ -17,24 +17,27 @@
package org.apache.jmeter.gui.action;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import java.io.File;
import java.io.FilenameFilter;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Stream;
import org.apache.jmeter.junit.JMeterTestCaseJUnit;
import org.apache.jmeter.save.SaveService;
import org.apache.jorphan.collections.HashTree;
import org.junit.runner.Describable;
import org.junit.runner.Description;
import junit.framework.TestSuite;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
/**
*
* Test JMX files to check that they can be loaded OK.
*/
public class TestLoad extends JMeterTestCaseJUnit implements Describable {
public class TestLoad {
private static final String basedir = new File(System.getProperty("user.dir")).getParentFile().getParent();
private static final File testfiledir = new File(basedir,"bin/testfiles");
@ -55,56 +58,31 @@ public class TestLoad extends JMeterTestCaseJUnit implements Describable {
}
};
private final File testFile;
private final String parent;
public TestLoad(String name) {
super(name);
testFile=null;
parent=null;
public static Stream<Arguments> inputFiles() {
return Stream.concat(
scanFiles(testfiledir),
scanFiles(demofiledir));
}
public TestLoad(String name, File file, String dir) {
super(name);
testFile=file;
parent=dir;
}
@Override
public Description getDescription() {
return Description.createTestDescription(getClass(), getName() + " " + testFile + " " + parent);
}
public static TestSuite suite(){
TestSuite suite = new TestSuite("Load Test");
scanFiles(suite, testfiledir);
scanFiles(suite, demofiledir);
return suite;
}
private static void scanFiles(TestSuite suite, File parent) {
private static Stream<Arguments> scanFiles(File parent) {
String dir = parent.getName();
File[] testFiles = parent.listFiles(jmxFilter);
if (testFiles == null) {
fail("*.jmx files for test should be present in folder " + parent);
}
for (File file : testFiles) {
suite.addTest(new TestLoad("checkTestFile", file, dir));
}
return Stream.of(testFiles)
.map(file -> arguments(dir, file));
}
public void checkTestFile() throws Exception{
HashTree tree = null;
try {
tree =getTree(testFile);
} catch (Exception e) {
fail(parent+": "+ testFile.getName()+" caused "+e);
}
assertTree(tree);
@ParameterizedTest
@MethodSource("inputFiles")
public void checkTestFile(String parent, File testFile) throws Exception{
HashTree tree = getTree(testFile);
assertTree(tree, parent, testFile);
}
private void assertTree(HashTree tree) throws Exception {
assertNotNull(parent+": "+ testFile.getName()+" caused null tree: ",tree);
private void assertTree(HashTree tree, String parent, File testFile) throws Exception {
assertNotNull(tree, parent+": "+ testFile.getName()+" caused null tree: ");
final Object object = tree.getArray()[0];
final String name = testFile.getName();

331
src/dist-check/src/test/java/org/apache/jmeter/junit/JMeterTest.java
View File

@ -17,6 +17,12 @@
package org.apache.jmeter.junit;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.awt.Component;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@ -39,6 +45,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.swing.SwingUtilities;
import javax.xml.parsers.DocumentBuilder;
@ -49,12 +56,16 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.config.gui.ObsoleteGui;
import org.apache.jmeter.control.gui.TestFragmentControllerGui;
import org.apache.jmeter.dsl.DslPrinterTraverser;
import org.apache.jmeter.gui.GuiComponentHolder;
import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.UnsharedComponent;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.loadsave.IsEnabledNormalizer;
import org.apache.jmeter.protocol.http.control.gui.GraphQLHTTPSamplerGui;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBaseSchema;
import org.apache.jmeter.protocol.java.config.gui.JavaConfigGui;
import org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui;
import org.apache.jmeter.protocol.java.control.gui.JavaTestSamplerGui;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testbeans.gui.TestBeanGUI;
@ -62,10 +73,15 @@ import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.backend.BackendListenerGui;
import org.apache.jorphan.reflect.ClassFinder;
import org.apache.jorphan.util.JOrphanUtils;
import org.junit.runner.Describable;
import org.junit.runner.Description;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.parallel.Isolated;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@ -73,10 +89,9 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import junit.framework.Test;
import junit.framework.TestSuite;
public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
@Isolated("changes default locale")
@TestInstance(TestInstance.Lifecycle.PER_CLASS) // maps must persist across test method executions
public class JMeterTest extends JMeterTestCase {
private static final Logger log = LoggerFactory.getLogger(JMeterTest.class);
private static Map<String, Boolean> guiTitles;
@ -89,80 +104,17 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
private static final Locale DEFAULT_LOCALE = Locale.getDefault();
public JMeterTest(String name) {
super(name);
}
/*
* The suite() method creates separate test suites for each of the types of
* test. The suitexxx() methods create a list of items to be tested, and
* create a new test instance for each.
*
* Each test type has its own constructor, which saves the item to be tested
*
* Note that the suite() method must be static, and the methods to run the
* tests must be instance methods so that they can pick up the item value
* which was saved by the constructor.
*
*/
// Constructor for Serializable tests
private Serializable serObj;
public JMeterTest(String testName, Serializable ser) {
super(testName);// Save the method name
serObj = ser;
}
// Constructor for GUI tests
private JMeterGUIComponent guiItem;
public JMeterTest(String testName, JMeterGUIComponent gc) {
super(testName);// Save the method name
guiItem = gc;
}
@Override
public Description getDescription() {
StringBuilder sb = new StringBuilder();
sb.append(getName());
if (guiItem instanceof TestBeanGUI) {
sb.append(" ").append(guiItem);
} else if (guiItem != null) {
sb.append(" ").append(guiItem.getClass().getName());
} else if (serObj != null) {
sb.append(" ").append(serObj.getClass().getName());
}
return Description.createTestDescription(getClass(), sb.toString());
}
private static volatile boolean classPathShown = false;// Only show classpath once
/*
* Use a suite to allow the tests to be generated at run-time
*/
public static Test suite() throws Throwable {
TestSuite suite = new TestSuite("JMeterTest");
// The Locale used to instantiate the GUI objects
@BeforeAll
public static void setLocale() {
JMeterUtils.setLocale(TEST_LOCALE);
Locale.setDefault(TEST_LOCALE);
// Needs to be done before any GUI classes are instantiated
suite.addTest(new JMeterTest("readAliases"));
suite.addTest(new JMeterTest("createTitleSet"));
suite.addTest(new JMeterTest("createTagSet"));
suite.addTest(suiteGUIComponents());
suite.addTest(suiteSerializableElements());
suite.addTest(suiteBeanComponents());
suite.addTest(new JMeterTest("checkGuiSet"));
suite.addTest(new JMeterTest("resetLocale")); // revert
return suite;
}
// Restore the original Locale
public void resetLocale(){
@AfterAll
public static void resetLocale() {
JMeterUtils.setLocale(DEFAULT_LOCALE);
Locale.setDefault(DEFAULT_LOCALE);
}
@ -170,7 +122,8 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
/*
* Extract titles from component_reference.xml
*/
public void createTitleSet() throws Exception {
@BeforeAll
public static void createTitleSet() throws Exception {
guiTitles = new HashMap<>(90);
String compref = "../xdocs/usermanual/component_reference.xml";
@ -200,7 +153,7 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
* @throws IOException when stream can not be read
* @throws SAXException in case of XML parsing error
*/
private org.w3c.dom.Element getBodyFromXMLDocument(InputStream stream)
private static org.w3c.dom.Element getBodyFromXMLDocument(InputStream stream)
throws ParserConfigurationException, SAXException, IOException {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setIgnoringElementContentWhitespace(true);
@ -215,7 +168,8 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
/*
* Extract titles from component_reference.xml
*/
public void createTagSet() throws Exception {
@BeforeAll
public static void createTagSet() throws Exception {
guiTags = new HashMap<>(90);
String compref = "../xdocs/usermanual/component_reference.xml";
@ -246,26 +200,30 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
.collect(Collectors.toList());
}
public void checkGuiSet() {
@AfterAll
public static void checkGuiSet() {
guiTitles.remove("Example Sampler");// We don't mind if this is left over
guiTitles.remove("Sample_Result_Save_Configuration");// Ditto, not a sampler
assertEquals(
"Should not have any names left over in guiTitles map, check name of components in EN (default) Locale, "
"[]",
keysWithFalseValues(guiTitles).toString(),
() -> "Should not have any names left over in guiTitles map, check name of components in EN (default) Locale, "
+ "which must match name attribute of component, check java.awt.HeadlessException errors before,"
+ " we are running with '-Djava.awt.headless="
+ System.getProperty("java.awt.headless") + "'",
"[]",
keysWithFalseValues(guiTitles).toString()
);
+ System.getProperty("java.awt.headless") + "'");
}
/*
* Test GUI elements - create the suite of tests
*/
private static Test suiteGUIComponents() throws Throwable {
TestSuite suite = new TestSuite("GuiComponents");
static Collection<GuiComponentHolder> guiComponents() throws Throwable {
List<GuiComponentHolder> components = new ArrayList<>();
for (Object o : getObjects(JMeterGUIComponent.class)) {
JMeterGUIComponent item = (JMeterGUIComponent) o;
if (item.getClass() == TestBeanGUI.class) {
continue;
}
if (item instanceof JMeterTreeNode) {
System.out.println("o.a.j.junit.JMeterTest INFO: JMeterGUIComponent: skipping all tests " + item.getClass().getName());
continue;
@ -273,51 +231,23 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
if (item instanceof ObsoleteGui) {
continue;
}
TestSuite ts = new TestSuite(item.getClass().getName());
ts.addTest(new JMeterTest("GUIComponents1", item));
if (item instanceof TestBeanGUI) {
System.out.println("o.a.j.junit.JMeterTest INFO: JMeterGUIComponent: skipping some tests " + item.getClass().getName());
} else {
ts.addTest(new JMeterTest("GUIComponents2", item));
ts.addTest(new JMeterTest("saveLoadShouldKeepElementIntact", item));
ts.addTest(new JMeterTest("propertiesShouldNotBeInitializedToNullValues", item));
ts.addTest(new JMeterTest("elementShouldNotBeModifiedWithConfigureModify", item));
ts.addTest(new JMeterTest("runGUITitle", item));
}
suite.addTest(ts);
components.add(new GuiComponentHolder(item));
}
return suite;
}
/*
* Test GUI elements - create the suite of tests
*/
private static Test suiteBeanComponents() throws Throwable {
TestSuite suite = new TestSuite("BeanComponents");
for (Object o : getObjects(TestBean.class)) {
Class<?> c = o.getClass();
try {
JMeterGUIComponent item = new TestBeanGUI(c);
TestSuite ts = new TestSuite(item.getClass().getName());
ts.addTest(new JMeterTest("GUIComponents2", item));
ts.addTest(new JMeterTest("saveLoadShouldKeepElementIntact", item));
ts.addTest(new JMeterTest("propertiesShouldNotBeInitializedToNullValues", item));
ts.addTest(new JMeterTest("elementShouldNotBeModifiedWithConfigureModify", item));
ts.addTest(new JMeterTest("runGUITitle", item));
suite.addTest(ts);
} catch (IllegalArgumentException e) {
System.out.println("o.a.j.junit.JMeterTest Cannot create test for " + c.getName() + " " + e);
e.printStackTrace(System.out);
}
JMeterGUIComponent item = new TestBeanGUI(c);
components.add(new GuiComponentHolder(item));
}
return suite;
return components;
}
/*
* Test GUI elements - run the test
*/
public void runGUITitle() throws Exception {
@ParameterizedTest
@MethodSource("guiComponents")
public void runGUITitle(GuiComponentHolder componentHolder) throws Exception {
JMeterGUIComponent guiItem = componentHolder.getComponent();
if (!guiTitles.isEmpty()) {
String title = guiItem.getDocAnchor();
boolean ct = guiTitles.containsKey(title);
@ -337,7 +267,7 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
if (!ct) {
log.warn(s); // Record in log as well
}
assertTrue(s, ct);
assertTrue(ct, s);
}
}
}
@ -345,20 +275,22 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
/*
* Test GUI elements - run for all components
*/
public void GUIComponents1() throws Exception {
String name = guiItem.getClass().getName();
@ParameterizedTest
@MethodSource("guiComponents")
public void GUIComponents1(GuiComponentHolder componentHolder) throws Exception {
JMeterGUIComponent guiItem = componentHolder.getComponent();
String name = componentHolder.toString();
assertEquals("Name should be same as static label for " + name, guiItem.getStaticLabel(), guiItem.getName());
if (name.startsWith("org.apache.jmeter.examples.")){
if (guiItem.getClass().getName().startsWith("org.apache.jmeter.examples.")){
return;
}
if (!name.endsWith("TestBeanGUI")) {
if (guiItem.getClass() != TestBeanGUI.class) {
try {
String label = guiItem.getLabelResource();
assertNotNull("Label should not be null for "+name, label);
assertTrue("Label should not be empty for "+name, !label.isEmpty());
assertFalse("'" + label + "' should be in resource file for " + name, JMeterUtils.getResString(
label).startsWith(JMeterUtils.RES_KEY_PFX));
assertNotNull(label, () -> "Label should not be null for " + name);
assertFalse(label.isEmpty(), () -> "Label should not be empty for " + name);
assertFalse(JMeterUtils.getResString(
label).startsWith(JMeterUtils.RES_KEY_PFX), () -> "'" + label + "' should be in resource file for " + name);
} catch (UnsupportedOperationException uoe) {
log.warn("Class has not yet implemented getLabelResource {}", name);
}
@ -369,29 +301,32 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
/*
* Test GUI elements - not run for TestBeanGui items
*/
public void GUIComponents2() throws Exception {
@ParameterizedTest
@MethodSource("guiComponents")
public void GUIComponents2(GuiComponentHolder componentHolder) throws Exception {
JMeterGUIComponent guiItem = componentHolder.getComponent();
String name = guiItem.getClass().getName();
// TODO these assertions should be separate tests
TestElement el = guiItem.createTestElement();
assertNotNull(name + ".createTestElement should be non-null ", el);
assertEquals("GUI-CLASS: Failed on " + name, name, el.getPropertyAsString(TestElement.GUI_CLASS));
assertNotNull(el, name + ".createTestElement should be non-null ");
assertEquals(name, el.getPropertyAsString(TestElement.GUI_CLASS), "GUI-CLASS: Failed on " + name);
assertEquals("NAME: Failed on " + name, guiItem.getName(), el.getName());
assertEquals(guiItem.getName(), el.getName(), () -> "NAME: Failed on " + name);
if (StringUtils.isEmpty(el.getName())) {
fail("Name of the element must not be blank. Gui class " + name + ", element class " + el.getClass().getName());
}
assertEquals("TEST-CLASS: Failed on " + name, el.getClass().getName(), el
.getPropertyAsString(TestElement.TEST_CLASS));
assertEquals(el.getClass().getName(), el
.getPropertyAsString(TestElement.TEST_CLASS), "TEST-CLASS: Failed on " + name);
if (guiItem.getClass() != TestFragmentControllerGui.class) {
assertTrue("Should be enabled by default: " + name, el.isEnabled());
assertTrue(el.isEnabled(), "Should be enabled by default: " + name);
}
TestElement el2 = guiItem.createTestElement();
el.setName("hey, new name!:");
el.setProperty("NOT", "Shouldn't be here");
if (!(guiItem instanceof UnsharedComponent)) {
assertEquals("SHARED: Failed on " + name, "", el2.getPropertyAsString("NOT"));
assertEquals("", el2.getPropertyAsString("NOT"), () -> "SHARED: Failed on " + name);
}
log.debug("Saving element: {}", el.getClass());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@ -400,38 +335,44 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
bos.close();
el = (TestElement) SaveService.loadElement(bis);
bis.close();
assertNotNull("Load element failed on: "+name,el);
assertNotNull(el, "Load element failed on: "+name);
guiItem.configure(el);
assertEquals("CONFIGURE-TEST: Failed on " + name, el.getName(), guiItem.getName());
assertEquals(el.getName(), guiItem.getName(), () -> "CONFIGURE-TEST: Failed on " + name);
guiItem.modifyTestElement(el2);
assertEquals("Modify Test: Failed on " + name, "hey, new name!:", el2.getName());
assertEquals("hey, new name!:", el2.getName(), () -> "Modify Test: Failed on " + name);
}
public void propertiesShouldNotBeInitializedToNullValues() {
@ParameterizedTest
@MethodSource("guiComponents")
public void propertiesShouldNotBeInitializedToNullValues(GuiComponentHolder componentHolder) {
JMeterGUIComponent guiItem = componentHolder.getComponent();
TestElement el = guiItem.createTestElement();
assertFalse(
StringUtils.isEmpty(el.getName()),
() -> "Name should be non-blank for element " + componentHolder);
PropertyIterator it = el.propertyIterator();
while (it.hasNext()) {
JMeterProperty property = it.next();
if (property.getObjectValue() == null) {
fail(
"Property " + property.getName() + " is initialized with NULL OBJECT value in " +
" test element " + el + " created with " + guiItem + ".createTestElement() " +
"Please refrain from that since null properties consume memory, and they will be " +
"removed when saving and loading the plan anyway"
);
fail("Property " + property.getName() + " is initialized with NULL OBJECT value in " +
" test element " + el + " created with " + guiItem + ".createTestElement() " +
"Please refrain from that since null properties consume memory, and they will be " +
"removed when saving and loading the plan anyway");
}
if (property.getStringValue() == null) {
fail(
"Property " + property.getName() + " is initialized with NULL STRING value in " +
" test element " + el + " created with " + guiItem + ".createTestElement() " +
"Please refrain from that since null properties consume memory, and they will be " +
"removed when saving and loading the plan anyway"
);
fail("Property " + property.getName() + " is initialized with NULL STRING value in " +
" test element " + el + " created with " + guiItem + ".createTestElement() " +
"Please refrain from that since null properties consume memory, and they will be " +
"removed when saving and loading the plan anyway");
}
}
}
public void elementShouldNotBeModifiedWithConfigureModify() {
@ParameterizedTest
@MethodSource("guiComponents")
public void elementShouldNotBeModifiedWithConfigureModify(GuiComponentHolder componentHolder) {
JMeterGUIComponent guiItem = componentHolder.getComponent();
TestElement expected = guiItem.createTestElement();
TestElement actual = guiItem.createTestElement();
guiItem.configure(actual);
@ -440,9 +381,9 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
String actualStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString();
assertEquals(
"TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element)",
expectedStr,
actualStr
actualStr,
() -> "TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element)"
);
}
guiItem.modifyTestElement(actual);
@ -453,18 +394,34 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
actual.removeProperty(HTTPSamplerBaseSchema.INSTANCE.getArguments());
}
if (!Objects.equals(expected, actual)) {
if (guiItem.getClass() == JavaConfigGui.class || guiItem.getClass() == JavaTestSamplerGui.class) {
// TODO: JavaConfigGui modifies UI when classname combobox changes, and it causes inconsistency between the
// element state and the UI state. We ignore the discrepancy for now
return;
}
if (guiItem.getClass() == JUnitTestSamplerGui.class) {
// TODO: fix org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui.configure to use placeholders
return;
}
if (guiItem.getClass() == BackendListenerGui.class) {
// TODO: fix handling of default arguments in org.apache.jmeter.visualizers.backend.BackendListenerGui.actionPerformed
return;
}
boolean breakpointForDebugging = Objects.equals(expected, actual);
String expectedStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(expected).toString();
String actualStr = new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString();
assertEquals(
"TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element); gui.modifyTestElement(element)",
expectedStr,
actualStr
actualStr,
() -> "TestElement should not be modified by " + guiItem.getClass().getName() + ".configure(element); gui.modifyTestElement(element)"
);
}
}
public void saveLoadShouldKeepElementIntact() throws IOException {
@ParameterizedTest
@MethodSource("guiComponents")
public void saveLoadShouldKeepElementIntact(GuiComponentHolder componentHolder) throws IOException {
JMeterGUIComponent guiItem = componentHolder.getComponent();
TestElement expected = guiItem.createTestElement();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
SaveService.saveElement(expected, bos);
@ -481,47 +438,34 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
if (!Objects.equals(expected, actual)) {
boolean breakpointForDebugging = Objects.equals(expected, actual);
assertEquals(
"TestElement after 'save+load' should match the one created in GUI\n" +
"JMX is " + new String(serializedBytes, StandardCharsets.UTF_8),
expectedStr,
new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString()
);
new DslPrinterTraverser(DslPrinterTraverser.DetailLevel.ALL).append(actual).toString(),
"TestElement after 'save+load' should match the one created in GUI\n" +
"JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
fail("TestElement after 'save+load' should match the one created in GUI. " +
"DSL representation is the same, however TestElement#equals says the elements are different. " +
"DSL is " + expectedStr + "\n" +
"JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
}
assertEquals(
"TestElement.hashCode after 'save+load' should match the one created in GUI. " +
"DSL representation is the same, however TestElement#hashCode says the elements are different. " +
"DSL is " + expectedStr + "\n" +
"JMX is " + new String(serializedBytes, StandardCharsets.UTF_8),
expected.hashCode(),
actual.hashCode()
);
assertEquals(expected.hashCode(), actual.hashCode(), "TestElement.hashCode after 'save+load' should match the one created in GUI. " +
"DSL representation is the same, however TestElement#hashCode says the elements are different. " +
"DSL is " + expectedStr + "\n" +
"JMX is " + new String(serializedBytes, StandardCharsets.UTF_8));
}
/*
* Test serializable elements - create the suite of tests
*/
private static Test suiteSerializableElements() throws Throwable {
TestSuite suite = new TestSuite("SerializableElements");
for (Object o : getObjects(Serializable.class)) {
Serializable serObj = (Serializable) o;
if (serObj.getClass().getName().endsWith("_Stub")) {
continue;
}
TestSuite ts = new TestSuite(serObj.getClass().getName());
ts.addTest(new JMeterTest("runSerialTest", serObj));
suite.addTest(ts);
}
return suite;
static Stream<Serializable> serializableObjects() throws Throwable {
return getObjects(Serializable.class)
.stream()
.map(Serializable.class::cast)
.filter(o -> !o.getClass().getName().endsWith("_Stub"));
}
/*
* Test serializable elements - test the object
*/
public void runSerialTest() throws Exception {
@ParameterizedTest
@MethodSource("serializableObjects")
public void runSerialTest(Serializable serObj) throws Exception {
if (!(serObj instanceof Component)) {//
try {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
@ -531,8 +475,10 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()));
Object readObject = in.readObject();
in.close();
assertEquals("deserializing class: " + serObj.getClass().getName(), serObj.getClass(), readObject
.getClass());
assertEquals(
serObj.getClass(),
readObject.getClass(),
() -> "deserializing class: " + serObj.getClass().getName());
} catch (Exception e) {
fail("serialization of " + serObj.getClass().getName() + " failed: " + e);
}
@ -540,9 +486,10 @@ public class JMeterTest extends JMeterTestCaseJUnit implements Describable {
}
public void readAliases() throws Exception {
@BeforeAll
public static void readAliases() throws Exception {
nameMap = SaveService.loadProperties();
assertNotNull("SaveService nameMap (saveservice.properties) should not be null",nameMap);
assertNotNull(nameMap, "SaveService nameMap (saveservice.properties) should not be null");
}
private void checkElementAlias(Object item) {

99
src/dist-check/src/test/java/org/apache/jmeter/testbeans/gui/PackageTest.java
View File

@ -17,29 +17,34 @@
package org.apache.jmeter.testbeans.gui;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
import org.apache.jmeter.gui.util.JMeterMenuBar;
import org.apache.jmeter.junit.JMeterTestCaseJUnit;
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.reflect.ClassFinder;
import org.junit.runner.Describable;
import org.junit.runner.Description;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.parallel.Isolated;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import junit.framework.Test;
import junit.framework.TestSuite;
/*
* Find all beans out there and check their resource property files: - Check
* that non-default property files don't have any extra keys. - Check all
@ -49,45 +54,17 @@ import junit.framework.TestSuite;
* TODO: - Check property files don't have duplicate keys (is this important)
*
*/
public final class PackageTest extends JMeterTestCaseJUnit implements Describable {
@Isolated("modifies jmeter locale")
public final class PackageTest extends JMeterTestCase {
private static final Logger log = LoggerFactory.getLogger(PackageTest.class);
private static final Locale defaultLocale = new Locale("en","");
private final ResourceBundle defaultBundle;
private final Class<?> testBeanClass;
private final Locale testLocale;
private PackageTest(Class<?> testBeanClass, Locale locale, ResourceBundle defaultBundle) {
super(testBeanClass.getName() + " - " + locale.getLanguage() + " - " + locale.getCountry());
this.testBeanClass = testBeanClass;
this.testLocale = locale;
this.defaultBundle = defaultBundle;
}
private PackageTest(String name){
super(name);
this.testBeanClass = null;
this.testLocale = null;
this.defaultBundle = null;
}
@Override
public Description getDescription() {
return Description.createTestDescription(getClass(), getName() + " " + testLocale + " " + testBeanClass);
}
private BeanInfo beanInfo;
private ResourceBundle bundle;
@Override
public void setUp() {
if (testLocale == null) {
return;
}
public void setUp(Class<?> testBeanClass, Locale testLocale) {
JMeterUtils.setLocale(testLocale);
Introspector.flushFromCaches(testBeanClass);
try {
@ -102,25 +79,23 @@ public final class PackageTest extends JMeterTestCaseJUnit implements Describabl
}
}
@Override
@AfterEach
public void tearDown() {
JMeterUtils.setLocale(Locale.getDefault());
}
@Override
public void runTest() throws Throwable {
if (testLocale == null) {
super.runTest();
return;
}
@ParameterizedTest
@MethodSource("testBeans")
public void runTest(Class<?> testBeanClass, Locale testLocale, ResourceBundle defaultBundle) {
setUp(testBeanClass, testLocale);
if (bundle == defaultBundle) {
checkAllNecessaryKeysPresent();
checkAllNecessaryKeysPresent(bundle, defaultBundle);
} else {
checkNoInventedKeys();
checkNoInventedKeys(bundle, defaultBundle);
}
}
public void checkNoInventedKeys() {
public void checkNoInventedKeys(ResourceBundle bundle, ResourceBundle defaultBundle) {
// Check that all keys in the bundle are also in the default bundle:
for (Enumeration<String> keys = bundle.getKeys(); keys.hasMoreElements();) {
String key = keys.nextElement();
@ -129,7 +104,7 @@ public final class PackageTest extends JMeterTestCaseJUnit implements Describabl
}
}
public void checkAllNecessaryKeysPresent() {
public void checkAllNecessaryKeysPresent(ResourceBundle bundle, ResourceBundle defaultBundle) {
// Check that all necessary keys are there:
// displayName is always mandatory:
@ -168,15 +143,15 @@ public final class PackageTest extends JMeterTestCaseJUnit implements Describabl
}
}
public static Test suite() throws Exception {
TestSuite suite = new TestSuite("Bean Resource Test Suite");
public static Collection<Arguments> testBeans() throws Exception {
Collection<Arguments> suite = new ArrayList<>();
@SuppressWarnings("deprecation")
List<String> testBeanClassNames = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] { TestBean.class });
boolean errorDetected = false;
JMeterUtils.setLocale(defaultLocale);
String defaultLocaleId = defaultLocale.toString();
List<Class<?>> beansWithMissingBundle = new ArrayList<>();
for (String className : testBeanClassNames) {
Class<?> testBeanClass = Class.forName(className);
ResourceBundle defaultBundle;
@ -184,8 +159,7 @@ public final class PackageTest extends JMeterTestCaseJUnit implements Describabl
defaultBundle = (ResourceBundle) Introspector.getBeanInfo(testBeanClass).getBeanDescriptor().getValue(
GenericTestBeanCustomizer.RESOURCE_BUNDLE);
} catch (IntrospectionException e) {
log.error("Can't get beanInfo for {}", testBeanClass, e);
throw new Error(e.toString(), e); // Programming error. Don't continue.
throw new Error("Can't get beanInfo for " + testBeanClass, e);
}
if (defaultBundle == null) {
@ -193,12 +167,11 @@ public final class PackageTest extends JMeterTestCaseJUnit implements Describabl
log.info("No default bundle found for {}", className);
continue;
}
errorDetected=true;
log.error("No default bundle found for {} using {}", className, defaultLocale);
beansWithMissingBundle.add(testBeanClass);
continue;
}
suite.addTest(new PackageTest(testBeanClass, defaultLocale, defaultBundle));
suite.add(arguments(testBeanClass, defaultLocale, defaultBundle));
String[] languages = JMeterMenuBar.getLanguages();
for (String lang : languages) {
@ -208,25 +181,19 @@ public final class PackageTest extends JMeterTestCaseJUnit implements Describabl
if (locale.toString().equals(defaultLocaleId)) {
continue;
}
suite.addTest(new PackageTest(testBeanClass, locale, defaultBundle));
suite.add(arguments(testBeanClass, locale, defaultBundle));
} else if (language.length == 2) {
Locale locale = new Locale(language[0], language[1]);
if (locale.toString().equals(defaultLocaleId)) {
continue;
}
suite.addTest(new PackageTest(testBeanClass, locale, defaultBundle));
suite.add(arguments(testBeanClass, locale, defaultBundle));
}
}
}
if (errorDetected)
{
suite.addTest(new PackageTest("errorDetected"));
if (!beansWithMissingBundle.isEmpty()) {
fail("Default resource bundle not found for: " + beansWithMissingBundle);
}
return suite;
}
public void errorDetected(){
fail("One or more errors detected - see log file");
}
}

59
src/dist-check/src/test/java/org/apache/jmeter/testelement/TestElementTest.java
View File

@ -17,54 +17,40 @@
package org.apache.jmeter.testelement;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.io.Serializable;
import java.util.Collection;
import java.util.Properties;
import org.apache.jmeter.junit.JMeterTest;
import org.apache.jmeter.junit.JMeterTestCaseJUnit;
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.junit.runner.Describable;
import org.junit.runner.Description;
import junit.framework.Test;
import junit.framework.TestSuite;
public class TestElementTest extends JMeterTestCaseJUnit implements Describable {
private TestElement testItem;
public TestElementTest(String testName, TestElement te) {
super(testName);// Save the method name
testItem = te;
}
@Override
public Description getDescription() {
return Description.createTestDescription(getClass(), getName() + " " + testItem.getClass());
}
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
public class TestElementTest extends JMeterTestCase {
/*
* Test TestElements - create the suite
*/
public static Test suite() throws Throwable {
TestSuite suite = new TestSuite("TestElements");
for (Object o : JMeterTest.getObjects(TestElement.class)) {
TestElement item = (TestElement) o;
suite.addTest(new TestElementTest("runTestElement", item));
}
return suite;
public static Collection<Object> testElements() throws Throwable {
return JMeterTest.getObjects(TestElement.class);
}
/*
* Test TestElements - implement the test case
*/
public void runTestElement() throws Exception {
@ParameterizedTest
@MethodSource("testElements")
public void runTestElement(TestElement testItem) throws Exception {
checkElementCloning(testItem);
String name = testItem.getClass().getName();
assertTrue(name + " must implement Serializable", testItem instanceof Serializable);
assertInstanceOf(Serializable.class, testItem, () -> name + " must implement Serializable");
if (name.startsWith("org.apache.jmeter.examples.")){
return;
}
@ -82,20 +68,19 @@ public class TestElementTest extends JMeterTestCaseJUnit implements Describable
while (iter2.hasNext()) {
JMeterProperty item2 = iter2.next();
assertEquals(item2.getStringValue(), clonedItem.getProperty(item2.getName()).getStringValue());
assertTrue(item2 != clonedItem.getProperty(item2.getName()));
assertNotSame(item2, clonedItem.getProperty(item2.getName()));
}
}
private static void cloneTesting(TestElement item, TestElement clonedItem) {
assertTrue(item != clonedItem);
assertEquals("CLONE-SAME-CLASS: testing " + item.getClass().getName(), item.getClass().getName(), clonedItem
.getClass().getName());
assertNotSame(item, clonedItem, "Cloned element must be a different instance");
assertSame(item.getClass(), clonedItem.getClass(), "Cloned element should have the same class");
}
private void checkElementAlias(Object item) throws IOException {
//FIXME do it only once
Properties nameMap = SaveService.loadProperties();
assertNotNull("SaveService nameMap (saveservice.properties) should not be null",nameMap);
assertNotNull(nameMap, "SaveService nameMap (saveservice.properties) should not be null");
String name = item.getClass().getName();
boolean contains = nameMap.values().contains(name);

18
src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/NeedGuiTests.java → src/dist-check/src/test/kotlin/org/apache/jmeter/gui/GuiComponentHolder.kt
View File

@ -15,11 +15,21 @@
* limitations under the License.
*/
package org.apache.jmeter.junit.categories;
package org.apache.jmeter.gui
import org.apache.jmeter.testbeans.gui.TestBeanGUI
/**
* JUnit category marker for tests that could not run in headless mode
* Wraps a [JMeterGUIComponent] to provide a better [toString] method.
* See https://github.com/junit-team/junit5/issues/1154
*/
public interface NeedGuiTests {
// yeah !
class GuiComponentHolder(
val component: JMeterGUIComponent
) {
override fun toString(): String =
if (component is TestBeanGUI) {
component.toString()
} else {
"${component::class.java} $component"
}
}

102
src/functions/src/test/java/org/apache/jmeter/functions/PackageTest.java
View File

@ -18,33 +18,32 @@
package org.apache.jmeter.functions;
import static org.apache.jmeter.functions.FunctionTestHelper.makeParams;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.FileNotFoundException;
import org.apache.jmeter.junit.JMeterTestCaseJUnit;
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.BeanShellInterpreter;
import org.apache.jmeter.util.JMeterUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import junit.framework.Test;
import junit.framework.TestSuite;
/**
* Test cases for Functions
*/
public class PackageTest extends JMeterTestCaseJUnit {
public class PackageTest extends JMeterTestCase {
private static final Logger log = LoggerFactory.getLogger(PackageTest.class);
public PackageTest(String arg0) {
super(arg0);
}
// Create the BeanShell function and set its parameters.
private static BeanShell BSHFParams(String p1, String p2, String p3) throws Exception {
BeanShell bsh = new BeanShell();
@ -52,49 +51,20 @@ public class PackageTest extends JMeterTestCaseJUnit {
return bsh;
}
public static Test suite() throws Exception {
TestSuite allsuites = new TestSuite("Function PackageTest");
if (!BeanShellInterpreter.isInterpreterPresent()) {
final String msg = "BeanShell jar not present, tests ignored";
log.warn(msg);
} else {
TestSuite bsh = new TestSuite("BeanShell");
bsh.addTest(new PackageTest("BSH1"));
allsuites.addTest(bsh);
}
// Reset files
TestSuite xpath = new TestSuite("XPath");
xpath.addTest(new PackageTest("XPathtestColumns"));
xpath.addTest(new PackageTest("XPathtestDefault"));
xpath.addTest(new PackageTest("XPathtestNull"));
xpath.addTest(new PackageTest("XPathtestrowNum"));
xpath.addTest(new PackageTest("XPathEmpty"));
xpath.addTest(new PackageTest("XPathFile"));
xpath.addTest(new PackageTest("XPathFile1"));
xpath.addTest(new PackageTest("XPathFile2"));
xpath.addTest(new PackageTest("XPathNoFile"));
allsuites.addTest(xpath);
return allsuites;
}
private JMeterContext jmctx = null;
private JMeterVariables vars = null;
@Override
@BeforeEach
public void setUp() {
jmctx = JMeterContextService.getContext();
jmctx.setVariables(new JMeterVariables());
vars = jmctx.getVariables();
}
@Test
public void BSH1() throws Exception {
assumeTrue(BeanShellInterpreter.isInterpreterPresent(), "BeanShell interpreter is needed for the test");
String fn = "src/test/resources/org/apache/jmeter/functions/testfiles/BeanShellTest.bsh";
assertThrows(InvalidVariableException.class, () -> BSHFParams(null, null, null));
@ -160,10 +130,12 @@ public class PackageTest extends JMeterTestCaseJUnit {
// XPathFileContainer tests
@Test
public void XPathtestNull() throws Exception {
assertThrows(FileNotFoundException.class, () -> new XPathFileContainer("nosuch.xml", "/"));
}
@Test
public void XPathtestrowNum() throws Exception {
XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/target/@name");
assertNotNull(f);
@ -181,10 +153,11 @@ public class PackageTest extends JMeterTestCaseJUnit {
assertEquals(3, f.getNextRow());
}
@Test
public void XPathtestColumns() throws Exception {
XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/target/@name");
assertNotNull(f);
assertTrue("Not empty", f.size() > 0);
assertTrue(f.size() > 0, "Not empty");
int last = 0;
for (int i = 0; i < f.size(); i++) {
last = f.nextRow();
@ -194,33 +167,37 @@ public class PackageTest extends JMeterTestCaseJUnit {
}
@Test
public void XPathtestDefault() throws Exception {
XPathFileContainer f = new XPathFileContainer(getResourceFilePath("xpathfilecontainer.xml"), "/project/@default");
assertNotNull(f);
assertTrue("Not empty", f.size() > 0);
assertTrue(f.size() > 0, "Not empty");
assertEquals("install", f.getXPathString(0));
}
@Test
public void XPathEmpty() throws Exception{
XPath xp = setupXPath("","");
String val=xp.execute();
assertEquals("",val);
assertEquals("", val);
val=xp.execute();
assertEquals("",val);
assertEquals("", val);
val=xp.execute();
assertEquals("",val);
assertEquals("", val);
}
@Test
public void XPathNoFile() throws Exception{
XPath xp = setupXPath("no-such-file","");
String val=xp.execute();
assertEquals("",val); // TODO - should check that error has been logged...
assertEquals("", val); // TODO - should check that error has been logged...
}
@Test
public void XPathFile() throws Exception{
XPath xp = setupXPath("testfiles/XPathTest2.xml","note/body");
assertEquals("Don't forget me this weekend!",xp.execute());
assertEquals("Don't forget me this weekend!", xp.execute());
xp = setupXPath("testfiles/XPathTest2.xml","//note2");
assertEquals("", xp.execute());
@ -229,29 +206,30 @@ public class PackageTest extends JMeterTestCaseJUnit {
assertEquals("Tove", xp.execute());
}
@Test
public void XPathFile1() throws Exception{
XPath xp = setupXPath("testfiles/XPathTest.xml","//user/@username");
assertEquals("u1",xp.execute());
assertEquals("u2",xp.execute());
assertEquals("u3",xp.execute());
assertEquals("u4",xp.execute());
assertEquals("u5",xp.execute());
assertEquals("u1",xp.execute());
assertEquals("u1", xp.execute());
assertEquals("u2", xp.execute());
assertEquals("u3", xp.execute());
assertEquals("u4", xp.execute());
assertEquals("u5", xp.execute());
assertEquals("u1", xp.execute());
}
@Test
public void XPathFile2() throws Exception{
XPath xp1 = setupXPath("testfiles/XPathTest.xml","//user/@username");
XPath xp1a = setupXPath("testfiles/XPathTest.xml","//user/@username");
XPath xp2 = setupXPath("testfiles/XPathTest.xml","//user/@password");
XPath xp2a = setupXPath("testfiles/XPathTest.xml","//user/@password");
assertEquals("u1",xp1.execute());
assertEquals("p1",xp2.execute());
assertEquals("p2",xp2.execute());
assertEquals("u2",xp1a.execute());
assertEquals("u3",xp1.execute());
assertEquals("u4",xp1.execute());
assertEquals("p3",xp2a.execute());
assertEquals("u1", xp1.execute());
assertEquals("p1", xp2.execute());
assertEquals("p2", xp2.execute());
assertEquals("u2", xp1a.execute());
assertEquals("u3", xp1.execute());
assertEquals("u4", xp1.execute());
assertEquals("p3", xp2a.execute());
}
private XPath setupXPath(String file, String expr) throws Exception{

1
src/protocol/http/build.gradle.kts
View File

@ -16,6 +16,7 @@
*/
plugins {
id("java-test-fixtures")
id("build-logic.jvm-published-library")
}

94
src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
View File

@ -17,6 +17,10 @@
package org.apache.jmeter.protocol.http.control;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
@ -27,83 +31,25 @@ import java.net.URI;
import java.net.URL;
import org.apache.commons.io.IOUtils;
import org.apache.jmeter.junit.JMeterTestCaseJUnit;
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.jmeter.junit.JMeterTestCase;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Class for testing the HTTPMirrorThread, which is handling the
* incoming requests for the HTTPMirrorServer
*/
public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
public class TestHTTPMirrorThread extends JMeterTestCase {
/** The encodings used for http headers and control information */
private static final String ISO_8859_1 = "ISO-8859-1"; // $NON-NLS-1$
private static final String UTF_8 = "UTF-8"; // $NON-NLS-1$
private static final byte[] CRLF = { 0x0d, 0x0a };
private static final int HTTP_SERVER_PORT = 8181;
@RegisterExtension
private static final HttpMirrorServerExtension HTTP_MIRROR_SERVER = new HttpMirrorServerExtension(HTTP_SERVER_PORT);
public TestHTTPMirrorThread(String arg0) {
super(arg0);
}
// We need to use a suite in order to preserve the server across test cases
// With JUnit4 we could use before/after class annotations
public static Test suite(){
return new TestSetup(new TestSuite(TestHTTPMirrorThread.class)){
private HttpMirrorServer httpServer;
@Override
protected void setUp() throws Exception {
httpServer = startHttpMirror(HTTP_SERVER_PORT);
}
@Override
protected void tearDown() throws Exception {
// Shutdown the http server
httpServer.stopServer();
httpServer = null;
}
};
}
/**
* Utility method to handle starting the HttpMirrorServer for testing. Also
* used by TestHTTPSamplersAgainstHttpMirrorServer
*
* @param port
* port on which the mirror should be started
* @return newly created http mirror server
* @throws Exception
* if something fails
*/
public static HttpMirrorServer startHttpMirror(int port) throws Exception {
HttpMirrorServer server;
server = new HttpMirrorServer(port);
server.start();
Exception e;
for (int i=0; i < 10; i++) {// Wait up to 1 second
try {
Thread.sleep(100);
} catch (InterruptedException ignored) {
}
e = server.getException();
if (e != null) {// Already failed
throw new Exception("Could not start mirror server on port: "+port+". "+e);
}
if (server.isAlive()) {
break; // succeeded
}
}
if (!server.isAlive()){
throw new Exception("Could not start mirror server on port: "+port);
}
return server;
}
@Test
public void testGetRequest() throws Exception {
// Connect to the http server, and do a simple http get
Socket clientSocket = new Socket("localhost", HTTP_SERVER_PORT);
@ -183,6 +129,7 @@ public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
clientSocket.close();
}
@Test
public void testPostRequest() throws Exception {
// Connect to the http server, and do a simple http post
Socket clientSocket = new Socket("localhost", HTTP_SERVER_PORT);
@ -337,6 +284,7 @@ public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
}
*/
@Test
public void testStatus() throws Exception {
URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@ -346,6 +294,7 @@ public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
assertEquals("Temporary Redirect", conn.getResponseMessage());
}
@Test
public void testQueryStatus() throws Exception {
URL url = new URI("http",null,"localhost",HTTP_SERVER_PORT,"/path","status=303 See Other",null).toURL();
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@ -354,6 +303,7 @@ public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
assertEquals("See Other", conn.getResponseMessage());
}
@Test
public void testQueryRedirect() throws Exception {
URL url = new URI("http",null,"localhost",HTTP_SERVER_PORT,"/path","redirect=/a/b/c/d?q",null).toURL();
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@ -361,9 +311,10 @@ public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
conn.connect();
assertEquals(302, conn.getResponseCode());
assertEquals("Temporary Redirect", conn.getResponseMessage());
assertEquals("/a/b/c/d?q",conn.getHeaderField("Location"));
assertEquals("/a/b/c/d?q", conn.getHeaderField("Location"));
}
@Test
public void testHeaders() throws Exception {
URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@ -371,10 +322,11 @@ public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
conn.connect();
assertEquals(200, conn.getResponseCode());
assertEquals("OK", conn.getResponseMessage());
assertEquals("/abcd",conn.getHeaderField("Location"));
assertEquals("none",conn.getHeaderField("X-Dummy"));
assertEquals("/abcd", conn.getHeaderField("Location"));
assertEquals("none", conn.getHeaderField("X-Dummy"));
}
@Test
public void testResponseLength() throws Exception {
URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@ -385,14 +337,16 @@ public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
inputStream.close();
}
@Test
public void testCookie() throws Exception {
URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.addRequestProperty("X-SetCookie", "four=2*2");
conn.connect();
assertEquals("four=2*2",conn.getHeaderField("Set-Cookie"));
assertEquals("four=2*2", conn.getHeaderField("Set-Cookie"));
}
@Test
public void testSleep() throws Exception {
URL url = new URL("http", "localhost", HTTP_SERVER_PORT, "/");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@ -405,7 +359,7 @@ public class TestHTTPMirrorThread extends JMeterTestCaseJUnit {
while(inputStream.read() != -1) {} // CHECKSTYLE IGNORE EmptyBlock
inputStream.close();
final long elapsed = (System.nanoTime() - now)/200000L;
assertTrue("Expected > 180 " + elapsed, elapsed >= 180);
assertTrue(elapsed >= 180, "Expected > 180 " + elapsed);
}
/**

4
src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java
View File

@ -17,16 +17,12 @@
package org.apache.jmeter.protocol.http.control.gui;
import org.apache.jmeter.junit.categories.NeedGuiTests;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@Category(NeedGuiTests.class)
public class TestHttpTestSampleGui {
private HttpTestSampleGui gui;
@BeforeEach

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

@ -17,6 +17,10 @@
package org.apache.jmeter.protocol.http.parser;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@ -33,21 +37,25 @@ import java.util.List;
import java.util.Properties;
import java.util.Vector;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.apache.commons.io.IOUtils;
import org.apache.jmeter.junit.JMeterTestCaseJUnit;
import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.util.JMeterUtils;
import org.junit.runner.Describable;
import org.junit.runner.Description;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Isolated;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import junit.framework.TestSuite;
public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
@Isolated
public class TestHTMLParser extends JMeterTestCase {
private static final Logger log = LoggerFactory.getLogger(TestHTMLParser.class);
private static final String DEFAULT_UA = "Apache-HttpClient/4.2.6";
@ -60,31 +68,6 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
private static final String UA_IE9 = "Mozilla/5.0 (Windows; U; MSIE 9.0; WIndows NT 9.0; en-US))";
private static final String UA_IE10 = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)";
public TestHTMLParser(String arg0) {
super(arg0);
}
private String parserName;
private int testNumber = 0;
public TestHTMLParser(String name, int test) {
super(name);
testNumber = test;
}
public TestHTMLParser(String name, String parser, int test) {
super(name);
testNumber = test;
parserName = parser;
}
@Override
public Description getDescription() {
return Description.createTestDescription(getClass(), getName() + " " + testNumber + " " + parserName);
}
private static class StaticTestClass // Can't instantiate
{
private StaticTestClass() {
@ -148,6 +131,10 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
"org.apache.jmeter.protocol.http.parser.JsoupBasedHtmlParser"
};
static String[] getParsers() {
return PARSERS;
}
private static final TestData[] TESTS = new TestData[] {
new TestData("testfiles/HTMLParserTestCase.html",
"http://localhost/mydir/myfile.html",
@ -260,38 +247,21 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
UA_IE6)
};
public static junit.framework.Test suite() {
TestSuite suite = new TestSuite("TestHTMLParser");
suite.addTest(new TestHTMLParser("testDefaultParser"));
suite.addTest(new TestHTMLParser("testParserDefault"));
suite.addTest(new TestHTMLParser("testParserMissing"));
suite.addTest(new TestHTMLParser("testNotParser"));
suite.addTest(new TestHTMLParser("testNotCreatable"));
suite.addTest(new TestHTMLParser("testNotCreatableStatic"));
for (String parser : PARSERS) {
TestSuite ps = new TestSuite(parser);// Identify subtests
ps.addTest(new TestHTMLParser("testParserProperty", parser, 0));
for (int j = 0; j < TESTS.length; j++) {
TestSuite ts = new TestSuite(TESTS[j].fileName);
ts.addTest(new TestHTMLParser("testParserSet", parser, j));
ts.addTest(new TestHTMLParser("testParserList", parser, j));
ps.addTest(ts);
}
suite.addTest(ps);
}
static Stream<Arguments> parsersAndTestNumbers() {
return Stream.of(PARSERS)
.flatMap(parser -> IntStream.range(0, TESTS.length)
.mapToObj(testNumber -> arguments(parser, testNumber)));
}
TestSuite ps = new TestSuite(DEFAULT_JMETER_PARSER+"_conditional_comments");// Identify subtests
for (int j = 0; j < SPECIFIC_PARSER_TESTS.length; j++) {
TestSuite ts = new TestSuite(SPECIFIC_PARSER_TESTS[j].fileName);
ts.addTest(new TestHTMLParser("testSpecificParserList", DEFAULT_JMETER_PARSER, j));
ps.addTest(ts);
}
suite.addTest(ps);
return suite;
static Stream<Arguments> specificParserTests() {
return IntStream.range(0, SPECIFIC_PARSER_TESTS.length)
.mapToObj(testNumber -> arguments(DEFAULT_JMETER_PARSER, testNumber));
}
// Test if can instantiate parser using property name
public void testParserProperty() throws Exception {
@ParameterizedTest
@MethodSource("getParsers")
public void testParserProperty(String parserName) throws Exception {
Properties p = JMeterUtils.getJMeterProperties();
if (p == null) {
p = JMeterUtils.getProperties("jmeter.properties");
@ -300,14 +270,17 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
BaseParser.getParser(p.getProperty(HTMLParser.PARSER_CLASSNAME));
}
@Test
public void testDefaultParser() throws Exception {
BaseParser.getParser(JMeterUtils.getPropDefault(HTMLParser.PARSER_CLASSNAME, HTMLParser.DEFAULT_PARSER));
}
@Test
public void testParserDefault() throws Exception {
BaseParser.getParser(HTMLParser.DEFAULT_PARSER);
}
@Test
public void testParserMissing() throws Exception {
try {
BaseParser.getParser("no.such.parser");
@ -319,6 +292,7 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
}
}
@Test
public void testNotParser() throws Exception {
try {
HTMLParser.getParser("java.lang.String");
@ -331,6 +305,7 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
}
}
@Test
public void testNotCreatable() throws Exception {
try {
HTMLParser.getParser(TestClass.class.getName());
@ -343,6 +318,7 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
}
}
@Test
public void testNotCreatableStatic() throws Exception {
try {
HTMLParser.getParser(StaticTestClass.class.getName());
@ -358,20 +334,26 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
}
}
public void testParserSet() throws Exception {
@ParameterizedTest
@MethodSource("parsersAndTestNumbers")
public void testParserSet(String parserName, int testNumber) throws Exception {
HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseUrl, TESTS[testNumber].expectedSet, null,
false, TESTS[testNumber].userAgent);
}
@SuppressWarnings("JdkObsolete")
public void testParserList() throws Exception {
@ParameterizedTest
@MethodSource("parsersAndTestNumbers")
public void testParserList(String parserName, int testNumber) throws Exception {
HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseUrl, TESTS[testNumber].expectedList,
new Vector<>(), true, TESTS[testNumber].userAgent);
}
public void testSpecificParserList() throws Exception {
@ParameterizedTest
@MethodSource("specificParserTests")
public void testSpecificParserList(String parserName, int testNumber) throws Exception {
HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
filetest(p, SPECIFIC_PARSER_TESTS[testNumber].fileName,
SPECIFIC_PARSER_TESTS[testNumber].baseUrl,
@ -407,7 +389,7 @@ public class TestHTMLParser extends JMeterTestCaseJUnit implements Describable {
Collections.sort(actual);
}
assertEquals("userAgent=" + userAgent + ", fname=" + fname + ", parserName=" + parserName, expected, actual);
assertEquals(expected, actual, "userAgent=" + userAgent + ", fname=" + fname + ", parserName=" + parserName);
}
// Get expected results as a List

3
src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/PackageTest.java
View File

@ -20,14 +20,11 @@ package org.apache.jmeter.protocol.http.sampler;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.junit.categories.NeedGuiTests;
import org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui;
import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Test;
@Category(NeedGuiTests.class)
public class PackageTest {
@Test

4
src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/sampler/SamplingNamingTest.java
View File

@ -26,7 +26,7 @@ import org.apache.jmeter.junit.JMeterTestCase;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jorphan.test.JMeterSerialTest;
import org.junit.Ignore;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@ -42,7 +42,7 @@ class SamplingNamingTest extends JMeterTestCase implements JMeterSerialTest {
}
@ParameterizedTest(name="Run {index}: implementation:{0}")
@Ignore(value = "Test produces: We should have at least one sample result, we had none too often")
@Disabled(value = "Test produces: We should have at least one sample result, we had none too often")
@MethodSource("getImplementations")
void testBug63364(String implementation) {
TestPlan plan = new TestPlan();

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

@ -17,23 +17,27 @@
package org.apache.jmeter.protocol.http.sampler;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Locale;
import java.util.regex.Matcher;
import org.apache.jmeter.engine.util.ValueReplacer;
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.junit.JMeterTestCase;
import org.apache.jmeter.protocol.http.control.HttpMirrorServerExtension;
import org.apache.jmeter.protocol.http.util.EncoderCache;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.protocol.http.util.HTTPConstants;
@ -47,20 +51,19 @@ import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.PatternMatcherInput;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
import org.junit.Assert;
import org.junit.runner.Describable;
import org.junit.runner.Description;
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
/**
* Class for performing actual samples for HTTPSampler and HTTPSampler2.
* The samples are executed against the HttpMirrorServer, which is
* started when the unit tests are executed.
*/
public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit implements Describable {
public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCase {
private static final java.util.regex.Pattern EMPTY_LINE_PATTERN = java.util.regex.Pattern.compile("^$",
java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.MULTILINE);
private static final int HTTP_SAMPLER = 0;
@ -76,124 +79,98 @@ public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit
private static final byte[] CRLF = {0x0d, 0x0A};
private static final int MIRROR_PORT = 8182; // Different from TestHTTPMirrorThread port and standard mirror server
@RegisterExtension
private static final HttpMirrorServerExtension HTTP_MIRROR_SERVER = new HttpMirrorServerExtension(MIRROR_PORT);
private static byte[] TEST_FILE_CONTENT;
private static File temporaryFile;
@TempDir
private static File tempDirectory;
private final int item;
private static File temporaryFile;
private static final boolean USE_JAVA_REGEX = !JMeterUtils.getPropDefault(
"jmeter.regex.engine", "oro").equalsIgnoreCase("oro");
public TestHTTPSamplersAgainstHttpMirrorServer(String arg0) {
super(arg0);
this.item = -1;
@BeforeAll
static void setup() throws IOException {
// Create the test file content
TEST_FILE_CONTENT = "some foo content &?=01234+56789-|\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85"
.getBytes(StandardCharsets.UTF_8);
// create a temporary file to make sure we always have a file to give to the PostWriter
// Wherever we are or whatever the current path is.
temporaryFile = new File(tempDirectory, "TestHTTPSamplersAgainstHttpMirrorServer.tmp");
Files.write(temporaryFile.toPath(), TEST_FILE_CONTENT);
}
// additional ctor for processing tests which use int parameters
public TestHTTPSamplersAgainstHttpMirrorServer(String arg0, int item) {
super(arg0);
this.item = item;
}
@Override
public Description getDescription() {
return Description.createTestDescription(getClass(), getName() + " " + item);
}
// This is used to emulate @before class and @after class
public static Test suite() {
final TestSuite testSuite = new TestSuite(TestHTTPSamplersAgainstHttpMirrorServer.class);
// Add parameterised tests. For simplicity we assume each has cases 0-10
for (int i = 0; i < 11; i++) {
testSuite.addTest(new TestHTTPSamplersAgainstHttpMirrorServer("itemised_testGetRequest_Parameters", i));
testSuite.addTest(new TestHTTPSamplersAgainstHttpMirrorServer("itemised_testGetRequest_Parameters3", i));
testSuite.addTest(new TestHTTPSamplersAgainstHttpMirrorServer("itemised_testPostRequest_UrlEncoded", i));
testSuite.addTest(new TestHTTPSamplersAgainstHttpMirrorServer("itemised_testPostRequest_UrlEncoded3", i));
}
return new TestSetup(testSuite) {
private HttpMirrorServer httpServer;
@Override
protected void setUp() throws Exception {
httpServer = TestHTTPMirrorThread.startHttpMirror(MIRROR_PORT);
// Create the test file content
TEST_FILE_CONTENT = "some foo content &?=01234+56789-|\u2aa1\u266a\u0153\u20a1\u0115\u0364\u00c5\u2052\uc385%C3%85"
.getBytes(StandardCharsets.UTF_8);
// create a temporary file to make sure we always have a file to give to the PostWriter
// Wherever we are or whatever the current path is.
temporaryFile = File.createTempFile("TestHTTPSamplersAgainstHttpMirrorServer", "tmp");
OutputStream output = new FileOutputStream(temporaryFile);
output.write(TEST_FILE_CONTENT);
output.flush();
output.close();
}
@Override
protected void tearDown() {
// Shutdown mirror server
httpServer.stopServer();
httpServer = null;
if (!temporaryFile.delete()) {
Assert.fail("Could not delete file:" + temporaryFile.getAbsolutePath());
}
}
};
}
public void itemised_testPostRequest_UrlEncoded() throws Exception {
@ParameterizedTest
@ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
public void itemised_testPostRequest_UrlEncoded(int item) throws Exception {
testPostRequest_UrlEncoded(HTTP_SAMPLER, ISO_8859_1, item);
}
public void itemised_testPostRequest_UrlEncoded3() throws Exception {
@ParameterizedTest
@ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
public void itemised_testPostRequest_UrlEncoded3(int item) throws Exception {
testPostRequest_UrlEncoded(HTTP_SAMPLER3, US_ASCII, item);
}
@Test
public void testPostRequest_FormMultipart_0() throws Exception {
testPostRequest_FormMultipart(HTTP_SAMPLER);
}
@Test
public void testPostRequest_FormMultipart3() throws Exception {
// see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
testPostRequest_FormMultipart(HTTP_SAMPLER3);
}
@Test
public void testPostRequest_FileUpload() throws Exception {
testPostRequest_FileUpload(HTTP_SAMPLER);
}
@Test
public void testPostRequest_FileUpload3() throws Exception {
// see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
testPostRequest_FileUpload(HTTP_SAMPLER3);
}
@Test
public void testPostRequest_BodyFromParameterValues() throws Exception {
testPostRequest_BodyFromParameterValues(HTTP_SAMPLER, ISO_8859_1);
}
@Test
public void testPostRequest_BodyFromParameterValues3() throws Exception {
testPostRequest_BodyFromParameterValues(HTTP_SAMPLER3, US_ASCII);
}
@Test
public void testGetRequest() throws Exception {
testGetRequest(HTTP_SAMPLER);
}
@Test
public void testGetRequest3() throws Exception {
testGetRequest(HTTP_SAMPLER3);
}
public void itemised_testGetRequest_Parameters() throws Exception {
@ParameterizedTest
@ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
public void itemised_testGetRequest_Parameters(int item) throws Exception {
testGetRequest_Parameters(HTTP_SAMPLER, item);
}
public void itemised_testGetRequest_Parameters3() throws Exception {
@ParameterizedTest
@ValueSource(ints = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
public void itemised_testGetRequest_Parameters3(int item) throws Exception {
testGetRequest_Parameters(HTTP_SAMPLER3, item);
}
@Test
public void testPutRequest_BodyFromParameterValues3() throws Exception {
testPutRequest_BodyFromParameterValues(HTTP_SAMPLER3, US_ASCII);
}
@ -948,7 +925,7 @@ public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit
// Check response headers
checkHeaderContentType(headersSent, "multipart/form-data" + "; boundary=" + boundaryString);
byte[] bodySent = getBodySent(res.getResponseData());
assertNotNull("Sent body should not be null", bodySent);
assertNotNull(bodySent, "Sent body should not be null");
// Check post body which was sent to the mirror server, and
// sent back by the mirror server
checkArraysHaveSameContent(expectedPostBody, bodySent, contentEncoding, res);
@ -1177,10 +1154,10 @@ public class TestHTTPSamplersAgainstHttpMirrorServer extends JMeterTestCaseJUnit
private void checkHeaderContentType(String requestHeaders, String contentType) {
if (contentType == null) {
boolean isPresent = checkRegularExpression(requestHeaders, HTTPConstants.HEADER_CONTENT_TYPE + ": .*");
assertFalse("Expected no Content-Type in request headers:\n" + requestHeaders, isPresent);
assertFalse(isPresent, "Expected no Content-Type in request headers:\n" + requestHeaders);
} else {
boolean typeOK = isInRequestHeaders(requestHeaders, HTTPConstants.HEADER_CONTENT_TYPE, contentType);
assertTrue("Expected type:" + contentType + " in request headers:\n" + requestHeaders, typeOK);
assertTrue(typeOK, "Expected type:" + contentType + " in request headers:\n" + requestHeaders);
}
}

89
src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpMirrorServerExtension.kt Normal file
View File

@ -0,0 +1,89 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to you under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.jmeter.protocol.http.control
import org.junit.jupiter.api.extension.AfterAllCallback
import org.junit.jupiter.api.extension.BeforeAllCallback
import org.junit.jupiter.api.extension.ExtensionContext
/**
* JUnit 5 extension to start and stop [HttpMirrorServer] for testing.
* Typical usage:
*
* ```java
* @RegisterExtension
* HttpMirrorServerExtension httpMirrorServer = new HttpMirrorServerExtension(8181);
* ```
*
* See https://junit.org/junit5/docs/current/user-guide/#extensions-registration-programmatic
*/
public class HttpMirrorServerExtension(
val serverPort: Int
) : BeforeAllCallback, AfterAllCallback {
private val NAMESPACE =
ExtensionContext.Namespace.create(HttpMirrorServerExtension::class.java)
/**
* Utility method to handle starting the [HttpMirrorServer] for testing.
*
* @param port
* port on which the mirror should be started
* @return newly created http mirror server
* @throws Exception
* if something fails
*/
@Throws(InterruptedException::class)
fun startHttpMirror(): HttpMirrorServer {
val server = HttpMirrorServer(serverPort)
server.start()
for (i in 0..9) { // Wait up to 1 second
Thread.sleep(100)
server.exception?.let { e ->
throw Exception("Could not start mirror server on port: $serverPort", e)
}
if (server.isAlive) {
break // succeeded
}
}
if (!server.isAlive) {
throw Exception("Could not start mirror server on port: $serverPort")
}
return server
}
private fun getStore(context: ExtensionContext): ExtensionContext.Store {
return context.getStore(NAMESPACE)
}
private fun getServer(context: ExtensionContext): HttpMirrorServer? {
return getStore(context).get("server", HttpMirrorServer::class.java)
}
override fun beforeAll(context: ExtensionContext) {
val server = startHttpMirror()
getStore(context).put("server", server)
}
override fun afterAll(context: ExtensionContext) {
getServer(context)?.let {
it.stopServer()
it.interrupt()
}
}
}

64
src/protocol/jms/src/test/java/org/apache/jmeter/protocol/jms/sampler/render/BinaryMessageRendererTest.java
View File

@ -20,8 +20,6 @@ package org.apache.jmeter.protocol.jms.sampler.render;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause;
import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ -30,13 +28,75 @@ import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import org.apache.jmeter.threads.JMeterVariables;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.MatcherAssert;
import org.hamcrest.TypeSafeMatcher;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
public class BinaryMessageRendererTest extends MessageRendererTest<byte[]> {
public static class ThrowableMessageMatcher<T extends Throwable> extends
TypeSafeMatcher<T> {
private final Matcher<String> matcher;
public ThrowableMessageMatcher(Matcher<String> matcher) {
this.matcher = matcher;
}
public void describeTo(Description description) {
description.appendText("exception with message ");
description.appendDescriptionOf(matcher);
}
@Override
protected boolean matchesSafely(T item) {
return matcher.matches(item.getMessage());
}
@Override
protected void describeMismatchSafely(T item, Description description) {
description.appendText("message ");
matcher.describeMismatch(item.getMessage(), description);
}
}
public static class ThrowableCauseMatcher<T extends Throwable> extends
TypeSafeMatcher<T> {
private final Matcher<?> causeMatcher;
public ThrowableCauseMatcher(Matcher<?> causeMatcher) {
this.causeMatcher = causeMatcher;
}
public void describeTo(Description description) {
description.appendText("exception with cause ");
description.appendDescriptionOf(causeMatcher);
}
@Override
protected boolean matchesSafely(T item) {
return causeMatcher.matches(item.getCause());
}
@Override
protected void describeMismatchSafely(T item, Description description) {
description.appendText("cause ");
causeMatcher.describeMismatch(item.getCause(), description);
}
}
public static <T extends Throwable> Matcher<T> hasMessage(final Matcher<String> matcher) {
return new ThrowableMessageMatcher<T>(matcher);
}
public static <T extends Throwable> Matcher<T> hasCause(final Matcher<?> matcher) {
return new ThrowableCauseMatcher<T>(matcher);
}
private BinaryMessageRenderer render = RendererFactory.getInstance().getBinary();