JUnit Jupiter best practices & tests cleanup (#91)

Co-authored-by: Moderne <[email protected]>

Author: slachiewicz

src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java

@@ -1,24 +1,6 @@
 packageorg.codehaus.plexus.interpolation;
 
-/*
- * Copyright 2007 The Codehaus Foundation.
- *
- * Licensed 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.
- */
-
-importjava.io.IOException;
 importjava.util.HashMap;
-importjava.util.Map;
 
 importorg.codehaus.plexus.interpolation.os.OperatingSystemUtils;
 importorg.junit.jupiter.api.BeforeEach;
@@ -28,21 +10,19 @@
 importstaticorg.junit.jupiter.api.Assertions.assertNotNull;
 importstaticorg.junit.jupiter.api.Assertions.assertNull;
 
-publicclassEnvarBasedValueSourceTest{
+classEnvarBasedValueSourceTest{
 
 @BeforeEach
-publicvoidsetUp(){
+voidsetUp(){
 EnvarBasedValueSource.resetStatics();
  }
 
 @Test
-voidtestNoArgConstructorIsCaseSensitive() throwsIOException{
-OperatingSystemUtils.setEnvVarSource(newOperatingSystemUtils.EnvVarSource(){
-publicMap<String, String> getEnvMap(){
-HashMap<String, String> map = newHashMap<String, String>();
-map.put("aVariable", "variable");
-returnmap;
- }
+voidnoArgConstructorIsCaseSensitive() throwsException{
+OperatingSystemUtils.setEnvVarSource(() ->{
+HashMap<String, String> map = newHashMap<>();
+map.put("aVariable", "variable");
+returnmap;
  });
 
 EnvarBasedValueSourcesource = newEnvarBasedValueSource();
@@ -54,13 +34,11 @@ public Map<String, String> getEnvMap(){
  }
 
 @Test
-voidtestCaseInsensitive() throwsIOException{
-OperatingSystemUtils.setEnvVarSource(newOperatingSystemUtils.EnvVarSource(){
-publicMap<String, String> getEnvMap(){
-HashMap<String, String> map = newHashMap<String, String>();
-map.put("aVariable", "variable");
-returnmap;
- }
+voidcaseInsensitive() throwsException{
+OperatingSystemUtils.setEnvVarSource(() ->{
+HashMap<String, String> map = newHashMap<>();
+map.put("aVariable", "variable");
+returnmap;
  });
 
 EnvarBasedValueSourcesource = newEnvarBasedValueSource(false);
@@ -72,7 +50,7 @@ public Map<String, String> getEnvMap(){
  }
 
 @Test
-voidtestGetRealEnvironmentVariable() throwsIOException{
+voidgetRealEnvironmentVariable() throwsException{
 OperatingSystemUtils.setEnvVarSource(newOperatingSystemUtils.DefaultEnvVarSource());
 
 EnvarBasedValueSourcesource = newEnvarBasedValueSource();

src/test/java/org/codehaus/plexus/interpolation/FeedbackingValueSourceTest.java

@@ -23,18 +23,18 @@
 importstaticorg.junit.jupiter.api.Assertions.assertNull;
 importstaticorg.junit.jupiter.api.Assertions.assertTrue;
 
-publicclassFeedbackingValueSourceTest{
+classFeedbackingValueSourceTest{
 
 @Test
-publicvoidtestStandalone(){
+voidstandalone(){
 ValueSourcevalueSource = newFeedbackingValueSource();
 assertNull(valueSource.getValue("test"));
 assertEquals(1, valueSource.getFeedback().size());
 assertEquals("'test' not resolved", valueSource.getFeedback().iterator().next());
  }
 
 @Test
-publicvoidtestAfterResolvedExpression() throwsInterpolationException{
+voidafterResolvedExpression() throwsException{
 StringSearchInterpolatorinterpolator = newStringSearchInterpolator();
 interpolator.addValueSource(newMapBasedValueSource(singletonMap("key", "val")));
 interpolator.addValueSource(newFeedbackingValueSource());
@@ -43,7 +43,7 @@ public void testAfterResolvedExpression() throws InterpolationException{
  }
 
 @Test
-publicvoidtestBeforeResolvedExpression() throwsInterpolationException{
+voidbeforeResolvedExpression() throwsException{
 StringSearchInterpolatorinterpolator = newStringSearchInterpolator();
 interpolator.addValueSource(newFeedbackingValueSource("Resolving ${expression}"));
 interpolator.addValueSource(newMapBasedValueSource(singletonMap("key", "val")));
@@ -53,7 +53,7 @@ public void testBeforeResolvedExpression() throws InterpolationException{
  }
 
 @Test
-publicvoidtestAfterNotResolvedExpression() throwsInterpolationException{
+voidafterNotResolvedExpression() throwsException{
 StringSearchInterpolatorinterpolator = newStringSearchInterpolator();
 interpolator.addValueSource(newMapBasedValueSource(singletonMap("key", "val")));
 interpolator.addValueSource(newFeedbackingValueSource());

src/test/java/org/codehaus/plexus/interpolation/InterpolatorFilterReaderTest.java

@@ -41,14 +41,14 @@
  * @author cstamas
  *
  */
-publicclassInterpolatorFilterReaderTest{
+classInterpolatorFilterReaderTest{
 /*
  * Added and commented by jdcasey@03-Feb-2005 because it is a bug in the InterpolationFilterReader.
  * kenneyw@15-04-2005 fixed the bug.
  */
 @Test
-publicvoidtestShouldNotInterpolateExpressionAtEndOfDataWithInvalidEndToken() throwsException{
-Mapm = newHashMap();
+voidshouldNotInterpolateExpressionAtEndOfDataWithInvalidEndToken() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("test", "TestValue");
 
 StringtestStr = "This is a ${test";
@@ -60,8 +60,8 @@ public void testShouldNotInterpolateExpressionAtEndOfDataWithInvalidEndToken() t
  * kenneyw@14-04-2005 Added test to check above fix.
  */
 @Test
-publicvoidtestShouldNotInterpolateExpressionWithMissingEndToken() throwsException{
-Mapm = newHashMap();
+voidshouldNotInterpolateExpressionWithMissingEndToken() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("test", "TestValue");
 
 StringtestStr = "This is a ${test, really";
@@ -70,8 +70,8 @@ public void testShouldNotInterpolateExpressionWithMissingEndToken() throws Excep
  }
 
 @Test
-publicvoidtestShouldNotInterpolateWithMalformedStartToken() throwsException{
-Mapm = newHashMap();
+voidshouldNotInterpolateWithMalformedStartToken() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("test", "testValue");
 
 Stringfoo = "This is a $!test} again";
@@ -80,8 +80,8 @@ public void testShouldNotInterpolateWithMalformedStartToken() throws Exception{
  }
 
 @Test
-publicvoidtestShouldNotInterpolateWithMalformedEndToken() throwsException{
-Mapm = newHashMap();
+voidshouldNotInterpolateWithMalformedEndToken() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("test", "testValue");
 
 Stringfoo = "This is a ${test!} again";
@@ -90,8 +90,8 @@ public void testShouldNotInterpolateWithMalformedEndToken() throws Exception{
  }
 
 @Test
-publicvoidtestDefaultInterpolationWithNonInterpolatedValueAtEnd() throwsException{
-Mapm = newHashMap();
+voiddefaultInterpolationWithNonInterpolatedValueAtEnd() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("name", "jason");
 m.put("noun", "asshole");
 
@@ -101,8 +101,8 @@ public void testDefaultInterpolationWithNonInterpolatedValueAtEnd() throws Excep
  }
 
 @Test
-publicvoidtestDefaultInterpolationWithInterpolatedValueAtEnd() throwsException{
-Mapm = newHashMap();
+voiddefaultInterpolationWithInterpolatedValueAtEnd() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("name", "jason");
 m.put("noun", "asshole");
 
@@ -112,8 +112,8 @@ public void testDefaultInterpolationWithInterpolatedValueAtEnd() throws Exceptio
  }
 
 @Test
-publicvoidtestInterpolationWithInterpolatedValueAtEndWithCustomToken() throwsException{
-Mapm = newHashMap();
+voidinterpolationWithInterpolatedValueAtEndWithCustomToken() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("name", "jason");
 m.put("noun", "asshole");
 
@@ -123,8 +123,8 @@ public void testInterpolationWithInterpolatedValueAtEndWithCustomToken() throws
  }
 
 @Test
-publicvoidtestInterpolationWithInterpolatedValueAtEndWithCustomTokenAndCustomString() throwsException{
-Mapm = newHashMap();
+voidinterpolationWithInterpolatedValueAtEndWithCustomTokenAndCustomString() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("name", "jason");
 m.put("noun", "asshole");
 
@@ -134,8 +134,8 @@ public void testInterpolationWithInterpolatedValueAtEndWithCustomTokenAndCustomS
  }
 
 @Test
-publicvoidtestEscape() throwsException{
-Mapm = newHashMap();
+voidescape() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("name", "jason");
 m.put("noun", "asshole");
 
@@ -145,8 +145,8 @@ public void testEscape() throws Exception{
  }
 
 @Test
-publicvoidtestEscapeAtStart() throwsException{
-Mapm = newHashMap();
+voidescapeAtStart() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("name", "jason");
 m.put("noun", "asshole");
 
@@ -156,8 +156,8 @@ public void testEscapeAtStart() throws Exception{
  }
 
 @Test
-publicvoidtestEscapeOnlyAtStart() throwsException{
-Mapm = newHashMap();
+voidescapeOnlyAtStart() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("name", "jason");
 m.put("noun", "asshole");
 
@@ -168,8 +168,8 @@ public void testEscapeOnlyAtStart() throws Exception{
  }
 
 @Test
-publicvoidtestEscapeOnlyAtStartDefaultToken() throwsException{
-Mapm = newHashMap();
+voidescapeOnlyAtStartDefaultToken() throwsException{
+Map<String, String> m = newHashMap<>();
 m.put("name", "jason");
 m.put("noun", "asshole");
 
@@ -180,15 +180,15 @@ public void testEscapeOnlyAtStartDefaultToken() throws Exception{
  }
 
 @Test
-publicvoidtestShouldDetectRecursiveExpressionPassingThroughTwoPrefixes() throwsException{
-Listprefixes = newArrayList();
+voidshouldDetectRecursiveExpressionPassingThroughTwoPrefixes() throwsException{
+List<String>prefixes = newArrayList<>();
 
 prefixes.add("prefix1");
 prefixes.add("prefix2");
 
 RecursionInterceptorri = newPrefixAwareRecursionInterceptor(prefixes, false);
 
-Mapcontext = newHashMap();
+Map<String, String> context = newHashMap<>();
 context.put("name", "${prefix2.name}");
 
 Stringinput = "${prefix1.name}";
@@ -211,14 +211,14 @@ public void testShouldDetectRecursiveExpressionPassingThroughTwoPrefixes() throw
  }
 
 @Test
-publicvoidtestShouldDetectRecursiveExpressionWithPrefixAndWithout() throwsException{
-Listprefixes = newArrayList();
+voidshouldDetectRecursiveExpressionWithPrefixAndWithout() throwsException{
+List<String>prefixes = newArrayList<>();
 
 prefixes.add("prefix1");
 
 RecursionInterceptorri = newPrefixAwareRecursionInterceptor(prefixes, false);
 
-Mapcontext = newHashMap();
+Map<String, String> context = newHashMap<>();
 context.put("name", "${prefix1.name}");
 
 Stringinput = "${name}";
@@ -244,11 +244,11 @@ public void testShouldDetectRecursiveExpressionWithPrefixAndWithout() throws Exc
 //
 // ----------------------------------------------------------------------
 
-privateStringinterpolate(Stringinput, Mapcontext) throwsException{
+privateStringinterpolate(Stringinput, Map<String, String>context) throwsException{
 returninterpolate(input, context, null);
  }
 
-privateStringinterpolate(Stringinput, Mapcontext, StringescapeStr) throwsException{
+privateStringinterpolate(Stringinput, Map<String, String>context, StringescapeStr) throwsException{
 Interpolatorinterpolator = newStringSearchInterpolator();
 
 interpolator.addValueSource(newMapBasedValueSource(context));
@@ -268,7 +268,8 @@ private String interpolate(String input, Map context, String escapeStr) throws E
 returnbuf.toString();
  }
 
-privateStringinterpolate(Stringinput, Mapcontext, StringbeginToken, StringendToken) throwsException{
+privateStringinterpolate(Stringinput, Map<String, String> context, StringbeginToken, StringendToken)
+throwsException{
 StringSearchInterpolatorinterpolator = newStringSearchInterpolator(beginToken, endToken);
 
 interpolator.addValueSource(newMapBasedValueSource(context));

src/test/java/org/codehaus/plexus/interpolation/PrefixAwareRecursionInterceptorTest.java

@@ -25,10 +25,10 @@
 importstaticorg.junit.jupiter.api.Assertions.assertFalse;
 importstaticorg.junit.jupiter.api.Assertions.assertTrue;
 
-publicclassPrefixAwareRecursionInterceptorTest{
+classPrefixAwareRecursionInterceptorTest{
 
 @Test
-publicvoidtestFindExpression(){
+voidfindExpression(){
 PrefixAwareRecursionInterceptorreceptor =
 newPrefixAwareRecursionInterceptor(Collections.singleton("prefix."));
 
@@ -45,9 +45,9 @@ public void testFindExpression(){
  }
 
 @Test
-publicvoidtestFindExpressionWithDifferentPrefix(){
+voidfindExpressionWithDifferentPrefix(){
 PrefixAwareRecursionInterceptorreceptor =
-newPrefixAwareRecursionInterceptor(Arrays.asList(newString[]{"prefix.", "other."}));
+newPrefixAwareRecursionInterceptor(Arrays.asList("prefix.", "other."));
 
 Stringexpr = "prefix.first";
 
@@ -61,9 +61,9 @@ public void testFindExpressionWithDifferentPrefix(){
  }
 
 @Test
-publicvoidtestFindExpressionWithoutPrefix(){
+voidfindExpressionWithoutPrefix(){
 PrefixAwareRecursionInterceptorreceptor =
-newPrefixAwareRecursionInterceptor(Arrays.asList(newString[]{"prefix.", "other."}));
+newPrefixAwareRecursionInterceptor(Arrays.asList("prefix.", "other."));
 
 StringprefixedExpr = "prefix.first";
 Stringexpr = "first";