[libcatmandu-perl] 82/101: os independent paths in tests
Jonas Smedegaard
dr at jones.dk
Tue Feb 23 13:43:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository libcatmandu-perl.
commit fb6156c5928e147d993c6882e396f4828adf7499
Author: Nicolas Steenlant <nicolas.steenlant at ugent.be>
Date: Tue Feb 9 14:44:02 2016 +0100
os independent paths in tests
---
t/Catmandu-Util.t | 6 +++---
t/Catmandu.t | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/t/Catmandu-Util.t b/t/Catmandu-Util.t
index 525a962..ed969ed 100644
--- a/t/Catmandu-Util.t
+++ b/t/Catmandu-Util.t
@@ -249,11 +249,11 @@ EOF
}
is Catmandu::Util::join_path("/this/..", "./is","..", "./a/../weird/path", "./../../isnt/../it"),
- File::Spec->join_path("/it"), 'join_path';
+ File::Spec->catfile("/it"), 'join_path';
is Catmandu::Util::normalize_path("/this/../is/../a/../weird/path/../../isnt/../it"),
- File::Spec->join_path("/it"), 'normalize_path';
+ File::Spec->catfile("/it"), 'normalize_path';
is Catmandu::Util::segmented_path("12345678", segment_size => 2, base_path => "/x"),
- File::Spec->join_path("/x/12/34/56/78"), 'segmented_path';
+ File::Spec->catfile("/x/12/34/56/78"), 'segmented_path';
is_deeply [Catmandu::Util::parse_data_path("foo.bar.x")],
[ ['foo','bar'], "x" ] , "parse_data_path";
diff --git a/t/Catmandu.t b/t/Catmandu.t
index 4919132..1210c19 100644
--- a/t/Catmandu.t
+++ b/t/Catmandu.t
@@ -58,7 +58,8 @@ isa_ok(Catmandu->fixer,'Catmandu::Fix','fixer test');
like(Catmandu->export_to_string({ foo => 'bar'}, 'JSON'),qr/{"foo":"bar"}/,'export_to_string');
-my ($root_vol, $root) = File::Spec->splitpath(File::Spec->catfile(getcwd(),'t'));
+my ($root_vol, $root_path, $root_file) = File::Spec->splitpath(File::Spec->catfile(getcwd(), 't'));
+my $root = File::Spec->catfile($root_path, $root_file);
is(Catmandu->root, $root, 'root');
is_deeply(Catmandu->roots,[$root],'roots');
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatmandu-perl.git
More information about the Pkg-perl-cvs-commits
mailing list