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

diff --git a/t/01-jobs.t b/t/01-jobs.t
index 2365b12..32f299b 100644
--- a/t/01-jobs.t
+++ b/t/01-jobs.t
@@ -3,12 +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::Copy qw/copy/;
-use File::Copy::Recursive qw/dircopy/;
-use File::Path qw/remove_tree/;
+use File::Basename qw/fileparse/;
+use File::Slurp qw/read_file/;
 use File::Temp qw/tempdir/;
 use List::Util qw/sum/;
 use Log::Log4perl;
@@ -31,8 +32,12 @@ $ENV{PATH}.=':' . cwd;
 
 sub check_job{
   my $job = shift;
-  my $meta = LoadFile "$job/meta.yml";
-  if (exists $meta->{results}) {
+  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";
@@ -45,23 +50,36 @@ plan tests => 3 * sum map { my @temp = <$_/tests/*>; scalar @temp } @problems;
 note "Problems to be tested: " . join ', ', @problems;
 
 my $tempdir = tempdir CLEANUP => 1;
-mkdir "$tempdir/jobs";
-dircopy 't/problems' => "$tempdir/pb";
+
+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;
+
  TODO: {
 	local $TODO = $meta->{todo} if exists $meta->{todo};
 	note "Now testing problem $meta->{name} ($meta->{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})...";
-	  dircopy $source => "$tempdir/jobs/job";
 	  my $savedcwd = cwd;
-	  Gruntmaster::Daemon::process "$tempdir/jobs/job";
-	  check_job "$tempdir/log/1";
+	  chdir $tempdir;
+	  Gruntmaster::Daemon::process $job;
+	  check_job $job;
 	  chdir $savedcwd;
-	  remove_tree "$tempdir/log", "$tempdir/jobs", {keep_root => 1};
 	}
   }
 }