Skip to content

Commit 818e69d

Browse files
icydeeicydee
committed
Further tidy up of tests
1 parent 1bb76ee commit 818e69d

18 files changed

+118
-66
lines changed

‎t/210_OreStorage.t

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ use 5.010;
66

77

88
use TestHelper;
9+
TestHelper->clear_all_test_empires;
10+
911
my $tester = TestHelper->new->generate_test_empire;
12+
1013
my $db = Lacuna->db;
1114
my $empire = $tester->empire;
1215
my $session_id = $tester->session->id;
@@ -20,5 +23,5 @@ $result = $tester->post('orestorage', 'view', [$session_id, $building_id]);
2023
ok(exists $result->{result}{ore_stored}{bauxite}, "got ore storage");
2124

2225
END {
23-
$tester->cleanup;
26+
TestHelper->clear_all_test_empires;
2427
}

‎t/220_Parliament.t

+5-7
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ use DateTime;
77
use Lacuna::Constants qw(ORE_TYPES);
88

99
use TestHelper;
10+
TestHelper->clear_all_test_empires;
11+
1012
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
1113
my $session_id = $tester->session->id;
1214
my $empire = $tester->empire;
1315
my $home = $empire->home_planet;
1416

15-
my $friend = TestHelper->new(empire_name => 'Friend')->generate_test_empire->build_infrastructure;
17+
my $friend = TestHelper->new(empire_name => 'TLE TEST Friend 1')->generate_test_empire->build_infrastructure;
1618

17-
my $friend2 = TestHelper->new(empire_name => 'Friend')->generate_test_empire->build_infrastructure;
19+
my $friend2 = TestHelper->new(empire_name => 'TLE TEST Friend 2')->generate_test_empire->build_infrastructure;
1820
$friend2->empire->is_isolationist(0);
1921
$friend2->empire->update;
2022

@@ -220,16 +222,12 @@ is($props[0]->{name}, 'Abandon Station', 'abandon station proposed');
220222
$result = $tester->post('parliament', 'cast_vote', [$session_id, $par->id, $props[0]->{id}, 1]);
221223
is($result->{result}{proposition}{my_vote}, 1, 'got my vote');
222224

223-
sleep 5;
224-
225225
$result = $tester->post('inbox','view_inbox', [$session_id]);
226226

227227
my @messages = sort { $b->{id} <=> $a->{id} } @{ $result->{result}{messages} };
228228
ok($messages[0]->{subject} =~ /^Pass: Abandon Station/, 'Pass email received');
229229

230230
END {
231231
$station->sanitize;
232-
$friend2->cleanup;
233-
$friend->cleanup;
234-
$tester->cleanup;
232+
TestHelper->clear_all_test_empires;
235233
}

‎t/230_PlanetaryCommand.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use Data::Dumper;
55
use 5.010;
66

77
use TestHelper;
8+
TestHelper->clear_all_test_empires;
9+
810
my $tester = TestHelper->new->generate_test_empire;
911
my $session_id = $tester->session->id;
1012
my $empire = $tester->empire;
@@ -21,5 +23,5 @@ is(ref $result->{result}{plans}, 'ARRAY', 'can view plans');
2123

2224

2325
END {
24-
$tester->cleanup;
26+
TestHelper->clear_all_test_empires;
2527
}

‎t/240_Security.pm

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ use 5.010;
66
use DateTime;
77

88
use TestHelper;
9+
TestHelper->clear_all_test_empires;
10+
911
my $tester = TestHelper->new->generate_test_empire;
1012
my $session_id = $tester->session->id;
1113
my $empire = $tester->empire;
1214
my $home = $empire->home_planet;
1315

14-
1516
my $result;
1617

