Browse Source

the update attribute of the modified selector was ignored. PR 32597

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@805463 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 16 years ago
parent
commit
a7b64a73db
3 changed files with 79 additions and 2 deletions
  1. +3
    -0
      WHATSNEW
  2. +0
    -2
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
  3. +76
    -0
      src/tests/antunit/types/selectors/modified-test.xml

+ 3
- 0
WHATSNEW View File

@@ -436,6 +436,9 @@ Fixed bugs:
separator other than "/".
Bugzilla Report 35649.

* The update attribute of the modified selector was ignored.
Bugzilla Report 32597.

Other changes:
--------------
* The get task now also follows redirects from http to https


+ 0
- 2
src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java View File

@@ -298,8 +298,6 @@ public class ModifiedSelector extends BaseExtendSelector
Cache defaultCache = new PropertiesfileCache(cachefile);
Algorithm defaultAlgorithm = new DigestAlgorithm();
Comparator defaultComparator = new EqualComparator();
update = true;
selectDirectories = true;

//
// ----- Set the main attributes, pattern '*' -----


+ 76
- 0
src/tests/antunit/types/selectors/modified-test.xml View File

@@ -0,0 +1,76 @@
<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">

<import file="../../antunit-base.xml" />

<target name="tearDown" depends="antunit-base.tearDown">
<delete file="cache.properties" quiet="true"/>
</target>

<target name="testUpdate"
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=32597">
<mkdir dir="${input}"/>
<touch file="${input}/A"/>
<mkdir dir="${output}"/>
<pathconvert>
<fileset dir="${input}">
<modified/>
</fileset>
</pathconvert>
<au:assertFileExists file="cache.properties"/>
<copy todir="${output}" file="cache.properties"/>
<echo file="${input}/A">Hello</echo>
<pathconvert>
<fileset dir="${input}">
<modified update="false"/>
</fileset>
</pathconvert>
<au:assertFilesMatch
expected="${output}/cache.properties"
actual="cache.properties"/>
<pathconvert>
<fileset dir="${input}">
<modified>
<param name="update" value="false"/>
</modified>
</fileset>
</pathconvert>
<au:assertFilesMatch
expected="${output}/cache.properties"
actual="cache.properties"/>
<pathconvert>
<fileset dir="${input}">
<modified update="true"/>
</fileset>
</pathconvert>
<au:assertFilesDiffer
expected="${output}/cache.properties"
actual="cache.properties"/>
<copy todir="${output}" file="cache.properties"/>
<echo file="${input}/A">world</echo>
<pathconvert>
<fileset dir="${input}">
<modified update="true"/>
</fileset>
</pathconvert>
<au:assertFilesDiffer
expected="${output}/cache.properties"
actual="cache.properties"/>
</target>
</project>

Loading…
Cancel
Save