Code cleanup, remove WWW::Efa::Error stuff for now (to be reimplemented)

2 files changed, 4 insertions, 213 deletions

diff --git a/t/50-www-efa.t b/t/50-www-efa.t
index 8144026..29e4af5 100644
--- a/t/50-www-efa.t
+++ b/t/50-www-efa.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use 5.010;
 
-use Test::More tests => 131;
+use Test::More tests => 59;
 
 BEGIN {
 	use_ok('WWW::Efa');
@@ -38,11 +38,6 @@ sub is_efa_post {
 		"$ck => $cv: conf ok",
 	);
 
-	is(
-		$efa->{'error'}, undef,
-		"$ck => $cv: No error",
-	);
-
 	foreach my $ref (@post) {
 		my ($key, $value) = @{$ref};
 		if (not defined $efa->{'post'}->{"key"} and
@@ -62,6 +57,7 @@ sub is_efa_post {
 
 sub is_efa_err {
 	my ($key, $val, $str) = @_;
+	return; # FIXME error handling
 	my $efa = efa_new([$key, $val]);
 
 	my $val_want = $val;
@@ -75,29 +71,13 @@ sub is_efa_err {
 		"conf ok: $key => $val",
 	);
 
-	isa_ok($efa->{'error'}, 'WWW::Efa::Error::Setup');
+	# FIXME actual error tests
 
-	is(
-		$efa->{'error'}->option(), $key,
-		"$key => $val: Error: Correct key",
-	);
-	is(
-		$efa->{'error'}->value(), $val_want,
-		"$key => $val: Error: Correct valuef",
-	);
-	is(
-		$efa->{'error'}->message(), $str,
-		"$key => $val: Error: String is '$str'",
-	);
 }
 
 is_efa_post('ignored', 'ignored');
 
-my $efa = new_ok('WWW::Efa' => []);
-isa_ok($efa->{'error'}, 'WWW::Efa::Error::Setup');
-is($efa->{'error'}->{'key'}, 'place');
-is($efa->{'error'}->{'value'}, 'origin');
-is($efa->{'error'}->{'message'}, 'Need at least two elements');
+my $efa;
 
 is_efa_post(
 	'via', ['MH', 'HBf'],
diff --git a/t/60-bin-efa.t b/t/60-bin-efa.t
deleted file mode 100644
index 4e46766..0000000
--- a/t/60-bin-efa.t
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use 5.010;
-
-use Test::Command tests => 94;
-
-my $efa     = 'bin/efa';
-my $testarg = "E HBf MH HBf";
-my $test_parse = "--test-parse $testarg";
-
-my $EMPTY = '';
-
-my $re_version = qr{\S*efa version \S+};
-
-sub mk_err {
-	my ($arg, $value, $message) = @_;
-	return sprintf(
-		"WWW::Efa setup error: Wrong arg for option %s: %s\n%s\n",
-		$arg, $value, $message
-	);
-}
-
-# Usage on invalid invocation
-my $cmd = Test::Command->new(cmd => "$efa");
-
-$cmd->exit_isnt_num(0);
-$cmd->stdout_is_eq($EMPTY);
-$cmd->stderr_is_eq(
-	mk_err('place', 'origin', 'Need at least two elements')
-);
-
-$cmd = Test::Command->new(cmd => "$efa E HBf MH");
-
-$cmd->exit_isnt_num(0);
-$cmd->stdout_is_eq($EMPTY);
-$cmd->stderr_is_eq(
-	mk_err('place', 'origin', 'Need at least two elements')
-);
-
-$cmd = Test::Command->new(cmd => "$efa E HBf Du HBf MH");
-
-$cmd->exit_isnt_num(0);
-$cmd->stdout_is_eq($EMPTY);
-$cmd->stderr_is_eq(
-	mk_err('place', 'origin', 'Need at least two elements')
-);
-
-for my $opt (qw/-e --exclude/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt invalid $testarg");
-
-	$cmd->exit_isnt_num(0);
-	$cmd->stdout_is_eq($EMPTY);
-	$cmd->stderr_is_eq(
-		mk_err('exclude', 'invalid', 'Must consist of zug s-bahn u-bahn stadtbahn tram stadtbus regionalbus schnellbus seilbahn schiff ast sonstige')
-	);
-}
-
-for my $opt (qw/-m --max-change/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt nan $testarg");
-
-	$cmd->exit_isnt_num(0);
-	$cmd->stdout_is_eq($EMPTY);
-	# no stderr test - depends on Getopt::Long
-}
-
-for my $opt (qw/-P --prefer/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt invalid $testarg");
-
-	$cmd->exit_isnt_num(0);
-	$cmd->stdout_is_eq($EMPTY);
-	$cmd->stderr_is_eq(
-		mk_err('prefer', 'invalid', 'Must be either speed, nowait or nowalk')
-	);
-}
-
-for my $opt (qw/-i --include/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt invalid $testarg");
-
-	$cmd->exit_isnt_num(0);
-	$cmd->stdout_is_eq($EMPTY);
-	$cmd->stderr_is_eq(
-		mk_err('include', 'invalid', 'Must be one of local/ic/ice')
-	);
-}
-
-for my $opt (qw/-w --walk-speed/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt invalid $testarg");
-
-	$cmd->exit_isnt_num(0);
-	$cmd->stdout_is_eq($EMPTY);
-	$cmd->stderr_is_eq(
-		mk_err('walk_speed', 'invalid', 'Must be normal, fast or slow')
-	);
-}
-
-for my $opt (qw/-t --time --depart/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt 35:12 $testarg");
-
-	$cmd->exit_isnt_num(0);
-	$cmd->stdout_is_eq($EMPTY);
-	$cmd->stderr_is_eq(
-		mk_err('depart', '35:12', 'Must match HH:MM')
-	);
-}
-
-for my $opt (qw/-a --arrive/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt 35:12 $testarg");
-
-	$cmd->exit_isnt_num(0);
-	$cmd->stdout_is_eq($EMPTY);
-	$cmd->stderr_is_eq(
-		mk_err('arrive', '35:12', 'Must match HH:MM')
-	);
-}
-
-for my $opt (qw/-d --date/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt 11.23.2010 $testarg");
-
-	$cmd->exit_isnt_num(0);
-	$cmd->stdout_is_eq($EMPTY);
-	$cmd->stderr_is_eq(
-		mk_err('date', '11.23.2010', 'Invalid month')
-	);
-}
-
-for my $opt (qw/-v --version/) {
-	$cmd = Test::Command->new(cmd => "$efa $opt");
-
-	$cmd->exit_is_num(0);
-	$cmd->stdout_like($re_version);
-	$cmd->stderr_is_eq($EMPTY);
-}
-
-
-for my $file (qw{
-	e_hbf_mh_hbf
-	e_hbf_du_hbf.ice
-	e_werden_e_hbf
-	e_hbf_b_hbf.ice
-	e_martinstr_e_florastr
-	})
-{
-	$cmd = Test::Command->new(cmd => "$efa $test_parse < t/in/$file");
-
-	$cmd->exit_is_num(0);
-	$cmd->stdout_is_file("t/out/$file");
-	$cmd->stderr_is_eq($EMPTY);
-}
-
-$cmd = Test::Command->new(
-	cmd => "$efa $test_parse --ignore-info '.*' < t/in/e_hbf_b_hbf.ice"
-);
-
-$cmd->exit_is_num(0);
-$cmd->stdout_is_file("t/out/e_hbf_b_hbf.ice.ignore_all");
-$cmd->stderr_is_eq($EMPTY);
-
-$cmd = Test::Command->new(
-	cmd => "$efa $test_parse --ignore-info '' < t/in/e_hbf_mh_hbf"
-);
-
-$cmd->exit_is_num(0);
-$cmd->stdout_is_file("t/out/e_hbf_mh_hbf.ignore_none");
-$cmd->stderr_is_eq($EMPTY);
-
-$cmd = Test::Command->new(
-	cmd => "$efa $test_parse < t/in/ambiguous"
-);
-
-$cmd->exit_isnt_num(0);
-$cmd->stdout_is_eq($EMPTY);
-$cmd->stderr_is_file('t/out/ambiguous');
-
-$cmd = Test::Command->new(
-	cmd => "$efa $test_parse < t/in/no_connections"
-);
-
-$cmd->exit_isnt_num(0);
-$cmd->stdout_is_eq($EMPTY);
-$cmd->stderr_is_file('t/out/no_connections');
-
-$cmd = Test::Command->new(
-	cmd => "$efa $test_parse < t/in/invalid_input"
-);
-
-$cmd->exit_isnt_num(0);
-$cmd->stdout_is_eq($EMPTY);
-$cmd->stderr_is_file('t/out/invalid_input');