X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=t%2Fscans.t;fp=t%2Fscans.t;h=566d578d4f272de4186590bd413e9a774a3882b7;hp=37647d922552e3025830291d7cb754e942051a66;hb=33a44a03fa129739264f7ccd983e38c96c11a677;hpb=a482ae605a2ecb265854e6a02672524bbae2ae7a

diff --git a/t/scans.t b/t/scans.t
index 37647d9..566d578 100644
--- a/t/scans.t
+++ b/t/scans.t
@@ -28,15 +28,22 @@ my $dbh = DBI->connect( 'DBI:Mock:', '', '' )
 	is ($fleets[0]->{ships}->[0]->{ship}, 'Centaur');
 	is ($fleets[0]->{ships}->[0]->{amount}, 199900);
 	is ($fleets[0]->{amount}, 253901);
+	is ($fleets[0]->{mission}, 'Military');
 	is ($fleets[1]->{name}, 'Fleet 1');
 	is (scalar @{$fleets[1]->{ships}}, 1);
 	is ($fleets[1]->{ships}->[0]->{ship}, 'Chimera');
 	is ($fleets[1]->{ships}->[0]->{amount}, 54500);
 	is ($fleets[1]->{amount}, 54500);
+	is ($fleets[1]->{mission}, 'Military');
 	is ($fleets[2]->{name}, 'Fleet 2');
 	is ($fleets[2]->{amount}, 0);
+	is ($fleets[2]->{mission}, 'Military');
 	is ($fleets[3]->{name}, 'Fleet 3');
 	is ($fleets[3]->{amount}, 0);
+	is ($fleets[3]->{mission}, 'Military');
+	is ($fleets[4]->{name}, 'Military');
+	is ($fleets[4]->{mission}, 'Full fleet');
+	is ($fleets[4]->{amount}, 253901+54500);
 }
 
 {
@@ -48,16 +55,17 @@ my $dbh = DBI->connect( 'DBI:Mock:', '', '' )
 	};
 	doMilScan($dbh, $scan, $milscan);
 	my $history = $dbh->{mock_all_history};
-	is(scalar(@{$history}), 3, 'Correct number of statements executed');
+	is(scalar(@{$history}), 3, 'Add military scan');
 
 	#print Dumper($history), "\n";
 	{
 		my $sth = $history->[0];
 		my $exec_history = $sth->{execution_history};
 		like($sth->statement,
-			qr{INSERT INTO fleets \(name, mission, pid, tick, amount\).*}sm,
+			qr{^INSERT INTO fleets \(name, mission, pid, tick, amount\)}ism,
 		);
-		is(scalar(@{$exec_history}), 2);
+		is(scalar(@{$exec_history}), 3);
+		is(scalar(@{$exec_history->[0]->{params}}), 5);
 		is($exec_history->[0]->{params}->[0], "Base");
 		is($exec_history->[0]->{params}->[1], "Military");
 		is($exec_history->[0]->{params}->[2], $scan->{pid});
@@ -70,26 +78,36 @@ my $dbh = DBI->connect( 'DBI:Mock:', '', '' )
 		is($exec_history->[1]->{params}->[3], $scan->{tick});
 		is($exec_history->[1]->{params}->[4], 54500);
 
+		is($exec_history->[2]->{params}->[0], "Military");
+		is($exec_history->[2]->{params}->[1], "Full fleet");
+		is($exec_history->[2]->{params}->[2], $scan->{pid});
+		is($exec_history->[2]->{params}->[3], $scan->{tick});
+		is($exec_history->[2]->{params}->[4], 253901+54500);
+
 	}
 	{
 		my $sth = $history->[1];
 		my $exec_history = $sth->{execution_history};
 		like($sth->statement,
-			qr{INSERT INTO fleet_scans \(fid, id\).*}sm,
+			qr{^INSERT INTO fleet_scans \(fid, id\)}ism,
 		);
-		is(scalar(@{$exec_history}), 2);
+		is(scalar(@{$exec_history}), 3);
+		is(scalar(@{$exec_history->[0]->{params}}), 2);
 		is($exec_history->[0]->{params}->[0], $fid);
 		is($exec_history->[0]->{params}->[1], $scan->{id});
 		is($exec_history->[1]->{params}->[0], $fid);
 		is($exec_history->[1]->{params}->[1], $scan->{id});
+		is($exec_history->[2]->{params}->[0], $fid);
+		is($exec_history->[2]->{params}->[1], $scan->{id});
 	}
 	{
 		my $sth = $history->[2];
 		my $exec_history = $sth->{execution_history};
 		like($sth->statement,
-			qr{INSERT INTO fleet_ships \(fid, ship, amount\).*}sm,
+			qr{^INSERT INTO fleet_ships \(fid, ship, amount\)}ism,
 		);
-		is(scalar(@{$exec_history}), 5);
+		is(scalar(@{$exec_history}), 10);
+		is(scalar(@{$exec_history->[0]->{params}}), 3);
 		is($exec_history->[0]->{params}->[0], $fid);
 		is($exec_history->[0]->{params}->[1], 'Centaur');
 		is($exec_history->[0]->{params}->[2], 199900);
@@ -105,6 +123,21 @@ my $dbh = DBI->connect( 'DBI:Mock:', '', '' )
 		is($exec_history->[4]->{params}->[0], $fid);
 		is($exec_history->[4]->{params}->[1], 'Chimera');
 		is($exec_history->[4]->{params}->[2], 54500);
+		is($exec_history->[5]->{params}->[0], $fid);
+		is($exec_history->[5]->{params}->[1], 'Centaur');
+		is($exec_history->[5]->{params}->[2], 199900);
+		is($exec_history->[6]->{params}->[0], $fid);
+		is($exec_history->[6]->{params}->[1], 'Chimera');
+		is($exec_history->[6]->{params}->[2], 54500);
+		is($exec_history->[7]->{params}->[0], $fid);
+		is($exec_history->[7]->{params}->[1], 'Titan');
+		is($exec_history->[7]->{params}->[2], 50000);
+		is($exec_history->[8]->{params}->[0], $fid);
+		is($exec_history->[8]->{params}->[1], 'Wyvern');
+		is($exec_history->[8]->{params}->[2], 3000);
+		is($exec_history->[9]->{params}->[0], $fid);
+		is($exec_history->[9]->{params}->[1], 'Medusa');
+		is($exec_history->[9]->{params}->[2], 1001);
 	}
 
 }