This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 4e219c0635 test: use <> diamond operator in Java tests
4e219c0635 is described below
commit 4e219c063556c3d60d8008a00dfaf5194be49815
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Fri Jun 16 10:10:03 2023 +0300
test: use <> diamond operator in Java tests
---
.../org/apache/jmeter/testelement/property/AbstractPropertyTest.java | 4 ++--
.../java/org/apache/jmeter/testelement/property/MapPropertyTest.java | 2 +-
src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java | 2 +-
.../java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java | 4 ++--
.../org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
index 9d42415128..f9d3d008fc 100644
---
a/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
+++
b/src/core/src/test/java/org/apache/jmeter/testelement/property/AbstractPropertyTest.java
@@ -74,7 +74,7 @@ public class AbstractPropertyTest {
@Test
public void testNormalizeListWithEmptyArrayList() {
- Collection<JMeterProperty> emptyCollection = new
ArrayList<JMeterProperty>();
+ Collection<JMeterProperty> emptyCollection = new ArrayList<>();
Collection<JMeterProperty> newCollection =
dummyProperty.normalizeList(emptyCollection);
assertThat(newCollection,
CoreMatchers.not(CoreMatchers.sameInstance(emptyCollection)));
assertThat(newCollection, CoreMatchers.equalTo(emptyCollection));
@@ -82,7 +82,7 @@ public class AbstractPropertyTest {
@Test
public void testNormalizeListWithFilledArrayList() {
- List<JMeterProperty> filledCollection = new
ArrayList<JMeterProperty>();
+ List<JMeterProperty> filledCollection = new ArrayList<>();
filledCollection.add(new StringProperty("key", "value"));
Collection<JMeterProperty> newCollection =
dummyProperty.normalizeList(filledCollection);
assertThat(newCollection,
CoreMatchers.not(CoreMatchers.sameInstance(filledCollection)));
diff --git
a/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
index 3355f1b13c..d229f7619c 100644
---
a/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
+++
b/src/core/src/test/java/org/apache/jmeter/testelement/property/MapPropertyTest.java
@@ -35,7 +35,7 @@ public class MapPropertyTest {
@Test
public void testGetPropertyTypeOfEmptyMap() {
- MapProperty props = new MapProperty("foo", new HashMap<Object,
Object>());
+ MapProperty props = new MapProperty("foo", new HashMap<>());
assertThat(props.getPropertyType(),
CoreMatchers.equalTo(NullProperty.class));
}
diff --git a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
index d916487f10..5a719c81b2 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/XPathUtilTest.java
@@ -80,7 +80,7 @@ public class XPathUtilTest {
@Test
public void testputValuesForXPathInListUsingSaxon() throws
SaxonApiException, FactoryConfigurationError{
String xPathQuery="//Employees/Employee/role";
- ArrayList<String> matchStrings = new ArrayList<String>();
+ ArrayList<String> matchStrings = new ArrayList<>();
boolean fragment = false;
String namespaces = "age=http://www.w3.org/2003/01/geo/wgs84_pos#";;
int matchNumber = 3;
diff --git
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
index e47a9a1f94..b76ebc3f7c 100644
---
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
+++
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
@@ -368,7 +368,7 @@ public class TestHTMLParser extends JMeterTestCaseJUnit
implements Describable {
public void testParserList() throws Exception {
HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
filetest(p, TESTS[testNumber].fileName, TESTS[testNumber].baseUrl,
TESTS[testNumber].expectedList,
- new Vector<URLString>(), true, TESTS[testNumber].userAgent);
+ new Vector<>(), true, TESTS[testNumber].userAgent);
}
public void testSpecificParserList() throws Exception {
@@ -376,7 +376,7 @@ public class TestHTMLParser extends JMeterTestCaseJUnit
implements Describable {
filetest(p, SPECIFIC_PARSER_TESTS[testNumber].fileName,
SPECIFIC_PARSER_TESTS[testNumber].baseUrl,
SPECIFIC_PARSER_TESTS[testNumber].expectedList,
- new ArrayList<URLString>(), true,
+ new ArrayList<>(), true,
SPECIFIC_PARSER_TESTS[testNumber].userAgent);
}
diff --git
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index bbfc09e3d2..cc4e609cab 100644
---
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -646,8 +646,8 @@ public class TestHttpRequestHdr extends JMeterTestCase {
}
req.parse(bis);
bis.close();
- Map<String, String> pageEncodings = Collections.synchronizedMap(new
HashMap<String, String>());
- Map<String, String> formEncodings = Collections.synchronizedMap(new
HashMap<String, String>());
+ Map<String, String> pageEncodings = Collections.synchronizedMap(new
HashMap<>());
+ Map<String, String> formEncodings = Collections.synchronizedMap(new
HashMap<>());
if(url != null && contentEncoding != null) {
pageEncodings.put(url, contentEncoding);
}
