From 18a48239a4750a408719f0c9beb339a20e29d074 Mon Sep 17 00:00:00 2001
From: Siad Ardroumli <siad.ardroumli@gmail.com>
Date: Thu, 14 Nov 2024 13:17:35 +0100
Subject: [PATCH] Improved code coverage (#1869)

---
 .../Type/Selector/ReadableSelectorTest.php    | 52 +++++++++++++++++++
 ...WriteTest.php => WritableSelectorTest.php} | 24 +++------
 .../types/selectors/ReadableSelectorTest.xml  | 49 +++++++++++++++++
 ...WriteTest.xml => WritableSelectorTest.xml} | 14 ++---
 4 files changed, 112 insertions(+), 27 deletions(-)
 create mode 100644 tests/Phing/Test/Type/Selector/ReadableSelectorTest.php
 rename tests/Phing/Test/Type/Selector/{ReadWriteTest.php => WritableSelectorTest.php} (67%)
 create mode 100644 tests/etc/types/selectors/ReadableSelectorTest.xml
 rename tests/etc/types/selectors/{ReadWriteTest.xml => WritableSelectorTest.xml} (89%)

diff --git a/tests/Phing/Test/Type/Selector/ReadableSelectorTest.php b/tests/Phing/Test/Type/Selector/ReadableSelectorTest.php
new file mode 100644
index 0000000000..d156a0dda5
--- /dev/null
+++ b/tests/Phing/Test/Type/Selector/ReadableSelectorTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information please see
+ * <http://phing.info>.
+ */
+
+namespace Phing\Test\Type\Selector;
+
+use Phing\Test\Support\BuildFileTest;
+
+/**
+ * Class ReadableSelectorTest.
+ *
+ * Test cases for isReadable selectors.
+ *
+ * @internal
+ */
+class ReadableSelectorTest extends BuildFileTest
+{
+    public function setUp(): void
+    {
+        $this->configureProject(
+            PHING_TEST_BASE . '/etc/types/selectors/ReadableSelectorTest.xml'
+        );
+        $this->executeTarget('setup');
+    }
+
+    public function tearDown(): void
+    {
+        $this->executeTarget('clean');
+    }
+
+    public function testReadable(): void
+    {
+        $this->executeTarget(__FUNCTION__);
+        $this->assertPropertySet('selected');
+    }
+}
diff --git a/tests/Phing/Test/Type/Selector/ReadWriteTest.php b/tests/Phing/Test/Type/Selector/WritableSelectorTest.php
similarity index 67%
rename from tests/Phing/Test/Type/Selector/ReadWriteTest.php
rename to tests/Phing/Test/Type/Selector/WritableSelectorTest.php
index 24c501e645..e454354e69 100644
--- a/tests/Phing/Test/Type/Selector/ReadWriteTest.php
+++ b/tests/Phing/Test/Type/Selector/WritableSelectorTest.php
@@ -23,18 +23,18 @@
 use Phing\Test\Support\BuildFileTest;
 
 /**
- * Class ReadWriteTest.
+ * Class ReadableSelectorTest.
  *
- * Test cases for isReadable/isWritable selectors.
+ * Test cases for isReadable selectors.
  *
  * @internal
  */
-class ReadWriteTest extends BuildFileTest
+class WritableSelectorTest extends BuildFileTest
 {
     public function setUp(): void
     {
         $this->configureProject(
-            PHING_TEST_BASE . '/etc/types/selectors/ReadWriteTest.xml'
+            PHING_TEST_BASE . '/etc/types/selectors/WritableSelectorTest.xml'
         );
         $this->executeTarget('setup');
     }
@@ -44,22 +44,10 @@ public function tearDown(): void
         $this->executeTarget('clean');
     }
 
-    public function testReadable(): void
-    {
-        $this->executeTarget(__FUNCTION__);
-        $project = $this->getProject();
-        $output = $project->getProperty('output');
-        $file = $project->getProperty('file');
-        $this->assertTrue(is_readable(sprintf('%s/%s', $output, $file)));
-    }
-
     public function testWritable(): void
     {
         $this->executeTarget(__FUNCTION__);
-        $project = $this->getProject();
-        $output = $project->getProperty('output');
-        $file = $project->getProperty('file');
-        $this->assertTrue(is_writable(sprintf('%s/%s', $output, $file)));
+        $this->assertPropertySet('selected');
     }
 
     public function testUnwritable(): void
@@ -68,6 +56,6 @@ public function testUnwritable(): void
         $project = $this->getProject();
         $output = $project->getProperty('output');
         $file = $project->getProperty('file');
-        $this->assertFalse(is_writable(sprintf('%s/%s', $output, $file)));
+        $this->assertIsNotWritable(sprintf('%s/%s', $output, $file));
     }
 }
diff --git a/tests/etc/types/selectors/ReadableSelectorTest.xml b/tests/etc/types/selectors/ReadableSelectorTest.xml
new file mode 100644
index 0000000000..f41d08d01c
--- /dev/null
+++ b/tests/etc/types/selectors/ReadableSelectorTest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="test" basedir="." default="main">
+
+  <property name="tmp.dir" value="tmp/selector"/>
+  <property name="output" value="${tmp.dir}/testoutput"/>
+
+  <property name="file" value="testfile"/>
+
+  <condition property="unix">
+    <os family="unix"/>
+  </condition>
+
+  <condition property="windows">
+    <os family="windows"/>
+  </condition>
+
+  <target name="setup">
+    <mkdir dir="${output}"/>
+  </target>
+
+  <target name="unix-clean" unless="windows">
+    <chmod file="${output}/${file}" mode="777"/>
+    <delete file="${output}"/>
+  </target>
+
+  <target name="win-clean" unless="unix">
+    <attrib file="${output}/${file}" readonly="false"/>
+    <delete file="${output}"/>
+  </target>
+
+  <target name="clean" depends="unix-clean,win-clean"/>
+
+  <target name="createTestdir">
+    <mkdir dir="${output}"/>
+    <touch file="${output}/${file}"/>
+  </target>
+
+  <target name="testReadable" depends="createTestdir">
+    <condition property="selected">
+      <isfileselected file="${output}/${file}">
+        <readable/>
+      </isfileselected>
+    </condition>
+  </target>
+
+  <target name="main">
+    <echo msg="This test build file is not executable."/>
+  </target>
+</project>
diff --git a/tests/etc/types/selectors/ReadWriteTest.xml b/tests/etc/types/selectors/WritableSelectorTest.xml
similarity index 89%
rename from tests/etc/types/selectors/ReadWriteTest.xml
rename to tests/etc/types/selectors/WritableSelectorTest.xml
index c4e4457f65..3565785a82 100644
--- a/tests/etc/types/selectors/ReadWriteTest.xml
+++ b/tests/etc/types/selectors/WritableSelectorTest.xml
@@ -35,16 +35,12 @@
     <touch file="${output}/${file}"/>
   </target>
 
-  <target name="testReadable" depends="createTestdir">
-    <fileset dir="${output}">
-      <readable/>
-    </fileset>
-  </target>
-
   <target name="testWritable" depends="createTestdir">
-    <fileset dir="${output}">
-      <writable/>
-    </fileset>
+    <condition property="selected">
+      <isfileselected file="${output}/${file}">
+        <writable/>
+      </isfileselected>
+    </condition>
   </target>
 
   <target name="makeFileUnwritable"