From 495d27a502274d44ba04f32fc5de0c515a41c38f Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sun, 5 Mar 2017 15:56:28 -0800 Subject: [PATCH] io.directories.search: fix linux tests. Linux doesn't return alphabetic ordering like Windows and macOS, so we just assert the paths are iterated in the correct order by depth. --- .../io/directories/search/search-tests.factor | 83 +++++++++++-------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/basis/io/directories/search/search-tests.factor b/basis/io/directories/search/search-tests.factor index 2ed2b0311d..b182692937 100644 --- a/basis/io/directories/search/search-tests.factor +++ b/basis/io/directories/search/search-tests.factor @@ -1,6 +1,7 @@ USING: combinators fry io.directories io.directories.hierarchy io.directories.search io.files.unique io.pathnames kernel -namespaces sequences sorting splitting strings tools.test ; +namespaces sequences sorting splitting strings system +tools.test ; { t } [ [ @@ -46,42 +47,49 @@ namespaces sequences sorting splitting strings tools.test ; [ drop f ] find-up-to-root ] unit-test -{ - V{ - "/a" - "/a/a" - "/a/a/a" - "/a/b" - "/a/b/a" - "/b" - "/b/a" - "/b/a/a" - "/b/b" - "/b/b/a" - "/c" - "/c/a" - "/c/a/a" - "/c/b" - "/c/b/a" +os linux? [ + { + V{ 1 2 3 2 3 1 2 3 2 3 1 2 3 2 3 } + V{ 1 1 1 2 2 2 2 2 2 3 3 3 3 3 3 } } - V{ - "/a" - "/b" - "/c" - "/a/a" - "/a/b" - "/b/a" - "/b/b" - "/c/a" - "/c/b" - "/a/a/a" - "/a/b/a" - "/b/a/a" - "/b/b/a" - "/c/a/a" - "/c/b/a" +] [ + { + V{ + "/a" + "/a/a" + "/a/a/a" + "/a/b" + "/a/b/a" + "/b" + "/b/a" + "/b/a/a" + "/b/b" + "/b/b/a" + "/c" + "/c/a" + "/c/a/a" + "/c/b" + "/c/b/a" + } + V{ + "/a" + "/b" + "/c" + "/a/a" + "/a/b" + "/b/a" + "/b/b" + "/c/a" + "/c/b" + "/a/a/a" + "/a/b/a" + "/b/a/a" + "/b/b/a" + "/c/a/a" + "/c/b/a" + } } -} [ +] if [ [ "a" make-directory "a/a" make-directory @@ -108,5 +116,10 @@ namespaces sequences sorting splitting strings tools.test ; "." recursive-directory-files current-directory get '[ _ ?head drop ] map ] with-variable + + ! Linux doesn't return alphabetic ordering + os linux? [ + [ [ path-components length ] map ] bi@ + ] when ] with-test-directory ] unit-test