improve naming consistency : rename plugin:available by assert:assertPluginAvailable
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@290197 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
677c0c6d33
commit
c587f48e09
8 files changed
+91
-84
No files matched your search
+43
-42
@@ -55,9 +55,47 @@
|
||||
<ant:include name="**/.processed" />
|
||||
</ant:fileset>
|
||||
</ant:delete>
|
||||
</define:tag>
|
||||
</define:tag>
|
||||
|
||||
<define:tag name="available">
|
||||
</define:taglib>
|
||||
|
||||
<define:taglib uri="assert">
|
||||
<define:tag name="assertFileExists">
|
||||
<!-- @file : Full file path -->
|
||||
<!-- @msg : optional message to be displayed -->
|
||||
<u:file var="fileAsFile" name="${file}"/>
|
||||
<j:if test="${!(fileAsFile.exists())}">
|
||||
<ant:fail>${file} does not exist.${msg}</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
<define:tag name="assertFileContains">
|
||||
<!-- @file : Full file path -->
|
||||
<!-- @match: the matching value expected -->
|
||||
<!-- @msg : optional message to be displayed -->
|
||||
<assert:assertFileExists file="${file}" msg="${msg}"/>
|
||||
<u:loadText var="fileContent" file="${file}"/>
|
||||
<j:if test="${fileContent.indexOf(match) lt 0}">
|
||||
<ant:fail>${file} does not contain string [${match}].${msg}</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
<define:tag name="assertFileNotFound">
|
||||
<!-- @file : Full file path -->
|
||||
<!-- @msg : optional message to be displayed -->
|
||||
<u:file var="fileAsFile" name="${file}"/>
|
||||
<j:if test="${fileAsFile.exists()}">
|
||||
<ant:fail>${file} found and not expected.${msg}</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
<define:tag name="assertEquals">
|
||||
<!-- @expected : the expected value -->
|
||||
<!-- @value : the actual value -->
|
||||
<!-- @msg : optional message to be displayed -->
|
||||
<j:if test="${not(expected.equals(value))}">
|
||||
<ant:fail>Expected [${expected}] but got [${value}].${msg}</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
|
||||
<define:tag name="assertPluginAvailable">
|
||||
<!-- Check parameters -->
|
||||
<maven:param-check value="${groupId}" fail="true" message="'groupId' must be specified"/>
|
||||
<maven:param-check value="${artifactId}" fail="true" message="'artifactId' must be specified"/>
|
||||
@@ -157,49 +195,12 @@ Try: maven plugin:download -DgroupId=maven -DartifactId=${pluginToTest} -Dversio
|
||||
===============================================================================
|
||||
</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
|
||||
</define:taglib>
|
||||
|
||||
<define:taglib uri="assert">
|
||||
<define:tag name="assertFileExists">
|
||||
<!-- @file : Full file path -->
|
||||
<!-- @msg : optional message to be displayed -->
|
||||
<u:file var="fileAsFile" name="${file}"/>
|
||||
<j:if test="${!(fileAsFile.exists())}">
|
||||
<ant:fail>${file} does not exist.${msg}</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
<define:tag name="assertFileContains">
|
||||
<!-- @file : Full file path -->
|
||||
<!-- @match: the matching value expected -->
|
||||
<!-- @msg : optional message to be displayed -->
|
||||
<assert:assertFileExists file="${file}" msg="${msg}"/>
|
||||
<u:loadText var="fileContent" file="${file}"/>
|
||||
<j:if test="${fileContent.indexOf(match) lt 0}">
|
||||
<ant:fail>${file} does not contain string [${match}].${msg}</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
<define:tag name="assertFileNotFound">
|
||||
<!-- @file : Full file path -->
|
||||
<!-- @msg : optional message to be displayed -->
|
||||
<u:file var="fileAsFile" name="${file}"/>
|
||||
<j:if test="${fileAsFile.exists()}">
|
||||
<ant:fail>${file} found and not expected.${msg}</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
<define:tag name="assertEquals">
|
||||
<!-- @expected : the expected value -->
|
||||
<!-- @value : the actual value -->
|
||||
<!-- @msg : optional message to be displayed -->
|
||||
<j:if test="${not(expected.equals(value))}">
|
||||
<ant:fail>Expected [${expected}] but got [${value}].${msg}</ant:fail>
|
||||
</j:if>
|
||||
</define:tag>
|
||||
</define:tag>
|
||||
|
||||
</define:taglib>
|
||||
|
||||
<j:if test="${bootstrapping == null}">
|
||||
<plugin:available groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.3" neededBy="maven-plugin-plugin"/>
|
||||
<assert:assertPluginAvailable groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.3" neededBy="${plugin.artifactId}"/>
|
||||
</j:if>
|
||||
|
||||
<goal name="plugin" prereqs="plugin:plugin" description="Build a plugin jar" />
|
||||
|
||||
Reference in new issue
Block a user