17-
1818
my $uni = Lacuna->db->resultset('Lacuna::DB::Result::Building')->new({
1919
x => 0,
2020
y => -1,
@@ -74,5 +74,5 @@ is(scalar(@{$result->{result}{prisoners}}), 1, "view prisoners");
7474

7575

7676
END {
77-
$tester->cleanup;
77+
TestHelper->clear_all_test_empires;
7878
}

‎t/250_Shipyard.t

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ use 5.010;
66
use DateTime;
77

88
use TestHelper;
9+
TestHelper->clear_all_test_empires;
10+
911
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
1012
my $session_id = $tester->session->id;
1113
my $empire = $tester->empire;
1214
my $home = $empire->home_planet;
1315
my $command = $home->command;
1416

15-
1617
my $result;
1718

1819
$result = $tester->post('spaceport', 'build', [$session_id, $home->id, 0, 1]);
@@ -42,5 +43,5 @@ foreach my $resource (@resources) {
4243
}
4344

4445
END {
45-
$tester->cleanup;
46+
TestHelper->clear_all_test_empires;
4647
}

‎t/260_SpaceStationLab.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ use DateTime;
77
use Lacuna::Constants qw(ORE_TYPES);
88

99
use TestHelper;
10+
TestHelper->clear_all_test_empires;
11+
1012
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
1113
my $session_id = $tester->session->id;
1214
my $empire = $tester->empire;
@@ -72,5 +74,5 @@ ok(!exists $result->{result}{make_plan}{making}, 'subsidize making plan');
7274

7375

7476
END {
75-
$tester->cleanup;
77+
TestHelper->clear_all_test_empires;
7678
}

‎t/270_Trade.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use 5.010;
66
use DateTime;
77

88
use TestHelper;
9+
TestHelper->clear_all_test_empires;
10+
911
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
1012
my $session_id = $tester->session->id;
1113
my $empire = $tester->empire;
@@ -63,5 +65,5 @@ is(scalar @{$result->{result}{trades}}, 0, 'can call view_my_market');
6365

6466

6567
END {
66-
$tester->cleanup;
68+
TestHelper->clear_all_test_empires;
6769
}

‎t/280_Transporter.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use 5.010;
66
use DateTime;
77

88
use TestHelper;
9+
TestHelper->clear_all_test_empires;
10+
911
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
1012
my $session_id = $tester->session->id;
1113
my $empire = $tester->empire;
@@ -55,5 +57,5 @@ is(scalar @{$result->{result}{trades}}, 0, 'can call view_my_market');
5557

5658

5759
END {
58-
$tester->cleanup;
60+
TestHelper->clear_all_test_empires;
5961
}

‎t/290_University.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use Data::Dumper;
55
use 5.010;
66

77
use TestHelper;
8+
TestHelper->clear_all_test_empires;
9+
810
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
911
my $db = Lacuna->db;
1012
my $session_id = $tester->session->id;
@@ -41,5 +43,5 @@ for my $level (7..10) {
4143
}
4244

4345
END {
44-
$tester->cleanup;
46+
TestHelper->clear_all_test_empires;
4547
}

‎t/300_WasteRecycling.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use Data::Dumper;
55
use 5.010;
66

77
use TestHelper;
8+
TestHelper->clear_all_test_empires;
9+
810
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
911
my $db = Lacuna->db;
1012
my $empire = $tester->empire;
@@ -35,5 +37,5 @@ $building->finish_work;
3537
cmp_ok($building->body->water_stored, '>=', $water_stored + 5, "resources increased");
3638

3739
END {
38-
$tester->cleanup;
40+
TestHelper->clear_all_test_empires;
3941
}

‎t/320_AlliedDefense.t

+8-11
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ use DateTime;
55
use Math::Complex; # used for asteroid and planet selection
66

77
use TestHelper;
8-
TestHelper->new->cleanup;
8+
Helper->clear_all_test_empires;
99

1010
my @testers = (
1111
TestHelper->new->generate_test_empire->build_infrastructure,
12-
TestHelper->new(empire_name => 'Enemy')->generate_test_empire->build_infrastructure,
12+
TestHelper->new(empire_name => 'TLE Test Enemy')->generate_test_empire->build_infrastructure,
1313
);
1414

1515
my @asteroids = Lacuna->db->resultset('Lacuna::DB::Result::Map::Body')->search(
@@ -334,8 +334,8 @@ for my $i ( 0 .. 1 ) {
334334
for my $ship ( @{ $result->{result}{ships} } ) {
335335
$ships{$ship->{type}}++;
336336
}
337-
is( $result->{result}{status}{empire}{most_recent_message}{subject}, "Target Neutralized", 'Target neutralazed' );
338-
is( $ships{sweeper}, 2, 'Two sweepers left' );
337+
is( $result->{result}{status}{empire}{most_recent_message}{subject}, "Ship Shot Down", 'Ship shot down' );
338+
is( $ships{sweeper}, 1, 'One sweeper left' );
339339

340340
# Send a fighter to enemy asteroid
341341
my $fighter3 = Lacuna->db->resultset('Lacuna::DB::Result::Ships')->search({body_id => $tester{home}->id, type=>'fighter', task=>'Docked'},{rows=>1})->single;
@@ -382,11 +382,9 @@ for my $i ( 0 .. 1 ) {
382382
my $stake = Lacuna->db->resultset('Lacuna::DB::Result::Ships')->search({body_id => $tester{home}->id, type=>'stake'},{rows=>1})->single;
383383
diag "Sending ship ", $stake->id, " type ", $stake->type, " to ", $planet->{x}, ",", $planet->{y};
384384
$result = $tester->post('spaceport', 'send_ship', [$tester{session_id}, $stake->id, {x=>$planet->{x},y=>$planet->{y}}]);
385-
diag "Stake arrives ", $result->{result}{ship}{date_arrives};
386-
ok($result->{result}{ship}{date_arrives}, "stake sent");
387-
$stake = Lacuna->db->resultset('Lacuna::DB::Result::Ships')->search({id=>$stake->id},{rows=>1})->single; # pull the latest data on this ship
388-
$stake->arrive;
389-
385+
# Cannot send a stake to an inhabited planet
386+
is($result->{error}{code}, 1013, "Cannot send stake to inhabited planet");
387+
390388
$result = $tester->post('spaceport', 'view', [$tester{session_id}, $tester->{spaceport_id}]);
391389
is( $result->{result}{status}{empire}{most_recent_message}{subject}, "Ship Shot Down", 'Stake shot down' );
392390

@@ -452,6 +450,5 @@ diag explain $result->{result}{battle_log};
452450
}
453451

454452
END {
455-
# $testers[1]->cleanup;
456-
# $testers[0]->cleanup;
453+
TestHelper->clear_all_test_empires;
457454
}

‎t/330_JunkBuildings.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use Data::Dumper;
55
use 5.010;
66

77
use TestHelper;
8+
TestHelper->clear_all_test_empires;
9+
810
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
911
my $session_id = $tester->session->id;
1012
diag("session id: $session_id");
@@ -75,6 +77,6 @@ END {
7577
for my $build ( @builds ) {
7678
$build->{building}->delete;
7779
}
78-
$tester->cleanup;
80+
TestHelper->clear_all_test_empires;
7981
}
8082

‎t/340_Observatory.t

+17-13
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,31 @@ use 5.010;
66
use DateTime;
77

88
use TestHelper;
9+
TestHelper->clear_all_test_empires;
10+
911
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
12+
1013
my $session_id = $tester->session->id;
1114
my $empire = $tester->empire;
1215
my $home = $empire->home_planet;
1316

1417
my $result;
1518

16-
$home->ore_hour(50000);
17-
$home->water_hour(50000);
18-
$home->energy_hour(50000);
19-
$home->algae_production_hour(50000);
20-
$home->ore_capacity(50000);
21-
$home->energy_capacity(50000);
22-
$home->food_capacity(50000);
23-
$home->water_capacity(50000);
24-
$home->bauxite_stored(50000);
25-
$home->algae_stored(50000);
26-
$home->energy_stored(50000);
27-
$home->water_stored(50000);
19+
$home->ore_hour(500000);
20+
$home->water_hour(500000);
21+
$home->energy_hour(500000);
22+
$home->algae_production_hour(500000);
23+
$home->ore_capacity(500000);
24+
$home->energy_capacity(500000);
25+
$home->food_capacity(500000);
26+
$home->water_capacity(500000);
27+
$home->bauxite_stored(500000);
28+
$home->algae_stored(500000);
29+
$home->energy_stored(500000);
30+
$home->water_stored(500000);
2831
$home->needs_recalc(0);
2932
$home->update;
33+
$home->tick;
3034

3135
$result = $tester->post('spaceport', 'build', [$session_id, $home->id, 0, 1]);
3236
my $spaceport = $tester->get_building($result->{result}{building}{id});
@@ -70,5 +74,5 @@ is($result->{result}{docked_ships}{probe}, 1, "we have one probe left");
7074

7175

7276
END {
73-
$tester->cleanup;
77+
TestEmpire->clear_all_test_empires;
7478
}

‎t/350_Park.t

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use Data::Dumper;
55
use 5.010;
66

77
use TestHelper;
8+
TestHelper->clear_all_test_empires;
9+
810
my $tester = TestHelper->new->generate_test_empire;
911
my $session_id = $tester->session->id;
1012
my $empire = $tester->empire;
@@ -59,8 +61,6 @@ $building = $db->resultset('Lacuna::DB::Result::Building')->find($result->{resul
5961
$building->finish_work;
6062
cmp_ok($result->{result}{status}{planets}[0]{happiness}, '<', $building->body->happiness, "happiness is increased");
6163

62-
63-
6464
END {
65-
$tester->cleanup;
65+
TestHelper->clear_all_test_empires;
6666
}

‎t/360_Scows.t

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use 5.010;
66
use DateTime;
77

88
use TestHelper;
9+
TestHelper->clear_all_test_empires;
10+
911
my $tester = TestHelper->new->generate_test_empire;
1012
my $session_id = $tester->session->id;
1113
my $empire = $tester->empire;
@@ -80,7 +82,7 @@ Lacuna->db->resultset('Lacuna::DB::Result::Ships')->search({shipyard_id=>$shipya
8082

8183
$result = $tester->post('spaceport', 'view', [$session_id, $spaceport->id]);
8284

83-
my $enemy = TestHelper->new(empire_name => 'Enemy')->generate_test_empire->build_infrastructure;
85+
my $enemy = TestHelper->new(empire_name => 'TLE Test Enemy')->generate_test_empire->build_infrastructure;
8486
$enemy->empire->is_isolationist(0);
8587
$enemy->empire->update;
8688

@@ -140,6 +142,5 @@ is(scalar @{$result->{result}{fleet}}, 2, 'fleet sent');
140142
is($scow4->body->waste_stored, 3983, 'correct waste removed');
141143

142144
END {
143-
$enemy->cleanup;
144-
$tester->cleanup;
145+
TestHelper->clear_all_test_empires;
145146
}

‎t/380_Tutorial.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use DateTime;
66
use 5.010;
77

88
use TestHelper;
9+
TestHelper->clear_all_test_empires;
10+
911
my $tester = TestHelper->new->generate_test_empire;
1012

1113
my $session_id = $tester->session->id;
@@ -262,6 +264,6 @@ is($tutorial->finish, 1, 'turing');
262264

263265

264266
END {
265-
$tester->cleanup;
267+
TestHelper->clear_all_test_empires;
266268
}
267269

‎t/390_Distribution.t

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ use Data::Dumper;
55
use 5.010;
66

77
use TestHelper;
8+
TestHelper->clear_all_test_empires;
9+
810
my $tester = TestHelper->new->generate_test_empire->build_infrastructure;
911
my $db = Lacuna->db;
1012
my $empire = $tester->empire;
@@ -53,5 +55,5 @@ cmp_ok($resources_stored, '>', 20000, "resources added to planet");
5355
cmp_ok($resources_stored, '<', 20500, "not too many resources added to planet");
5456

5557
END {
56-
$tester->cleanup;
58+
TestHelper->clear_all_test_empires;
5759
}

0 commit comments

Comments
 (0)