This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
The following commit(s) were added to refs/heads/master by this push:
new d240333 Cleanup tests (#312)
d240333 is described below
commit d2403330c1b6ebe754fa78d6922eee29a8e5b966
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Dec 21 16:14:01 2025 +0100
Cleanup tests (#312)
Co-authored-by: Moderne <[email protected]>
---
...ractInterpolatorFilterReaderLineEndingTest.java | 7 ++--
.../AbstractMavenFilteringRequestTest.java | 18 ++++-----
.../maven/shared/filtering/BoundedReaderTest.java | 13 +++----
.../filtering/DefaultMavenFileFilterTest.java | 17 ++++-----
.../filtering/DefaultMavenReaderFilterTest.java | 4 +-
.../DefaultMavenResourcesFilteringTest.java | 44 +++++++++++-----------
.../maven/shared/filtering/EscapeStringTest.java | 4 +-
.../maven/shared/filtering/FilteringUtilsTest.java | 17 ++++-----
.../IncrementalResourceFilteringTest.java | 10 ++---
.../maven/shared/filtering/InvalidMarkTest.java | 12 +++---
.../MuliLinesMavenResourcesFilteringTest.java | 4 +-
...iterInterpolatorFilterReaderLineEndingTest.java | 7 ++--
.../maven/shared/filtering/PropertyUtilsTest.java | 14 +++----
.../shared/filtering/TestReflectionProperties.java | 6 +--
14 files changed, 85 insertions(+), 92 deletions(-)
diff --git
a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
index 121f06c..0587383 100644
---
a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.maven.shared.filtering;
-import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@@ -41,7 +40,7 @@ public abstract class
AbstractInterpolatorFilterReaderLineEndingTest {
private Interpolator interpolator;
@Test
- public void testDefaults() throws Exception {
+ public void defaults() throws Exception {
when(interpolator.interpolate(eq("${a}"), eq(""),
isA(RecursionInterceptor.class)))
.thenReturn("DONE_A");
@@ -84,7 +83,7 @@ public abstract class
AbstractInterpolatorFilterReaderLineEndingTest {
// MSHARED-198: custom delimiters doesn't work as expected
@Test
- public void testCustomDelimiters() throws Exception {
+ public void customDelimiters() throws Exception {
when(interpolator.interpolate(eq("aaaFILTER.a.MEaaa"), eq(""),
isA(RecursionInterceptor.class)))
.thenReturn("DONE");
when(interpolator.interpolate(eq("abcFILTER.a.MEabc"), eq(""),
isA(RecursionInterceptor.class)))
@@ -102,7 +101,7 @@ public abstract class
AbstractInterpolatorFilterReaderLineEndingTest {
// MSHARED-235: reader exceeds readAheadLimit
@Test
- public void testMarkInvalid() throws IOException {
+ public void markInvalid() throws Exception {
try (Reader reader = getAtReader(new
StringReader("@\").replace(p,\"]\").replace(q,\""), interpolator, "\\")) {
assertEquals("@\").replace(p,\"]\").replace(q,\"",
IOUtils.toString(reader));
}
diff --git
a/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
b/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
index 9f0a622..d229c33 100644
---
a/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
@@ -28,32 +28,32 @@ import static org.hamcrest.MatcherAssert.assertThat;
/**
* @author Karl Heinz Marbaise <a
href="mailto:[email protected]";>[email protected]</a>.
*/
-public class AbstractMavenFilteringRequestTest {
+class AbstractMavenFilteringRequestTest {
private final AbstractMavenFilteringRequest request = new
AbstractMavenFilteringRequest();
private final LinkedHashSet<String> delimiters = new LinkedHashSet<>();
@Test
- public void setDelimitersShouldNotChangeAnythingIfUsingNull() {
+ void setDelimitersShouldNotChangeAnythingIfUsingNull() {
request.setDelimiters(null, false);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void setDelimitersShouldNotChangeAnythingIfUsingEmpty() {
+ void setDelimitersShouldNotChangeAnythingIfUsingEmpty() {
request.setDelimiters(delimiters, false);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void setDelimitersShouldAddOnlyTheGivenDelimiter() {
+ void setDelimitersShouldAddOnlyTheGivenDelimiter() {
delimiters.add("test");
request.setDelimiters(delimiters, false);
assertThat(request.getDelimiters(), Matchers.contains("test"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersForNullElements() {
+ void setDelimitersShouldAddDefaultDelimitersForNullElements() {
delimiters.add("test");
delimiters.add(null);
delimiters.add("second");
@@ -62,27 +62,27 @@ public class AbstractMavenFilteringRequestTest {
}
@Test
- public void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven() {
+ void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven() {
request.setDelimiters(null, true);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven() {
+ void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven() {
LinkedHashSet<String> delimiters = new LinkedHashSet<>();
request.setDelimiters(delimiters, true);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven()
{
+ void
setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven()
{
delimiters.add("test");
request.setDelimiters(delimiters, true);
assertThat(request.getDelimiters(), Matchers.contains("${*}", "@",
"test"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersForNullElement() {
+ void setDelimitersShouldAddDefaultDelimitersForNullElement() {
delimiters.add("test");
delimiters.add(null);
delimiters.add("second");
diff --git
a/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
b/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
index 24a2df4..8c4f623 100644
--- a/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
@@ -19,7 +19,6 @@
package org.apache.maven.shared.filtering;
import java.io.BufferedReader;
-import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Arrays;
@@ -28,12 +27,12 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class BoundedReaderTest {
+class BoundedReaderTest {
private final Reader sr = new BufferedReader(new
StringReader("01234567890"));
@Test
- public void readTillEnd() throws IOException {
+ void readTillEnd() throws Exception {
try (BoundedReader mr = new BoundedReader(sr, 3)) {
mr.mark(3);
mr.read();
@@ -44,7 +43,7 @@ public class BoundedReaderTest {
}
@Test
- public void readMulti() throws IOException {
+ void readMulti() throws Exception {
char[] cbuf = new char[4];
Arrays.fill(cbuf, 'X');
@@ -60,7 +59,7 @@ public class BoundedReaderTest {
}
@Test
- public void readMultiWithOffset() throws IOException {
+ void readMultiWithOffset() throws Exception {
char[] cbuf = new char[4];
Arrays.fill(cbuf, 'X');
@@ -77,7 +76,7 @@ public class BoundedReaderTest {
}
@Test
- public void resetWorks() throws IOException {
+ void resetWorks() throws Exception {
try (BoundedReader mr = new BoundedReader(sr, 3)) {
mr.read();
mr.read();
@@ -91,7 +90,7 @@ public class BoundedReaderTest {
}
@Test
- public void skipTest() throws IOException {
+ void skipTest() throws Exception {
try (BoundedReader mr = new BoundedReader(sr, 3)) {
mr.skip(2);
mr.read();
diff --git
a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
index 587f821..b8259d3 100644
---
a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
@@ -19,7 +19,6 @@
package org.apache.maven.shared.filtering;
import java.io.File;
-import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.nio.file.Files;
@@ -52,7 +51,7 @@ import static org.mockito.Mockito.mock;
*
*/
@MavenDITest
-public class DefaultMavenFileFilterTest {
+class DefaultMavenFileFilterTest {
@Inject
Injector container;
@@ -65,7 +64,7 @@ public class DefaultMavenFileFilterTest {
}
@Test
- public void testOverwriteFile() throws Exception {
+ void overwriteFile() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
Path from = Paths.get(getBasedir(),
"src/test/units-files/reflection-test.properties");
@@ -86,7 +85,7 @@ public class DefaultMavenFileFilterTest {
}
@Test
- public void testNullSafeDefaultFilterWrappers() throws Exception {
+ void nullSafeDefaultFilterWrappers() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
mavenFileFilter.getDefaultFilterWrappers(null, null, false, null,
null);
@@ -95,7 +94,7 @@ public class DefaultMavenFileFilterTest {
}
@Test
- public void testMultiFilterFileInheritance() throws Exception {
+ void multiFilterFileInheritance() throws Exception {
DefaultMavenFileFilter mavenFileFilter = new
DefaultMavenFileFilter(mock(BuildContext.class));
File testDir = new File(getBasedir(),
"src/test/units-files/MSHARED-177");
@@ -116,7 +115,7 @@ public class DefaultMavenFileFilterTest {
// MSHARED-161: DefaultMavenFileFilter.getDefaultFilterWrappers loads
// filters from the current directory instead of using basedir
@Test
- public void testMavenBasedir() throws Exception {
+ void mavenBasedir() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
@@ -140,7 +139,7 @@ public class DefaultMavenFileFilterTest {
// MSHARED-198: custom delimiters doesn't work as expected
@Test
- public void testCustomDelimiters() throws Exception {
+ void customDelimiters() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
@@ -160,7 +159,7 @@ public class DefaultMavenFileFilterTest {
// MSHARED-199: Filtering doesn't work if 2 delimiters are used on the
same line, the first one being left open
@Test
- public void testLineWithSingleAtAndExpression() throws Exception {
+ void lineWithSingleAtAndExpression() throws Exception {
MavenFileFilter mavenFileFilter =
container.getInstance(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
@@ -176,7 +175,7 @@ public class DefaultMavenFileFilterTest {
}
@Test
- void testInterpolatorCustomizer() throws MavenFilteringException,
IOException {
+ void interpolatorCustomizer() throws Exception {
AbstractMavenFilteringRequest req = new
AbstractMavenFilteringRequest();
req.setInterpolatorCustomizer(i -> i.addValueSource(new
AbstractValueSource(false) {
@Override
diff --git
a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
index eff3c9c..dc4ee04 100644
---
a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
@@ -33,12 +33,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* @author Kristian Rosenvold
*/
@MavenDITest
-public class DefaultMavenReaderFilterTest {
+class DefaultMavenReaderFilterTest {
@Inject
Injector container;
@Test
- public void testJustDoSomeFiltering() throws Exception {
+ void justDoSomeFiltering() throws Exception {
MavenReaderFilter readerFilter =
container.getInstance(MavenReaderFilter.class);
StringReader src = new StringReader("[email protected] ${foo}");
diff --git
a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
index 1160368..5e7af18 100644
---
a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -55,7 +55,7 @@ import static org.junit.jupiter.api.Assertions.fail;
* @since 1.0-beta-1
*/
@MavenDITest
-public class DefaultMavenResourcesFilteringTest {
+class DefaultMavenResourcesFilteringTest {
@Inject
Injector container;
@@ -78,7 +78,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testSimpleFiltering() throws Exception {
+ void simpleFiltering() throws Exception {
mavenProject.addProperty("foo", "bar");
mavenProject.addProperty("java.version", "zloug");
@@ -112,7 +112,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testSessionFiltering() throws Exception {
+ void sessionFiltering() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/session-filtering";
@@ -155,7 +155,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testWithMavenResourcesExecution() throws Exception {
+ void withMavenResourcesExecution() throws Exception {
mavenProject.addProperty("foo", "bar");
mavenProject.addProperty("java.version", "zloug");
@@ -187,7 +187,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testWithMavenResourcesExecutionWithAdditionalProperties()
throws Exception {
+ void withMavenResourcesExecutionWithAdditionalProperties() throws
Exception {
mavenProject.addProperty("foo", "bar");
mavenProject.addProperty("java.version", "zloug");
@@ -278,7 +278,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testAddingTokens() throws Exception {
+ void addingTokens() throws Exception {
mavenProject.addProperty("foo", "bar");
mavenProject.addProperty("java.version", "zloug");
@@ -314,7 +314,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testNoFiltering() throws Exception {
+ void noFiltering() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
Path initialImageFile = Paths.get(unitFilesDir, "happy_duke.gif");
@@ -365,7 +365,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testIncludeOneFile() throws Exception {
+ void includeOneFile() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
@@ -396,7 +396,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testIncludeOneFileAndDirectory() throws Exception {
+ void includeOneFileAndDirectory() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
@@ -432,7 +432,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testFlattenDirectoryStructure() throws Exception {
+ void flattenDirectoryStructure() throws Exception {
Path baseDir = Paths.get(getBasedir());
ProjectStub mavenProject = new ProjectStub().setBasedir(baseDir);
mavenProject.setVersion("1.0");
@@ -478,7 +478,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testFlattenDirectoryStructureWithoutOverride() {
+ void flattenDirectoryStructureWithoutOverride() {
Path baseDir = Paths.get(getBasedir());
ProjectStub mavenProject = new ProjectStub().setBasedir(baseDir);
mavenProject.setVersion("1.0");
@@ -520,7 +520,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testExcludeOneFile() throws Exception {
+ void excludeOneFile() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
@@ -562,7 +562,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testTargetAbsolutePath() throws Exception {
+ void targetAbsolutePath() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
@@ -600,7 +600,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testTargetPath() throws Exception {
+ void targetPath() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-resources-filtering";
@@ -633,7 +633,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testEmptyDirectories() throws Exception {
+ void emptyDirectories() throws Exception {
List<Resource> resources = new ArrayList<>();
resources.add(new Resource() {
@@ -681,7 +681,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testShouldReturnGitIgnoreFiles() throws Exception {
+ void shouldReturnGitIgnoreFiles() throws Exception {
createTestDataStructure();
Path outputDirectory = Paths.get(getBasedir(),
"target/testGitIgnoreFile");
@@ -773,7 +773,7 @@ public class DefaultMavenResourcesFilteringTest {
* unit test for MSHARED-81 :
https://issues.apache.org/jira/browse/MSHARED-81
*/
@Test
- public void testMSHARED81() throws Exception {
+ void mshared81() throws Exception {
mavenProject.addProperty("escaped", "this is escaped");
mavenProject.addProperty("escaped.at", "this is escaped.at");
mavenProject.addProperty("foo", "this is foo");
@@ -864,7 +864,7 @@ public class DefaultMavenResourcesFilteringTest {
* unit test for edge cases :
https://issues.apache.org/jira/browse/MSHARED-228
*/
@Test
- public void testEdgeCases() throws Exception {
+ void edgeCases() throws Exception {
mavenProject.addProperty("escaped", "this is escaped");
mavenProject.addProperty("escaped.at", "this is escaped.at");
mavenProject.addProperty("foo", "this is foo");
@@ -918,7 +918,7 @@ public class DefaultMavenResourcesFilteringTest {
// MSHARED-220: Apply filtering to filenames
@Test
- public void testFilterFileName() throws Exception {
+ void filterFileName() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/maven-filename-filtering";
@@ -950,7 +950,7 @@ public class DefaultMavenResourcesFilteringTest {
* MRESOURCES-171: Use correct encoding when filtering properties-files
*/
@Test
- public void testFilterPropertiesFiles() throws Exception {
+ void filterPropertiesFiles() throws Exception {
String unitFilesDir = getBasedir() +
"/src/test/units-files/MRESOURCES-171";
@@ -977,7 +977,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testGetEncoding() {
+ void getEncoding() {
Path propertiesFile = Paths.get("file.properties");
Path regularFile = Paths.get("file.xml");
@@ -992,7 +992,7 @@ public class DefaultMavenResourcesFilteringTest {
}
@Test
- public void testIsPropertiesFile() {
+ void isPropertiesFile() {
// Properties files
assertTrue(DefaultMavenResourcesFiltering.isPropertiesFile(Paths.get("file.properties")));
assertTrue(DefaultMavenResourcesFiltering.isPropertiesFile(Paths.get("some/parent/path",
"file.properties")));
diff --git
a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
index 5c39d4f..fec68d0 100644
--- a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
@@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* @author Olivier Lamy
*/
@MavenDITest
-public class EscapeStringTest {
+class EscapeStringTest {
@Inject
Injector container;
@@ -56,7 +56,7 @@ public class EscapeStringTest {
}
@Test
- public void testEscape() throws Exception {
+ void escape() throws Exception {
Path baseDir = Paths.get(getBasedir());
ProjectStub mavenProject = new ProjectStub().setBasedir(baseDir);
mavenProject.setVersion("1.0");
diff --git
a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
index 4249526..7bbde58 100644
--- a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.maven.shared.filtering;
-import java.io.IOException;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -37,11 +36,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* @since 1.0
*
*/
-public class FilteringUtilsTest {
+class FilteringUtilsTest {
private static final Path TEST_DIRECTORY = Paths.get(getBasedir(),
"target/test-classes/");
@Test
- public void testMSHARED1213CopyWithTargetAlreadyExisting0ByteFile() throws
IOException {
+ void mshared1213CopyWithTargetAlreadyExisting0ByteFile() throws Exception {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.writeString(toFile, "");
@@ -64,7 +63,7 @@ public class FilteringUtilsTest {
}
@Test
- public void testMSHARED1213CopyWithTargetAlreadyExistingJunkFile() throws
IOException {
+ void mshared1213CopyWithTargetAlreadyExistingJunkFile() throws Exception {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.writeString(toFile, "junk");
@@ -87,7 +86,7 @@ public class FilteringUtilsTest {
}
@Test
- public void testMSHARED1213CopyWithTargetAlreadyExistingSameFile() throws
IOException {
+ void mshared1213CopyWithTargetAlreadyExistingSameFile() throws Exception {
Path fromFile = Paths.get(getBasedir() +
"/src/test/units-files/MSHARED-1213/enunciate.xml");
Path toFile = TEST_DIRECTORY.resolve("MSHARED-1213-enunciate.xml");
Files.copy(fromFile, toFile, StandardCopyOption.REPLACE_EXISTING);
@@ -110,17 +109,17 @@ public class FilteringUtilsTest {
}
@Test
- public void testEscapeWindowsPathStartingWithDrive() {
+ void escapeWindowsPathStartingWithDrive() {
assertEquals("C:\\\\Users\\\\Administrator",
FilteringUtils.escapeWindowsPath("C:\\Users\\Administrator"));
}
@Test
- public void testEscapeWindowsPathMissingDriveLetter() {
+ void escapeWindowsPathMissingDriveLetter() {
assertEquals(":\\Users\\Administrator",
FilteringUtils.escapeWindowsPath(":\\Users\\Administrator"));
}
@Test
- public void testEscapeWindowsPathInvalidDriveLetter() {
+ void escapeWindowsPathInvalidDriveLetter() {
assertEquals("4:\\Users\\Administrator",
FilteringUtils.escapeWindowsPath("4:\\Users\\Administrator"));
}
@@ -142,7 +141,7 @@ public class FilteringUtilsTest {
// MSHARED-179
@Test
- public void testEscapeWindowsPathNotAtBeginning() {
+ void escapeWindowsPathNotAtBeginning() {
assertEquals(
"jdbc:derby:C:\\\\Users\\\\Administrator/test;create=true",
FilteringUtils.escapeWindowsPath("jdbc:derby:C:\\Users\\Administrator/test;create=true"));
diff --git
a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
index 62f4095..15929c4 100644
---
a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@MavenDITest
-public class IncrementalResourceFilteringTest {
+class IncrementalResourceFilteringTest {
final Path baseDirectory = Paths.get(getBasedir());
final Path outputDirectory =
baseDirectory.resolve("target/IncrementalResourceFilteringTest");
@@ -72,7 +72,7 @@ public class IncrementalResourceFilteringTest {
}
@Test
- public void testSimpleIncrementalFiltering() throws Exception {
+ void simpleIncrementalFiltering() throws Exception {
// run full build first
filter("time");
@@ -107,7 +107,7 @@ public class IncrementalResourceFilteringTest {
}
@Test
- public void testOutputChange() throws Exception {
+ void outputChange() throws Exception {
// run full build first
filter("time");
@@ -126,7 +126,7 @@ public class IncrementalResourceFilteringTest {
}
@Test
- public void testFilterChange() throws Exception {
+ void filterChange() throws Exception {
// run full build first
filter("time");
@@ -145,7 +145,7 @@ public class IncrementalResourceFilteringTest {
}
@Test
- public void testFilterDeleted() throws Exception {
+ void filterDeleted() throws Exception {
// run full build first
filter("time");
diff --git
a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
index 4f0e98b..0a8b887 100644
--- a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
@@ -27,17 +27,17 @@ import org.apache.maven.api.di.Inject;
import org.apache.maven.api.di.testing.MavenDITest;
import org.apache.maven.api.plugin.testing.stubs.ProjectStub;
import org.apache.maven.di.Injector;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.maven.api.di.testing.MavenDIExtension.getBasedir;
-import static org.junit.jupiter.api.Assertions.fail;
/**
* @author Mikolaj Izdebski
*/
@MavenDITest
-public class InvalidMarkTest {
+class InvalidMarkTest {
@Inject
Injector container;
@@ -53,7 +53,7 @@ public class InvalidMarkTest {
}
@Test
- public void testEscape() {
+ void escape() {
MavenResourcesFiltering mavenResourcesFiltering =
container.getInstance(MavenResourcesFiltering.class);
Resource resource = new Resource();
@@ -69,10 +69,8 @@ public class InvalidMarkTest {
Collections.emptyList(),
new StubSession());
- try {
+ Assertions.assertDoesNotThrow(() -> {
mavenResourcesFiltering.filterResources(mavenResourcesExecution);
- } catch (MavenFilteringException e) {
- fail();
- }
+ });
}
}
diff --git
a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
index 625649a..d092d17 100644
---
a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*
*/
@MavenDITest
-public class MuliLinesMavenResourcesFilteringTest {
+class MuliLinesMavenResourcesFilteringTest {
@Inject
Injector container;
@@ -58,7 +58,7 @@ public class MuliLinesMavenResourcesFilteringTest {
/**
*/
@Test
- public void testFilteringTokenOnce() throws Exception {
+ void filteringTokenOnce() throws Exception {
Path baseDir = Paths.get(getBasedir());
ProjectStub mavenProject = new ProjectStub().setBasedir(baseDir);
mavenProject.setVersion("1.0");
diff --git
a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
index e2b8ea9..d889160 100644
---
a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
+++
b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
@@ -37,8 +37,7 @@ import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-public class MultiDelimiterInterpolatorFilterReaderLineEndingTest
- extends AbstractInterpolatorFilterReaderLineEndingTest {
+class MultiDelimiterInterpolatorFilterReaderLineEndingTest extends
AbstractInterpolatorFilterReaderLineEndingTest {
@Mock
private Interpolator interpolator;
@@ -79,7 +78,7 @@ public class
MultiDelimiterInterpolatorFilterReaderLineEndingTest
// MSHARED-199: Filtering doesn't work if 2 delimiters are used on the
same line, the first one being left open
@Test
- public void testLineWithSingleAtAndExpression() throws Exception {
+ void lineWithSingleAtAndExpression() throws Exception {
when(interpolator.interpolate(eq("${foo}"), eq(""),
isA(RecursionInterceptor.class)))
.thenReturn("bar");
@@ -93,7 +92,7 @@ public class
MultiDelimiterInterpolatorFilterReaderLineEndingTest
//
http://stackoverflow.com/questions/21786805/maven-war-plugin-customize-filter-delimitters-in-webresources/
@Test
- public void testAtDollarExpression() throws Exception {
+ void atDollarExpression() throws Exception {
when(interpolator.interpolate(eq("${db.server}"), eq(""),
isA(RecursionInterceptor.class)))
.thenReturn("DB_SERVER");
when(interpolator.interpolate(eq("${db.port}"), eq(""),
isA(RecursionInterceptor.class)))
diff --git
a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
index c6acf72..b41708f 100644
--- a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
@@ -45,11 +45,11 @@ import static org.mockito.Mockito.verify;
* @since 1.0-beta-1
*/
@MavenDITest
-public class PropertyUtilsTest {
+class PropertyUtilsTest {
private static final Path TEST_DIRECTORY = Paths.get(getBasedir(),
"target/test-classes/");
@Test
- public void testBasic() throws Exception {
+ void basic() throws Exception {
Path basicProp = TEST_DIRECTORY.resolve("basic.properties");
Files.deleteIfExists(basicProp);
@@ -67,7 +67,7 @@ public class PropertyUtilsTest {
}
@Test
- public void testSystemProperties() throws Exception {
+ void systemProperties() throws Exception {
Path systemProp = TEST_DIRECTORY.resolve("system.properties");
Files.deleteIfExists(systemProp);
@@ -82,7 +82,7 @@ public class PropertyUtilsTest {
}
@Test
- public void testException() {
+ void exception() {
Path nonExistent = TEST_DIRECTORY.resolve("not_existent_file");
assertFalse(Files.exists(nonExistent), "property file exist: " +
nonExistent);
@@ -91,7 +91,7 @@ public class PropertyUtilsTest {
}
@Test
- public void testloadpropertiesFile() throws Exception {
+ void testloadpropertiesFile() throws Exception {
Path propertyFile = Paths.get(getBasedir() +
"/src/test/units-files/propertyutils-test.properties");
Properties baseProps = new Properties();
baseProps.put("pom.version", "realVersion");
@@ -109,7 +109,7 @@ public class PropertyUtilsTest {
* @throws IOException if problem writing file
*/
@Test
- public void testCircularReferences() throws IOException {
+ void circularReferences() throws Exception {
Path basicProp = TEST_DIRECTORY.resolve("circular.properties");
Files.deleteIfExists(basicProp);
@@ -137,7 +137,7 @@ public class PropertyUtilsTest {
* @throws IOException if problem writing file
*/
@Test
- public void testCircularReferences3Vars() throws IOException {
+ void circularReferences3Vars() throws Exception {
Path basicProp = TEST_DIRECTORY.resolve("circular.properties");
Files.deleteIfExists(basicProp);
diff --git
a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
index 6ffba4d..523065e 100644
---
a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
+++
b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
@@ -41,13 +41,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*
*/
@MavenDITest
-public class TestReflectionProperties {
+class TestReflectionProperties {
@Inject
Injector container;
@Test
- public void testSimpleFiltering() throws Exception {
+ void simpleFiltering() throws Exception {
ProjectStub mavenProject = new ProjectStub();
mavenProject.setVersion("1.0");
mavenProject.setGroupId("org.apache");
@@ -75,7 +75,7 @@ public class TestReflectionProperties {
}
@Test
- public void testSimpleNonFiltering() throws Exception {
+ void simpleNonFiltering() throws Exception {
ProjectStub mavenProject = new ProjectStub();
mavenProject.setVersion("1.0");
