From 78dd34464077e1fc2450704d19660484410ad684 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 9 Jan 2025 06:50:20 -0500 Subject: [PATCH 1/9] Make exception messages platform independent --- .../maven/enforcer/rules/files/AbstractRequireFiles.java | 6 +++--- .../enforcer/rules/files/RequireFilesDontExist.java | 2 +- .../maven/enforcer/rules/files/RequireFilesExist.java | 9 ++++----- .../maven/enforcer/rules/files/RequireFilesSize.java | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java index da9019f48..159366b26 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java @@ -93,15 +93,15 @@ private void fail(List failures) throws EnforcerRuleException { StringBuilder buf = new StringBuilder(); if (message != null) { - buf.append(message + System.lineSeparator()); + buf.append(message + '\n'); } buf.append(getErrorMsg()); for (File file : failures) { if (file != null) { - buf.append(file.getAbsolutePath() + System.lineSeparator()); + buf.append(file.getAbsolutePath() + '\n'); } else { - buf.append("(an empty filename was given and allowNulls is false)" + System.lineSeparator()); + buf.append("(an empty filename was given and allowNulls is false)\n"); } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesDontExist.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesDontExist.java index 116dd049c..38d2b0980 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesDontExist.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesDontExist.java @@ -35,6 +35,6 @@ boolean checkFile(File file) { @Override String getErrorMsg() { - return "Some files should not exist:" + System.lineSeparator(); + return "Some files should not exist:\n"; } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesExist.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesExist.java index 9318dbca6..bcdb9e2af 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesExist.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesExist.java @@ -36,17 +36,16 @@ boolean checkFile(File file) { @Override String getErrorMsg() { - return "Some required files are missing:" + System.lineSeparator(); + return "Some required files are missing:\n"; } /** - * OSes like Windows are case insensitive, so this method will compare the file path with the actual path. A simple + * OSes like Windows are case-insensitive, so this method will compare the file path with the actual path. A simple * {@link File#exists()} is not enough for such OS. * * @param file the file to verify - * @param defaultValue value to return in case an IO exception occurs, should never happen as the file already - * exists - * @return + * @param defaultValue value to return in case an IO exception occurs. Should never happen as the file already + * exists. */ private boolean osIndependentNameMatch(File file, boolean defaultValue) { try { diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java index d032c0d32..d3a4b0a5c 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java @@ -98,7 +98,7 @@ boolean checkFile(File file) { + (minsize == maxsize || minsize == 0 ? ("max. " + maxsize) : ("between " + minsize + " and " + maxsize)) - + " byte)."); + + " bytes)."); return true; } From d1fa7a218afe23578686ff96f0cdc1b098085a65 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 9 Jan 2025 08:16:20 -0500 Subject: [PATCH 2/9] tests --- .../rules/files/AbstractRequireFiles.java | 25 +++++++++++++++---- .../rules/files/RequireFilesSize.java | 16 +++++++----- .../files/TestRequireFilesDontExist.java | 18 ++++++------- .../rules/files/TestRequireFilesExist.java | 15 +++++------ .../rules/files/TestRequireFilesSize.java | 19 ++++++-------- 5 files changed, 53 insertions(+), 40 deletions(-) diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java index 159366b26..63f248d18 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java @@ -64,7 +64,7 @@ abstract class AbstractRequireFiles extends AbstractStandardEnforcerRule { public void execute() throws EnforcerRuleException { if (!allowNulls && files.isEmpty()) { - throw new EnforcerRuleError("The file list is empty and Null files are disabled."); + throw new EnforcerRuleError("The file list is empty, and null files are disabled."); } List failures = new ArrayList<>(); @@ -95,19 +95,34 @@ private void fail(List failures) throws EnforcerRuleException { if (message != null) { buf.append(message + '\n'); } - buf.append(getErrorMsg()); + if (getErrorMsg() != null && containsNonNull(failures)) { + buf.append(getErrorMsg()); + } for (File file : failures) { - if (file != null) { - buf.append(file.getAbsolutePath() + '\n'); + if (file == null) { + buf.append("A null filename was given and allowNulls is false."); } else { - buf.append("(an empty filename was given and allowNulls is false)\n"); + buf.append(perFileMessage(file)); } } throw new EnforcerRuleException(buf.toString()); } + String perFileMessage(File file) { + return file.getPath() + "\n"; + } + + private static boolean containsNonNull(List failures) { + for (File file : failures) { + if (file != null) { + return true; + } + } + return false; + } + @Override public String getCacheId() { return Integer.toString(files.hashCode()); diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java index d3a4b0a5c..64809f168 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java @@ -57,8 +57,7 @@ public RequireFilesSize(MavenProject project) { @Override public void execute() throws EnforcerRuleException { - - // if the file is already defined, use that. Otherwise get the main artifact. + // if the file is already defined, use that. Otherwise, get the main artifact. if (getFiles().isEmpty()) { setFilesList(Collections.singletonList(project.getArtifact().getFile())); super.execute(); @@ -73,6 +72,11 @@ public String getCacheId() { return null; } + @Override + String perFileMessage(File file) { + return ""; + } + @Override boolean checkFile(File file) { if (file == null) { @@ -84,10 +88,10 @@ boolean checkFile(File file) { if (file.exists()) { long length = file.length(); if (length < minsize) { - this.errorMsg = (file + " size (" + length + ") too small. Min. is " + minsize); + this.errorMsg = (file + " size (" + length + ") too small. Minimum is " + minsize + "."); return false; } else if (length > maxsize) { - this.errorMsg = (file + " size (" + length + ") too large. Max. is " + maxsize); + this.errorMsg = (file + " size (" + length + ") too large. Maximum is " + maxsize + "."); return false; } else { @@ -96,14 +100,14 @@ boolean checkFile(File file) { + length + ") is OK (" + (minsize == maxsize || minsize == 0 - ? ("max. " + maxsize) + ? ("maximum " + maxsize) : ("between " + minsize + " and " + maxsize)) + " bytes)."); return true; } } else { - this.errorMsg = (file + " does not exist!"); + this.errorMsg = (file + " does not exist."); return false; } } diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java index 93a1a0e39..f13748748 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java @@ -27,10 +27,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -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 static org.junit.jupiter.api.Assertions.*; /** * Test the "require files don't exist" rule. @@ -53,24 +50,25 @@ void testFileExists() throws IOException { rule.execute(); fail("Expected an Exception."); } catch (EnforcerRuleException e) { - assertNotNull(e.getMessage()); + assertEquals("Some files should not exist:\n" + f.getPath() + "\n", e.getMessage()); + } finally { + f.delete(); } - f.delete(); } @Test - void testEmptyFile() { + void testNullFile() { rule.setFilesList(Collections.singletonList(null)); try { rule.execute(); fail("Should get exception"); } catch (EnforcerRuleException e) { - assertNotNull(e.getMessage()); + assertEquals("A null filename was given and allowNulls is false.", e.getMessage()); } } @Test - void testEmptyFileAllowNull() { + void testNullFileAllowed() { rule.setFilesList(Collections.singletonList(null)); rule.setAllowNulls(true); try { @@ -88,7 +86,7 @@ void testEmptyFileList() { rule.execute(); fail("Should get exception"); } catch (EnforcerRuleException e) { - assertNotNull(e.getMessage()); + assertEquals("The file list is empty, and null files are disabled.", e.getMessage()); } } diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java index 33c726154..893308c6b 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java @@ -28,6 +28,7 @@ import org.junit.jupiter.api.io.TempDir; import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assumptions.assumeFalse; /** * Test the "require files exist" rule. @@ -59,16 +60,16 @@ void testFileOsIndependentExists() { } @Test - void testEmptyFile() { + void testNullFile() { rule.setFilesList(Collections.singletonList(null)); EnforcerRuleException e = assertThrows(EnforcerRuleException.class, () -> rule.execute()); - assertNotNull(e.getMessage()); + assertEquals("A null filename was given and allowNulls is false.", e.getMessage()); } @Test - void testEmptyFileAllowNull() throws Exception { + void testNullFileAllowNull() throws Exception { rule.setFilesList(Collections.singletonList(null)); rule.setAllowNulls(true); rule.execute(); @@ -81,7 +82,7 @@ void testEmptyFileList() { EnforcerRuleException e = assertThrows(EnforcerRuleException.class, () -> rule.execute()); - assertNotNull(e.getMessage()); + assertEquals("The file list is empty, and null files are disabled.", e.getMessage()); } @Test @@ -97,12 +98,12 @@ void testFileDoesNotExist() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); - assertFalse(f.exists()); + assumeFalse(f.exists()); rule.setFilesList(Collections.singletonList(f)); EnforcerRuleException e = assertThrows(EnforcerRuleException.class, () -> rule.execute()); - assertNotNull(e.getMessage()); + assertEquals("Some required files are missing:\n" + f.getPath() + "\n", e.getMessage()); } @Test @@ -110,7 +111,7 @@ void testFileExistsSatisfyAny() throws EnforcerRuleException, IOException { File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); - assertFalse(f.exists()); + assumeFalse(f.exists()); File g = File.createTempFile("junit", null, temporaryFolder); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java index f0a7a042b..351aa01e7 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java @@ -38,12 +38,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.when; /** @@ -80,18 +75,18 @@ void testFileExists() throws EnforcerRuleException, IOException { } @Test - void testEmptyFile() { + void testNullFile() { rule.setFilesList(Collections.singletonList(null)); try { rule.execute(); fail("Should get exception"); } catch (EnforcerRuleException e) { - assertNotNull(e.getMessage()); + assertEquals("A null filename was given and allowNulls is false.", e.getMessage()); } } @Test - void testEmptyFileAllowNull() throws EnforcerRuleException { + void testNullFileAllowNull() throws EnforcerRuleException { rule.setFilesList(Collections.singletonList(null)); rule.setAllowNulls(true); rule.execute(); @@ -128,7 +123,7 @@ void testFileDoesNotExist() throws IOException { rule.execute(); fail("Should get exception"); } catch (EnforcerRuleException e) { - assertNotNull(e.getMessage()); + assertEquals(f.getPath() + " does not exist.", e.getMessage()); } } @@ -141,7 +136,7 @@ void testFileTooSmall() throws IOException { rule.execute(); fail("Should get exception"); } catch (EnforcerRuleException e) { - assertNotNull(e.getMessage()); + assertEquals(e.getMessage(), f.getPath() + " size (0) too small. Minimum is 10."); } } @@ -159,7 +154,7 @@ void testFileTooBig() throws IOException { rule.execute(); fail("Should get exception"); } catch (EnforcerRuleException e) { - assertNotNull(e.getMessage()); + assertEquals(f.getPath() + " size (21) too large. Maximum is 10.", e.getMessage()); } } From 0a5031aa2d6b9ed0840c8b3661efcea68329bfc6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 13 Jan 2025 13:01:35 -0500 Subject: [PATCH 3/9] import --- .../maven/enforcer/rules/files/TestRequireFilesDontExist.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java index f13748748..cb7f0e5c0 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java @@ -74,7 +74,7 @@ void testNullFileAllowed() { try { rule.execute(); } catch (EnforcerRuleException e) { - fail("Unexpected Exception:" + e.getLocalizedMessage()); + fail("Unexpected Exception:" + e.getLocalizedMessage(), e); } } From 6fed120bc1c0702d990eec5c0d9ba79f3c1736d7 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 29 Jan 2025 05:51:08 -0600 Subject: [PATCH 4/9] imports --- .../maven/enforcer/rules/files/TestRequireFilesExist.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java index 893308c6b..64f51a296 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java @@ -27,8 +27,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.junit.jupiter.api.Assertions.*; +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.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Test the "require files exist" rule. @@ -115,7 +119,7 @@ void testFileExistsSatisfyAny() throws EnforcerRuleException, IOException { File g = File.createTempFile("junit", null, temporaryFolder); - assertTrue(g.exists()); + assumeTrue(g.exists()); rule.setFilesList(Arrays.asList(f, g.getCanonicalFile())); rule.setSatisfyAny(true); From f28591cda07950e7e6942a4101eec24cb88710c4 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 1 Feb 2025 06:48:49 -0500 Subject: [PATCH 5/9] no wildcard imports --- .../rules/files/TestRequireFilesDontExist.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java index cb7f0e5c0..de18f20d2 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java @@ -27,7 +27,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.junit.jupiter.api.Assertions.*; +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 static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assumptions.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Test the "require files don't exist" rule. @@ -107,7 +112,7 @@ void testFileDoesNotExist() throws EnforcerRuleException, IOException { File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); - assertFalse(f.exists()); + assumeFalse(f.exists()); rule.setFilesList(Collections.singletonList(f)); @@ -119,11 +124,11 @@ void testFileDoesNotExistSatisfyAny() throws EnforcerRuleException, IOException File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); - assertFalse(f.exists()); + assumeTrue(f.exists()); File g = File.createTempFile("junit", null, temporaryFolder); - assertTrue(g.exists()); + assumeTrue(g.exists()); rule.setFilesList(Arrays.asList(f, g.getCanonicalFile())); rule.setSatisfyAny(true); From 3a4fc0b919b2e29b09a56e1e9433e20e21366a98 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 1 Feb 2025 06:59:22 -0500 Subject: [PATCH 6/9] no wildcard imports --- .../enforcer/rules/files/TestRequireFilesSize.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java index 351aa01e7..08cce567c 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java @@ -38,7 +38,13 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.Mockito.when; /** @@ -116,7 +122,7 @@ void testEmptyFileList() throws EnforcerRuleException, IOException { void testFileDoesNotExist() throws IOException { File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); - assertFalse(f.exists()); + assumeFalse(f.exists()); rule.setFilesList(Collections.singletonList(f)); try { @@ -149,7 +155,7 @@ void testFileTooBig() throws IOException { rule.setFilesList(Collections.singletonList(f)); rule.setMaxsize(10); - assertTrue(f.length() > 10); + assumeTrue(f.length() > 10); try { rule.execute(); fail("Should get exception"); @@ -164,7 +170,7 @@ void testRequireFilesSizeSatisfyAny() throws EnforcerRuleException, IOException try (BufferedWriter out = new BufferedWriter(new FileWriter(f))) { out.write("123456789101112131415"); } - assertTrue(f.length() > 10); + assumeTrue(f.length() > 10); File g = File.createTempFile("junit", null, temporaryFolder); From ea184f98f7363d1d4e989948a06d6f44d4aae699 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 1 Feb 2025 08:42:20 -0500 Subject: [PATCH 7/9] spotless --- .../maven/enforcer/rules/files/TestRequireFilesDontExist.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java index de18f20d2..59e9773cb 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java @@ -28,9 +28,9 @@ import org.junit.jupiter.api.io.TempDir; import static org.junit.jupiter.api.Assertions.assertEquals; +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 static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assumptions.assumeFalse; import static org.junit.jupiter.api.Assumptions.assumeTrue; From 6da5730b2f0e4d8802ddc8999b25d11e3b2d3bac Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 21 Feb 2025 07:59:55 -0500 Subject: [PATCH 8/9] fix --- .../maven/enforcer/rules/files/TestRequireFilesDontExist.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java index 59e9773cb..4d339fa34 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java @@ -124,7 +124,7 @@ void testFileDoesNotExistSatisfyAny() throws EnforcerRuleException, IOException File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); - assumeTrue(f.exists()); + assumeFalse(f.exists()); File g = File.createTempFile("junit", null, temporaryFolder); From 4a7219811098aa9f57633e3f65fbfdf5b2c5f8ca Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 29 Sep 2025 08:07:53 -0400 Subject: [PATCH 9/9] import --- .../apache/maven/enforcer/rules/files/TestRequireFilesSize.java | 1 + 1 file changed, 1 insertion(+) diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java index 9a80fd855..49242166a 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java @@ -42,6 +42,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue;