[MENFORCER-430] Allow one of many files in RequiresFiles rules to pass.
diff --git a/enforcer-rules/src/site/apt/requireFilesDontExist.apt.vm b/enforcer-rules/src/site/apt/requireFilesDontExist.apt.vm
index 4172ed4..89a197a 100644
--- a/enforcer-rules/src/site/apt/requireFilesDontExist.apt.vm
+++ b/enforcer-rules/src/site/apt/requireFilesDontExist.apt.vm
@@ -35,6 +35,8 @@
* 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
index 820ae9d..c7b7132 100644
--- a/enforcer-rules/src/site/apt/requireFilesExist.apt.vm
+++ b/enforcer-rules/src/site/apt/requireFilesExist.apt.vm
@@ -35,6 +35,8 @@
* 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
index c9530ae..301765e 100644
--- a/enforcer-rules/src/site/apt/requireFilesSize.apt.vm
+++ b/enforcer-rules/src/site/apt/requireFilesSize.apt.vm
@@ -39,6 +39,8 @@
* 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/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
index 2cbe663..6980e11 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
@@ -138,7 +138,7 @@
@Test
public void testFileDoesNotExistSatisfyAny()
- throws IOException
+ throws EnforcerRuleException, IOException
{
File f = File.createTempFile( "junit", null, temporaryFolder );
f.delete();
@@ -152,16 +152,7 @@
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
index 91a386b..acb4162 100644
--- 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 @@
@Test
public void testFileExistsSatisfyAny()
- throws IOException
+ throws EnforcerRuleException, IOException
{
File f = File.createTempFile( "junit", null, temporaryFolder );
f.delete();
@@ -138,16 +138,7 @@
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
index a19383e..c4a3d3d 100644
--- 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 @@
@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 @@
rule.setMaxsize( 10 );
rule.setSatisfyAny(true);
- try
- {
- rule.execute( EnforcerTestUtils.getHelper() );
- }
- catch ( EnforcerRuleException e )
- {
- fail( "Unexpected Exception:" + e.getLocalizedMessage() );
- }
+ rule.execute( EnforcerTestUtils.getHelper() );
}
/**
