cmp_document branch

t/05_lexer.t

@@ -3,6 +3,7 @@
 # Compare a large number of specific constructs
 # with the expected Lexer dumps.
 
+use lib 't/lib';
 use strict;
 BEGIN {
 	no warnings 'once';
@@ -23,7 +24,7 @@ use PPI::Dumper;
 use Test::More tests => 219;
 use Test::NoWarnings;
 use File::Spec::Functions ':ALL';
-use t::lib::PPI;
+use PPI::Test::Run;
 
 
 
@@ -33,4 +34,4 @@ use t::lib::PPI;
 # Code/Dump Testing
 # ntests = 2 + 15 * nfiles
 
-t::lib::PPI->run_testdir( catdir( 't', 'data', '05_lexer' ) );
+PPI::Test::Run->run_testdir( catdir( 't', 'data', '05_lexer' ) );

t/07_token.t

@@ -2,6 +2,7 @@
 
 # Formal unit tests for specific PPI::Token classes
 
+use lib 't/lib';
 use strict;
 BEGIN {
 	no warnings 'once';
@@ -10,11 +11,11 @@ BEGIN {
 	$PPI::Lexer::X_TOKENIZER ||= $ENV{X_TOKENIZER};
 }
 
-# Execute the tests
 use Test::More tests => 447;
 use Test::NoWarnings;
 use File::Spec::Functions ':ALL';
-use t::lib::PPI;
+use List::MoreUtils ();
+use PPI::Test::Run;
 use PPI;
 
 
@@ -25,7 +26,7 @@ use PPI;
 # Code/Dump Testing
 # ntests = 2 + 12 * nfiles
 
-t::lib::PPI->run_testdir( catdir( 't', 'data', '07_token' ) );
+PPI::Test::Run->run_testdir( catdir( 't', 'data', '07_token' ) );
 
 
 
@@ -49,7 +50,7 @@ SCOPE: {
 		'@::foo'     => '@main::foo',
 		'$foo::bar'  => '$foo::bar',
 		'$ foo\'bar' => '$foo::bar',
-		);
+	);
 	while ( @symbols ) {
 		my ($value, $canon) = ( shift(@symbols), shift(@symbols) );
 		my $Symbol = PPI::Token::Symbol->new( $value );
@@ -155,10 +156,11 @@ foreach my $code ( '08', '09', '0778', '0779' ) {
 	isa_ok($token, 'PPI::Token::Number::Octal');
 	is("$token", $code, "tokenize bad octal '$code'");
 	ok($token->{_error} && $token->{_error} =~ m/octal/i,
-	   'invalid octal number should trigger parse error');
+		'invalid octal number should trigger parse error');
 	is($token->literal, undef, "literal('$code') is undef");
 }
 
+
 BINARY: {
 	my @tests = (
 		# Good binary numbers
@@ -175,25 +177,26 @@ BINARY: {
 		{ code => '0b012',      error => 1, value => 0 },
 		{ code => '0B012',      error => 1, value => 0 },
 		{ code => '0B0121',     error => 1, value => 0 },
-        );
+	);
 	foreach my $test ( @tests ) {
 		my $code = $test->{code};
 		my $T = PPI::Tokenizer->new( \$code );
 		my $token = $T->get_token;
 		isa_ok($token, 'PPI::Token::Number::Binary');
-                if ( $test->{error} ) {
-                    ok($token->{_error} && $token->{_error} =~ m/binary/i,
-                       'invalid binary number should trigger parse error');
-                    is($token->literal, undef, "literal('$code') is undef");
-                }
-                else {
-                    ok(!$token->{_error}, "no error for '$code'");
-                    is($token->literal, $test->{value}, "literal('$code') is $test->{value}");
-                }
-                is($token->content, $code, "parsed everything");
+		if ( $test->{error} ) {
+			ok($token->{_error} && $token->{_error} =~ m/binary/i,
+				'invalid binary number should trigger parse error');
+			is($token->literal, undef, "literal('$code') is undef");
+		}
+		else {
+			ok(!$token->{_error}, "no error for '$code'");
+			is($token->literal, $test->{value}, "literal('$code') is $test->{value}");
+		}
+		is($token->content, $code, "parsed everything");
 	}
 }
 
+
 HEX: {
 	my @tests = (
 		# Good hex numbers--entire thing goes in the token
@@ -233,6 +236,6 @@ HEX: {
 		isa_ok($token, 'PPI::Token::Number::Hex');
 		ok(!$token->{_error}, "no error for '$code' even on invalid digits");
 		is($token->content, $test->{parsed}, "correctly parsed everything expected");
-                is($token->literal, $test->{value}, "literal('$code') is $test->{value}");
+		is($token->literal, $test->{value}, "literal('$code') is $test->{value}");
 	}
 }

t/08_regression.t

@@ -4,6 +4,7 @@
 
 # Some other regressions tests are included here for simplicity.
 
+use lib 't/lib';
 use strict;
 BEGIN {
 	no warnings 'once';
@@ -17,7 +18,7 @@ use Test::More tests => 933;
 use Test::NoWarnings;
 use File::Spec::Functions ':ALL';
 use Params::Util qw{_INSTANCE};
-use t::lib::PPI;
+use PPI::Test::Run;
 use PPI::Lexer;
 use PPI::Dumper;
 
@@ -35,7 +36,7 @@ sub pause {
 # Code/Dump Testing
 # ntests = 2 + 14 * nfiles
 
-t::lib::PPI->run_testdir(qw{ t data 08_regression });
+PPI::Test::Run->run_testdir(qw{ t data 08_regression });
 
 
 

t/19_selftesting.t

@@ -5,6 +5,7 @@
 
 # Using PPI to analyse its own code at install-time? Fuck yeah! :)
 
+use lib 't/lib';
 use strict;
 BEGIN {
 	no warnings 'once';
@@ -20,7 +21,7 @@ use File::Spec::Functions ':ALL';
 use Params::Util qw{_CLASS _ARRAY _INSTANCE _IDENTIFIER};
 use Class::Inspector;
 use PPI;
-use t::lib::PPI;
+use PPI::Test::Object;
 
 use constant CI => 'Class::Inspector';
 

t/25_increment.t

@@ -5,6 +5,7 @@
 # state between an empty document and the entire file to make sure
 # all of them parse as legal documents and don't crash the parser.
 
+use lib 't/lib';
 use strict;
 BEGIN {
 	no warnings 'once';
@@ -19,7 +20,7 @@ use File::Spec::Functions ':ALL';
 use Params::Util qw{_INSTANCE};
 use PPI::Lexer;
 use PPI::Dumper;
-use t::lib::PPI;
+use PPI::Test::Run;
 
 
 
@@ -28,4 +29,4 @@ use t::lib::PPI;
 #####################################################################
 # Code/Dump Testing
 
-t::lib::PPI->increment_testdir(qw{ t data 08_regression });
+PPI::Test::Run->increment_testdir(qw{ t data 08_regression });

t/26_bom.t

@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+use lib 't/lib';
 use strict;
 BEGIN {
 	no warnings 'once';
@@ -11,7 +12,7 @@ BEGIN {
 # For each new item in t/data/08_regression add another 14 tests
 use Test::More tests => 21;
 use Test::NoWarnings;
-use t::lib::PPI;
+use PPI::Test::Run;
 use PPI;
 
 
@@ -22,4 +23,4 @@ use PPI;
 # Code/Dump Testing
 # ntests = 2 + 14 * nfiles
 
-t::lib::PPI->run_testdir(qw{ t data 26_bom });
+PPI::Test::Run->run_testdir(qw{ t data 26_bom });