[MENFORCER-430] Allow one of many files in RequiresFiles rules to pass.

apache · Sep 11, 2022 · a06b47b · a06b47b
1 parent da61e44
commit a06b47b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 31 deletions.
diff --git a/enforcer-rules/src/site/apt/requireFilesDontExist.apt.vm b/enforcer-rules/src/site/apt/requireFilesDontExist.apt.vm
@@ -35,6 +35,8 @@ Require Files Don't Exist
    * files - A list of files to check.
 
    * allowNulls - If null files should be allowed. If allowed, they will be treated as if they do not exist. Default is false.
+
+   * satisfyAny - Allows that one of files can make the rule pass, instead of all the files. Default is false.
 
    []
 

diff --git a/enforcer-rules/src/site/apt/requireFilesExist.apt.vm b/enforcer-rules/src/site/apt/requireFilesExist.apt.vm
@@ -35,6 +35,8 @@ Require Files Exist
    * files - A list of files to check.
 
    * allowNulls - If null files should be allowed. If allowed, they will be treated as if they do exist. Default is false.
+
+   * satisfyAny - Allows that one of files can make the rule pass, instead of all the files. Default is false.
 
    []
 

diff --git a/enforcer-rules/src/site/apt/requireFilesSize.apt.vm b/enforcer-rules/src/site/apt/requireFilesSize.apt.vm
@@ -39,6 +39,8 @@ Require File Size
    * minsize - minimum size in bytes for this file.
 
    * allowNulls - If null files should be allowed. If allowed, they will be treated as if they do exist. Default is false.
+
+   * satisfyAny - Allows that one of files can make the rule pass, instead of all the files. Default is false.
 
    []
 

diff --git a/...rcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java b/...rcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
@@ -138,7 +138,7 @@ public void testFileDoesNotExist()
 
     @Test
     public void testFileDoesNotExistSatisfyAny()
-            throws IOException
+            throws EnforcerRuleException, IOException
     {
         File f = File.createTempFile( "junit", null, temporaryFolder );
         f.delete();
@@ -152,16 +152,7 @@ public void testFileDoesNotExistSatisfyAny()
         rule.setFiles( new File[] { f, g.getCanonicalFile() } );
         rule.setSatisfyAny(true);
 
-        try
-        {
-            rule.execute( EnforcerTestUtils.getHelper() );
-        }
-        catch ( EnforcerRuleException e )
-        {
-            fail( "Unexpected Exception:" + e.getLocalizedMessage() );
-        }
-
-        g.delete();
+        rule.execute( EnforcerTestUtils.getHelper() );
     }
 
     /**

diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
@@ -124,7 +124,7 @@ public void testFileDoesNotExist()
 
     @Test
     public void testFileExistsSatisfyAny()
-            throws IOException
+            throws EnforcerRuleException, IOException
     {
         File f = File.createTempFile( "junit", null, temporaryFolder );
         f.delete();
@@ -138,16 +138,7 @@ public void testFileExistsSatisfyAny()
         rule.setFiles( new File[] { f, g.getCanonicalFile() } );
         rule.setSatisfyAny(true);
 
-        try
-        {
-            rule.execute( EnforcerTestUtils.getHelper() );
-        }
-        catch ( EnforcerRuleException e )
-        {
-            fail( "Unexpected Exception:" + e.getLocalizedMessage() );
-        }
-
-        g.delete();
+        rule.execute( EnforcerTestUtils.getHelper() );
     }
 
     /**

diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
@@ -167,7 +167,7 @@ public void testFileTooBig()
 
     @Test
     public void testRequireFilesSizeSatisfyAny()
-            throws IOException
+            throws EnforcerRuleException, IOException
     {
         File f = File.createTempFile( "junit", null, temporaryFolder );
         try ( BufferedWriter out = new BufferedWriter( new FileWriter( f ) ) )
@@ -182,14 +182,7 @@ public void testRequireFilesSizeSatisfyAny()
         rule.setMaxsize( 10 );
         rule.setSatisfyAny(true);
 
-        try
-        {
-            rule.execute( EnforcerTestUtils.getHelper() );
-        }
-        catch ( EnforcerRuleException e )
-        {
-            fail( "Unexpected Exception:" + e.getLocalizedMessage() );
-        }
+        rule.execute( EnforcerTestUtils.getHelper() );
     }
 
     /**