X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=t%2F01-jobs.t;h=bb2c4bafccde7a37bd30fc8de88e44f71a708878;hp=32f299b60bb777486a9d6b1b3c7c025da4401535;hb=d520092522e87991aa1c41b2718ab75989eb3219;hpb=10c4f6f5ac0c8a3d3462416fd7e2f3ce62e72788

diff --git a/t/01-jobs.t b/t/01-jobs.t
index 32f299b..bb2c4ba 100644
--- a/t/01-jobs.t
+++ b/t/01-jobs.t
@@ -3,14 +3,13 @@ use v5.14;
 use strict;
 use warnings;
 
-use t::FakeData;
-BEGIN { Gruntmaster::Data->import }
 use Gruntmaster::Daemon;
 
 use Cwd qw/cwd/;
 use File::Basename qw/fileparse/;
 use File::Slurp qw/read_file/;
 use File::Temp qw/tempdir/;
+use Hash::Merge qw/merge/;
 use List::Util qw/sum/;
 use Log::Log4perl;
 use Test::More;
@@ -18,7 +17,7 @@ use YAML::Any qw/LoadFile/;
 
 ##################################################
 
-my $loglevel = $ENV{TEST_LOG_LEVEL} // 'OFF';
+my $loglevel = $ENV{TEST_LOG_LEVEL} // ($ENV{TEST_VERBOSE} ? 'TRACE' : 'OFF');
 my $log_conf = <<CONF;
 log4perl.category.Gruntmaster.Daemon = $loglevel, stderr
 
@@ -31,18 +30,13 @@ Log::Log4perl->init(\$log_conf);
 $ENV{PATH}.=':' . cwd;
 
 sub check_job{
-  my $job = shift;
-  my $jobh = get_job $job;
-  my $meta = job_inmeta $job;
-  $meta->{result} = $jobh->{result};
-  $meta->{result_text} = $jobh->{result_text};
-  $meta->{results} = $jobh->{results};
-  if (defined $meta->{results}) {
-	delete $meta->{results}[$_]{time} for keys $meta->{results};
-  }
-  is $meta->{result}, $meta->{expected_result}, "Result is correct";
-  is $meta->{result_text}, $meta->{expected_result_text}, "Result text is correct";
-  is_deeply $meta->{results}, $meta->{expected_results}, "Results are correct";
+	my $meta = shift;
+	if (defined $meta->{results}) {
+		delete $meta->{results}[$_]{time} for keys %{$meta->{results}};
+	}
+	is $meta->{result}, $meta->{expected_result}, "Result is correct";
+	is $meta->{result_text}, $meta->{expected_result_text}, "Result text is correct";
+	is_deeply $meta->{results}, $meta->{expected_results}, "Results are correct";
 }
 
 my @problems = exists $ENV{TEST_PROBLEMS} ? map {"t/problems/$_"} split ' ', $ENV{TEST_PROBLEMS} : <t/problems/*>;
@@ -54,32 +48,29 @@ my $tempdir = tempdir CLEANUP => 1;
 my $job = 0;
 
 for my $problem (@problems) {
-  my $meta = LoadFile "$problem/meta.yml";
-  for (1 .. $meta->{testcnt}) {
-	$meta->{infile}[$_ - 1] = read_file "$problem/$_.in" if $meta->{generator} eq 'File';
-	$meta->{okfile}[$_ - 1] = read_file "$problem/$_.ok" if $meta->{runner} eq 'File';
-  }
-  if (exists $meta->{files}) {
-	  $_->{content} = read_file "$problem/$_->{name}" for values $meta->{files}
-  }
-  set_problem_meta scalar fileparse($problem), $meta;
+	my $pbmeta = LoadFile "$problem/meta.yml";
+	for (1 .. $pbmeta->{testcnt}) {
+		$pbmeta->{infile}[$_ - 1] = read_file "$problem/$_.in" if $pbmeta->{generator} eq 'File';
+		$pbmeta->{okfile}[$_ - 1] = read_file "$problem/$_.ok" if $pbmeta->{runner} eq 'File';
+	}
+	if (exists $pbmeta->{files}) {
+		$_->{content} = read_file "$problem/$_->{name}" for values %{$pbmeta->{files}}
+	}
 
- TODO: {
-	local $TODO = $meta->{todo} if exists $meta->{todo};
-	note "Now testing problem $meta->{name} ($meta->{description})";
+  TODO: {
+		local $TODO = $pbmeta->{todo} if exists $pbmeta->{todo};
+		note "Now testing problem $pbmeta->{name} ($pbmeta->{description})";
 
-	for my $source (<$problem/tests/*>) {
-	  my $meta = LoadFile "$source/meta.yml";
-	  $meta->{files}{prog}{content} = read_file "$source/$meta->{files}{prog}{name}";
-	  $job++;
-	  set_job_inmeta $job, $meta;
-	  set_job_problem $job, scalar fileparse $problem;
-	  note "Running $meta->{test_name} ($meta->{test_description})...";
-	  my $savedcwd = cwd;
-	  chdir $tempdir;
-	  Gruntmaster::Daemon::process $job;
-	  check_job $job;
-	  chdir $savedcwd;
+		for my $source (<$problem/tests/*>) {
+			my $meta = LoadFile "$source/meta.yml";
+			$meta->{files}{prog}{content} = read_file "$source/$meta->{files}{prog}{name}";
+			$meta = merge $meta, $pbmeta;
+			note "Running $meta->{test_name} ($meta->{test_description})...";
+			my $savedcwd = cwd;
+			chdir $tempdir;
+			Gruntmaster::Daemon::process $meta;
+			chdir $savedcwd;
+			check_job $meta;
+		}
 	}
-  }
 }