From 386edce858fa5d6e927e0e8fe67235975d87f9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= Date: Sun, 18 May 2014 00:28:17 -0700 Subject: [PATCH] Move t -> test --- {t => test}/TestMLBridge.pm | 0 {t => test}/ast/arguments.tml | 0 {t => test}/ast/assertions.tml | 0 {t => test}/ast/basic.tml | 0 {t => test}/ast/dataless.tml | 0 {t => test}/ast/exceptions.tml | 0 {t => test}/ast/external.tml | 0 {t => test}/ast/function.tml | 0 {t => test}/ast/label.tml | 0 {t => test}/ast/markers.tml | 0 {t => test}/ast/semicolons.tml | 0 {t => test}/ast/truth.tml | 0 {t => test}/ast/types.tml | 0 {t => test}/compile-lite.t | 0 {t => test}/compile-testml-document.t | 0 {t => test}/compile.t | 7 +++++-- {t => test}/inline-bridge.t | 0 {t => test}/inline.t | 3 ++- {t => test}/print.t | 3 ++- {t => test}/script/hello.pl | 0 {t => test}/standard.t | 3 ++- {t => test}/strings.t | 0 {t => test}/testml-arguments.t | 4 +++- {t => test}/testml-assertions.t | 4 +++- {t => test}/testml-basic.t | 4 +++- {t => test}/testml-dataless.t | 4 +++- {t => test}/testml-exceptions.t | 4 +++- {t => test}/testml-external.t | 4 +++- {t => test}/testml-function.t | 4 +++- {t => test}/testml-label.t | 4 +++- {t => test}/testml-lite-arguments.t | 4 +++- {t => test}/testml-lite-basic.t | 4 +++- {t => test}/testml-lite-exceptions.t | 4 +++- {t => test}/testml-lite-semicolons.t | 4 +++- {t => test}/testml-lite.yaml | 4 +++- {t => test}/testml-markers.t | 4 +++- {t => test}/testml-semicolons.t | 4 +++- {t => test}/testml-semicolons2.t | 4 +++- {t => test}/testml-standard.t | 4 +++- {t => test}/testml-truth.t | 4 +++- {t => test}/testml-types.t | 4 +++- {t => test}/testml.yaml | 6 ++++-- {t => test}/testml/arguments.tml | 0 {t => test}/testml/assertions.tml | 0 {t => test}/testml/basic.tml | 0 {t => test}/testml/dataless.tml | 0 {t => test}/testml/exceptions.tml | 0 {t => test}/testml/external.tml | 0 {t => test}/testml/external1.tml | 0 {t => test}/testml/external2.tml | 0 {t => test}/testml/function.tml | 0 {t => test}/testml/label.tml | 0 {t => test}/testml/markers.tml | 0 {t => test}/testml/semicolons.tml | 0 {t => test}/testml/semicolons2.tml | 0 {t => test}/testml/standard.tml | 0 {t => test}/testml/truth.tml | 0 {t => test}/testml/types.tml | 0 58 files changed, 72 insertions(+), 26 deletions(-) rename {t => test}/TestMLBridge.pm (100%) rename {t => test}/ast/arguments.tml (100%) rename {t => test}/ast/assertions.tml (100%) rename {t => test}/ast/basic.tml (100%) rename {t => test}/ast/dataless.tml (100%) rename {t => test}/ast/exceptions.tml (100%) rename {t => test}/ast/external.tml (100%) rename {t => test}/ast/function.tml (100%) rename {t => test}/ast/label.tml (100%) rename {t => test}/ast/markers.tml (100%) rename {t => test}/ast/semicolons.tml (100%) rename {t => test}/ast/truth.tml (100%) rename {t => test}/ast/types.tml (100%) rename {t => test}/compile-lite.t (100%) rename {t => test}/compile-testml-document.t (100%) rename {t => test}/compile.t (89%) rename {t => test}/inline-bridge.t (100%) rename {t => test}/inline.t (86%) rename {t => test}/print.t (78%) rename {t => test}/script/hello.pl (100%) rename {t => test}/standard.t (71%) rename {t => test}/strings.t (100%) rename {t => test}/testml-arguments.t (67%) rename {t => test}/testml-assertions.t (67%) rename {t => test}/testml-basic.t (66%) rename {t => test}/testml-dataless.t (66%) rename {t => test}/testml-exceptions.t (67%) rename {t => test}/testml-external.t (66%) rename {t => test}/testml-function.t (66%) rename {t => test}/testml-label.t (66%) rename {t => test}/testml-lite-arguments.t (76%) rename {t => test}/testml-lite-basic.t (75%) rename {t => test}/testml-lite-exceptions.t (76%) rename {t => test}/testml-lite-semicolons.t (76%) rename {t => test}/testml-lite.yaml (85%) rename {t => test}/testml-markers.t (66%) rename {t => test}/testml-semicolons.t (67%) rename {t => test}/testml-semicolons2.t (67%) rename {t => test}/testml-standard.t (66%) rename {t => test}/testml-truth.t (66%) rename {t => test}/testml-types.t (66%) rename {t => test}/testml.yaml (84%) rename {t => test}/testml/arguments.tml (100%) rename {t => test}/testml/assertions.tml (100%) rename {t => test}/testml/basic.tml (100%) rename {t => test}/testml/dataless.tml (100%) rename {t => test}/testml/exceptions.tml (100%) rename {t => test}/testml/external.tml (100%) rename {t => test}/testml/external1.tml (100%) rename {t => test}/testml/external2.tml (100%) rename {t => test}/testml/function.tml (100%) rename {t => test}/testml/label.tml (100%) rename {t => test}/testml/markers.tml (100%) rename {t => test}/testml/semicolons.tml (100%) rename {t => test}/testml/semicolons2.tml (100%) rename {t => test}/testml/standard.tml (100%) rename {t => test}/testml/truth.tml (100%) rename {t => test}/testml/types.tml (100%) diff --git a/t/TestMLBridge.pm b/test/TestMLBridge.pm similarity index 100% rename from t/TestMLBridge.pm rename to test/TestMLBridge.pm diff --git a/t/ast/arguments.tml b/test/ast/arguments.tml similarity index 100% rename from t/ast/arguments.tml rename to test/ast/arguments.tml diff --git a/t/ast/assertions.tml b/test/ast/assertions.tml similarity index 100% rename from t/ast/assertions.tml rename to test/ast/assertions.tml diff --git a/t/ast/basic.tml b/test/ast/basic.tml similarity index 100% rename from t/ast/basic.tml rename to test/ast/basic.tml diff --git a/t/ast/dataless.tml b/test/ast/dataless.tml similarity index 100% rename from t/ast/dataless.tml rename to test/ast/dataless.tml diff --git a/t/ast/exceptions.tml b/test/ast/exceptions.tml similarity index 100% rename from t/ast/exceptions.tml rename to test/ast/exceptions.tml diff --git a/t/ast/external.tml b/test/ast/external.tml similarity index 100% rename from t/ast/external.tml rename to test/ast/external.tml diff --git a/t/ast/function.tml b/test/ast/function.tml similarity index 100% rename from t/ast/function.tml rename to test/ast/function.tml diff --git a/t/ast/label.tml b/test/ast/label.tml similarity index 100% rename from t/ast/label.tml rename to test/ast/label.tml diff --git a/t/ast/markers.tml b/test/ast/markers.tml similarity index 100% rename from t/ast/markers.tml rename to test/ast/markers.tml diff --git a/t/ast/semicolons.tml b/test/ast/semicolons.tml similarity index 100% rename from t/ast/semicolons.tml rename to test/ast/semicolons.tml diff --git a/t/ast/truth.tml b/test/ast/truth.tml similarity index 100% rename from t/ast/truth.tml rename to test/ast/truth.tml diff --git a/t/ast/types.tml b/test/ast/types.tml similarity index 100% rename from t/ast/types.tml rename to test/ast/types.tml diff --git a/t/compile-lite.t b/test/compile-lite.t similarity index 100% rename from t/compile-lite.t rename to test/compile-lite.t diff --git a/t/compile-testml-document.t b/test/compile-testml-document.t similarity index 100% rename from t/compile-testml-document.t rename to test/compile-testml-document.t diff --git a/t/compile.t b/test/compile.t similarity index 89% rename from t/compile.t rename to test/compile.t index c9c35f1..53e3017 100644 --- a/t/compile.t +++ b/test/compile.t @@ -15,6 +15,9 @@ use TestML::Runtime; use TestML::Compiler::Pegex; use TestML::Compiler::Lite; use YAML::XS; +use File::Basename; + +my $test_dir = dirname(__FILE__); test('testml/arguments.tml', 'TestML::Compiler::Pegex'); test('testml/assertions.tml', 'TestML::Compiler::Pegex'); @@ -37,12 +40,12 @@ test('testml/semicolons.tml', 'TestML::Compiler::Lite'); sub test { my ($file, $compiler) = @_; (my $filename = $file) =~ s!(.*)/!!; - my $runtime = TestML::Runtime->new(base => "t/$1"); + my $runtime = TestML::Runtime->new(base => "$test_dir/$1"); my $testml = $runtime->read_testml_file($filename); my $ast1 = $compiler->new->compile($testml); my $yaml1 = Dump($ast1); - my $ast2 = YAML::XS::LoadFile("t/ast/$filename"); + my $ast2 = YAML::XS::LoadFile("$test_dir/ast/$filename"); my $yaml2 = Dump($ast2); is $yaml1, $yaml2, "$filename - $compiler"; diff --git a/t/inline-bridge.t b/test/inline-bridge.t similarity index 100% rename from t/inline-bridge.t rename to test/inline-bridge.t diff --git a/t/inline.t b/test/inline.t similarity index 86% rename from t/inline.t rename to test/inline.t index 1aed2c1..bc6ca80 100644 --- a/t/inline.t +++ b/test/inline.t @@ -1,4 +1,5 @@ -use lib 't'; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/print.t b/test/print.t similarity index 78% rename from t/print.t rename to test/print.t index 6a2d17b..21628ee 100644 --- a/t/print.t +++ b/test/print.t @@ -1,5 +1,6 @@ use strict; use Test::More; +use File::Basename; BEGIN { if (not eval "use Capture::Tiny ':all'; 1") { @@ -9,7 +10,7 @@ BEGIN { } my ($out, $err) = capture { - system $^X, '-Ilib', 't/script/hello.pl'; + system $^X, '-Ilib', dirname(__FILE__).'/script/hello.pl'; }; die "Run failed:\nstdout: $out\nstderr:$err\n" unless 0 == $?; diff --git a/t/script/hello.pl b/test/script/hello.pl similarity index 100% rename from t/script/hello.pl rename to test/script/hello.pl diff --git a/t/standard.t b/test/standard.t similarity index 71% rename from t/standard.t rename to test/standard.t index 2a337aa..5c32b42 100644 --- a/t/standard.t +++ b/test/standard.t @@ -1,4 +1,5 @@ -use lib 't'; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/strings.t b/test/strings.t similarity index 100% rename from t/strings.t rename to test/strings.t diff --git a/t/testml-arguments.t b/test/testml-arguments.t similarity index 67% rename from t/testml-arguments.t rename to test/testml-arguments.t index 9716d6d..77da718 100644 --- a/t/testml-arguments.t +++ b/test/testml-arguments.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-assertions.t b/test/testml-assertions.t similarity index 67% rename from t/testml-assertions.t rename to test/testml-assertions.t index 7d3c01b..e23370b 100644 --- a/t/testml-assertions.t +++ b/test/testml-assertions.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-basic.t b/test/testml-basic.t similarity index 66% rename from t/testml-basic.t rename to test/testml-basic.t index cae1c2a..c8ae92c 100644 --- a/t/testml-basic.t +++ b/test/testml-basic.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-dataless.t b/test/testml-dataless.t similarity index 66% rename from t/testml-dataless.t rename to test/testml-dataless.t index ceb084f..85d9928 100644 --- a/t/testml-dataless.t +++ b/test/testml-dataless.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-exceptions.t b/test/testml-exceptions.t similarity index 67% rename from t/testml-exceptions.t rename to test/testml-exceptions.t index ef391f4..e5909fc 100644 --- a/t/testml-exceptions.t +++ b/test/testml-exceptions.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-external.t b/test/testml-external.t similarity index 66% rename from t/testml-external.t rename to test/testml-external.t index b30c6e3..d589f5c 100644 --- a/t/testml-external.t +++ b/test/testml-external.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-function.t b/test/testml-function.t similarity index 66% rename from t/testml-function.t rename to test/testml-function.t index 63f58b0..795903e 100644 --- a/t/testml-function.t +++ b/test/testml-function.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-label.t b/test/testml-label.t similarity index 66% rename from t/testml-label.t rename to test/testml-label.t index 5dec767..6a22d67 100644 --- a/t/testml-label.t +++ b/test/testml-label.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-lite-arguments.t b/test/testml-lite-arguments.t similarity index 76% rename from t/testml-lite-arguments.t rename to test/testml-lite-arguments.t index d336656..b6f148e 100644 --- a/t/testml-lite-arguments.t +++ b/test/testml-lite-arguments.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestML::Compiler::Lite; use TestMLBridge; diff --git a/t/testml-lite-basic.t b/test/testml-lite-basic.t similarity index 75% rename from t/testml-lite-basic.t rename to test/testml-lite-basic.t index 463c94e..bdab08c 100644 --- a/t/testml-lite-basic.t +++ b/test/testml-lite-basic.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestML::Compiler::Lite; use TestMLBridge; diff --git a/t/testml-lite-exceptions.t b/test/testml-lite-exceptions.t similarity index 76% rename from t/testml-lite-exceptions.t rename to test/testml-lite-exceptions.t index 41abeda..7f4d4be 100644 --- a/t/testml-lite-exceptions.t +++ b/test/testml-lite-exceptions.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestML::Compiler::Lite; use TestMLBridge; diff --git a/t/testml-lite-semicolons.t b/test/testml-lite-semicolons.t similarity index 76% rename from t/testml-lite-semicolons.t rename to test/testml-lite-semicolons.t index 294e6f6..7432bc3 100644 --- a/t/testml-lite-semicolons.t +++ b/test/testml-lite-semicolons.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestML::Compiler::Lite; use TestMLBridge; diff --git a/t/testml-lite.yaml b/test/testml-lite.yaml similarity index 85% rename from t/testml-lite.yaml rename to test/testml-lite.yaml index 62fc072..7b20178 100644 --- a/t/testml-lite.yaml +++ b/test/testml-lite.yaml @@ -1,7 +1,9 @@ source_testml_dir: ../../testml-tml local_testml_dir: ./testml test_file_template: | - use lib 't'; + use strict; + use File::Basename; + use lib dirname(__FILE__); use TestML; use TestML::Compiler::Lite; use TestMLBridge; diff --git a/t/testml-markers.t b/test/testml-markers.t similarity index 66% rename from t/testml-markers.t rename to test/testml-markers.t index fa941b0..e873d64 100644 --- a/t/testml-markers.t +++ b/test/testml-markers.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-semicolons.t b/test/testml-semicolons.t similarity index 67% rename from t/testml-semicolons.t rename to test/testml-semicolons.t index 87a9335..7d40635 100644 --- a/t/testml-semicolons.t +++ b/test/testml-semicolons.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-semicolons2.t b/test/testml-semicolons2.t similarity index 67% rename from t/testml-semicolons2.t rename to test/testml-semicolons2.t index dbb150c..f83280f 100644 --- a/t/testml-semicolons2.t +++ b/test/testml-semicolons2.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-standard.t b/test/testml-standard.t similarity index 66% rename from t/testml-standard.t rename to test/testml-standard.t index 2a337aa..f013c73 100644 --- a/t/testml-standard.t +++ b/test/testml-standard.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-truth.t b/test/testml-truth.t similarity index 66% rename from t/testml-truth.t rename to test/testml-truth.t index 5aac385..3f18d49 100644 --- a/t/testml-truth.t +++ b/test/testml-truth.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml-types.t b/test/testml-types.t similarity index 66% rename from t/testml-types.t rename to test/testml-types.t index 9519b9e..a9638b9 100644 --- a/t/testml-types.t +++ b/test/testml-types.t @@ -1,4 +1,6 @@ -use lib 't'; +use strict; +use File::Basename; +use lib dirname(__FILE__); use TestML; use TestMLBridge; diff --git a/t/testml.yaml b/test/testml.yaml similarity index 84% rename from t/testml.yaml rename to test/testml.yaml index 66f7244..05f0d81 100644 --- a/t/testml.yaml +++ b/test/testml.yaml @@ -1,7 +1,10 @@ source_testml_dir: ../../testml-tml local_testml_dir: ./testml +test_file_prefix: testml- test_file_template: | - use lib 't'; + use strict; + use File::Basename; + use lib dirname(__FILE__); use TestML; use TestMLBridge; @@ -9,7 +12,6 @@ test_file_template: | testml => '[% file %]', bridge => 'TestMLBridge', )->run; -test_file_prefix: testml- exclude_testml_files: - comments.tml - data.tml diff --git a/t/testml/arguments.tml b/test/testml/arguments.tml similarity index 100% rename from t/testml/arguments.tml rename to test/testml/arguments.tml diff --git a/t/testml/assertions.tml b/test/testml/assertions.tml similarity index 100% rename from t/testml/assertions.tml rename to test/testml/assertions.tml diff --git a/t/testml/basic.tml b/test/testml/basic.tml similarity index 100% rename from t/testml/basic.tml rename to test/testml/basic.tml diff --git a/t/testml/dataless.tml b/test/testml/dataless.tml similarity index 100% rename from t/testml/dataless.tml rename to test/testml/dataless.tml diff --git a/t/testml/exceptions.tml b/test/testml/exceptions.tml similarity index 100% rename from t/testml/exceptions.tml rename to test/testml/exceptions.tml diff --git a/t/testml/external.tml b/test/testml/external.tml similarity index 100% rename from t/testml/external.tml rename to test/testml/external.tml diff --git a/t/testml/external1.tml b/test/testml/external1.tml similarity index 100% rename from t/testml/external1.tml rename to test/testml/external1.tml diff --git a/t/testml/external2.tml b/test/testml/external2.tml similarity index 100% rename from t/testml/external2.tml rename to test/testml/external2.tml diff --git a/t/testml/function.tml b/test/testml/function.tml similarity index 100% rename from t/testml/function.tml rename to test/testml/function.tml diff --git a/t/testml/label.tml b/test/testml/label.tml similarity index 100% rename from t/testml/label.tml rename to test/testml/label.tml diff --git a/t/testml/markers.tml b/test/testml/markers.tml similarity index 100% rename from t/testml/markers.tml rename to test/testml/markers.tml diff --git a/t/testml/semicolons.tml b/test/testml/semicolons.tml similarity index 100% rename from t/testml/semicolons.tml rename to test/testml/semicolons.tml diff --git a/t/testml/semicolons2.tml b/test/testml/semicolons2.tml similarity index 100% rename from t/testml/semicolons2.tml rename to test/testml/semicolons2.tml diff --git a/t/testml/standard.tml b/test/testml/standard.tml similarity index 100% rename from t/testml/standard.tml rename to test/testml/standard.tml diff --git a/t/testml/truth.tml b/test/testml/truth.tml similarity index 100% rename from t/testml/truth.tml rename to test/testml/truth.tml diff --git a/t/testml/types.tml b/test/testml/types.tml similarity index 100% rename from t/testml/types.tml rename to test/testml/types.tml