test: use <> diamond operator in Java tests

apache · Jun 16, 2023 · 4e219c0 · 4e219c0
1 parent f7e9673
commit 4e219c0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 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
@@ -74,15 +74,15 @@ public void testNormalizeListWithEmptyList() {
 
     @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));
     }
 
     @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
@@ -35,7 +35,7 @@ public void testBug62281MapProperty() {
 
     @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
@@ -80,7 +80,7 @@ public void testBug63033() throws SaxonApiException {
     @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
@@ -368,15 +368,15 @@ public void testParserSet() throws Exception {
     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 {
         HTMLParser p = (HTMLParser) BaseParser.getParser(parserName);
         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/...protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java b/...protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -646,8 +646,8 @@ private HTTPSamplerBase getSamplerForRequest(String url, String request, String
         }
         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);
         }