com pftt2: Issue #18: Enabled a part to clean out major files from the test pack and modified a comparison between files and ext types.:
src/com/mostc/pftt/model/core/PhptSourceTestPack.java src/com/mostc/pftt/scenario/FileSystemScenario.java

Commit: b423a5d0587eb4f97f67f2fc1434d4b99f37ba05 Author: Allen Truong <v-altruo@microsoft.com> Fri, 26 Apr 2019 12:16:31 -0700 Committer: Anatol Belski <ab@php.net> Tue, 30 Apr 2019 12:13:19 +0200 Parents: 841917a5780c269767e09305ce0c915b415622a3 Branches: master Link: http://git.php.net/?p=pftt2.git;a=commitdiff;h=b423a5d0587eb4f97f67f2fc1434d4b99f37ba05 Log: Issue #18: Enabled a part to clean out major files from the test pack and modified a comparison between files and ext types. Bugs: https://bugs.php.net/18 Changed paths: M src/com/mostc/pftt/model/core/PhptSourceTestPack.java M src/com/mostc/pftt/scenario/FileSystemScenario.java Diff: diff --git a/src/com/mostc/pftt/model/core/PhptSourceTestPack.java b/src/com/mostc/pftt/model/core/PhptSourceTestPack.java index 8ca4c78..693ad8d 100644 --- a/src/com/mostc/pftt/model/core/PhptSourceTestPack.java +++ b/src/com/mostc/pftt/model/core/PhptSourceTestPack.java @@ -106,8 +106,6 @@ public class PhptSourceTestPack extends SourceTestPack<PhptActiveTestPack, PhptT */ @Override public void cleanup(ConsoleManager cm) { - if (true) - return; // TODO temp azure cm.println(EPrintType.IN_PROGRESS, getClass(), "cleaning source-test-pack from previous PFTT or run-test.php run"); // these are symlinks(junctions) which may cause an infinite loop // @@ -144,6 +142,7 @@ public class PhptSourceTestPack extends SourceTestPack<PhptActiveTestPack, PhptT fs.deleteFileExtension(test_pack, ".skip.php"); fs.deleteFileExtension(test_pack, ".cmd"); fs.deleteFileExtension(test_pack, ".sh"); + fs.deleteFileExtension(test_pack, ".tmp"); // don't delete .php (specifically run-test.php) in root of test-pack (user may want it later) IFileChooser PHP_CHOOSER = new IFileChooser() { @Override @@ -381,7 +380,7 @@ public class PhptSourceTestPack extends SourceTestPack<PhptActiveTestPack, PhptT } } else if (f.isFile()) { String n = f.getName().toLowerCase(); - if (!(n.endsWith(".sh") && n.endsWith(".php") && n.endsWith(".diff") && n.endsWith(".out") && n.endsWith(".exp") && n.endsWith(".cmd") && n.endsWith(".stdin"))) { + if (!(n.endsWith(".sh") || n.endsWith(".php") || n.endsWith(".diff") || n.endsWith(".out") || n.endsWith(".exp") || n.endsWith(".cmd") || n.endsWith(".stdin"))) { // ignore these files. they may be left over if the user ran run-test.php or PFTT and aren't actually used for testing // // test files we need are usually .inc but may also be .db... may be others (especially in future) diff --git a/src/com/mostc/pftt/scenario/FileSystemScenario.java b/src/com/mostc/pftt/scenario/FileSystemScenario.java index a3b82a6..cf58e31 100644 --- a/src/com/mostc/pftt/scenario/FileSystemScenario.java +++ b/src/com/mostc/pftt/scenario/FileSystemScenario.java @@ -39,7 +39,7 @@ public abstract class FileSystemScenario extends AbstractSerialScenario { return deleteChosenFiles(dir, new IFileChooser() { @Override public boolean choose(String dir, String name, boolean isdir) { - return StringUtil.endsWithIC(dir, ext); + return StringUtil.endsWithIC(name, ext); } }); }