X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=t%2F01-jobs.t;h=bb2c4bafccde7a37bd30fc8de88e44f71a708878;hp=23a6c35b1280b6b6035490e2aefde735b047f31a;hb=d520092522e87991aa1c41b2718ab75989eb3219;hpb=197cd6a325653b82e59eb0d842a42b944b345109

diff --git a/t/01-jobs.t b/t/01-jobs.t
index 23a6c35..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,14 +30,9 @@ 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};
+	my $meta = shift;
 	if (defined $meta->{results}) {
-		delete $meta->{results}[$_]{time} for keys $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";
@@ -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';
+	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 $meta->{files}) {
-		$_->{content} = read_file "$problem/$_->{name}" for values $meta->{files}
+	if (exists $pbmeta->{files}) {
+		$_->{content} = read_file "$problem/$_->{name}" for values %{$pbmeta->{files}}
 	}
-	set_problem_meta scalar fileparse($problem), $meta;
 
   TODO: {
-		local $TODO = $meta->{todo} if exists $meta->{todo};
-		note "Now testing problem $meta->{name} ($meta->{description})";
+		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;
+			$meta = merge $meta, $pbmeta;
 			note "Running $meta->{test_name} ($meta->{test_description})...";
 			my $savedcwd = cwd;
 			chdir $tempdir;
-			Gruntmaster::Daemon::process $job;
-			check_job $job;
+			Gruntmaster::Daemon::process $meta;
 			chdir $savedcwd;
+			check_job $meta;
 		}
 	}
 }