projects/lwb6
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mining settings in XML dumps

Browse source 
* Empire mining settings have been included in the empire's resource
information records

* Planet-specific mining settings have been included in the resource
provider information records
This commit is contained in:
Emmanuel BENOîT 2012-01-19 10:28:12 +01:00
parent 9b346a80c2
commit 3637b6e1d1
11 changed files with 380 additions and 70 deletions
legacyworlds-server-data/db-structure/tests/admin/040-functions/200-bugs
005-dump-emp-resources-view.sql010-dump-planet-resources-view.sql

26
legacyworlds-server-data/db-structure/tests/admin/040-functions/200-bugs/005-dump-emp-resources-view.sql
View file

@ -3,7 +3,8 @@
*/
BEGIN;
/*
* We need a resource type, an empire and the associated resource record.
* We need a basic resource type, a natural resource type, an empire and
* the associated resources and mining settings records.
*/
\i utils/strings.sql
\i utils/resources.sql
@ -11,6 +12,7 @@ BEGIN;
\i utils/naming.sql
\i utils/universe.sql
SELECT _create_resources( 1 , 'resource' );
SELECT _create_natural_resources( 1 , 'natRes' );
SELECT _create_emp_names( 1 , 'empire' );
INSERT INTO emp.empires( name_id , cash )
VALUES ( _get_emp_name( 'empire1' ) , 0 );
@ -18,19 +20,37 @@ BEGIN;
empire_id , resource_name_id , empres_possessed , empres_owed
) VALUES (
_get_emp_name( 'empire1' ) , _get_string( 'resource1' ) , 1 , 2
) , (
_get_emp_name( 'empire1' ) , _get_string( 'natRes1' ) , 3 , 4
);
INSERT INTO emp.mining_settings (
empire_id , resource_name_id , empmset_weight
) VALUES (
_get_emp_name( 'empire1' ) , _get_string( 'natRes1' ) , 0
);
/***** TESTS BEGIN HERE *****/
SELECT plan( 1 );
SELECT plan( 2 );
SELECT diag_test_name( 'bugs.dump_emp_resources_view - Contents' );
SELECT diag_test_name( 'bugs.dump_emp_resources_view - Basic resources' );
SELECT set_eq( $$
SELECT empire_id , resource_name , empres_possessed , empres_owed
FROM bugs.dump_emp_resources_view
WHERE mining_priority IS NULL
$$ , $$ VALUES (
_get_emp_name( 'empire1' ) , 'resource1' , 1 , 2
) $$ );
SELECT diag_test_name( 'bugs.dump_emp_resources_view - Natural resources' );
SELECT set_eq( $$
SELECT empire_id , resource_name , empres_possessed , empres_owed ,
mining_priority
FROM bugs.dump_emp_resources_view
WHERE mining_priority IS NOT NULL
$$ , $$ VALUES (
_get_emp_name( 'empire1' ) , 'natRes1' , 3 , 4 , 0
) $$ );
SELECT * FROM finish( );
ROLLBACK;

47
legacyworlds-server-data/db-structure/tests/admin/040-functions/200-bugs/010-dump-planet-resources-view.sql
View file

@ -3,10 +3,12 @@
*/
BEGIN;
/*
* We need a couple of resources (one natural, one basic), three planets
* with valid planet resource records (two of the planets will have a
* resource provider), two empires (owning a planet with and without
* resource providers, respectively).
* We need a couple of resources (one natural, one basic), four planets
* with valid planet resource records (three of the planets will have a
* resource provider and one of them will have planet-specific mining
* settings), three empires (owning a planet without resource provider,
* with resource provider and with resource provider and mining settings,
* respectively).
*/
\i utils/strings.sql
\i utils/resources.sql
@ -15,7 +17,7 @@ BEGIN;
\i utils/universe.sql
SELECT _create_natural_resources( 1 , 'natRes' );
SELECT _create_resources( 1 , 'basicRes' );
SELECT _create_raw_planets( 3 , 'planet' );
SELECT _create_raw_planets( 4 , 'planet' );
INSERT INTO verse.planet_resources(
planet_id , resource_name_id , pres_income , pres_upkeep
) VALUES (
@ -30,22 +32,37 @@ BEGIN;
_get_map_name( 'planet3' ) , _get_string( 'basicRes1' ) , 9 , 10
) , (
_get_map_name( 'planet3' ) , _get_string( 'natRes1' ) , 11 , 12
) , (
_get_map_name( 'planet4' ) , _get_string( 'basicRes1' ) , 13 , 14
) , (
_get_map_name( 'planet4' ) , _get_string( 'natRes1' ) , 15 , 16
);
SELECT _create_resource_provider( 'planet1' , 'natRes1' );
SELECT _create_resource_provider( 'planet3' , 'natRes1' );
SELECT _create_resource_provider( 'planet4' , 'natRes1' );
SELECT _create_emp_names( 2 , 'empire' );
SELECT _create_emp_names( 3 , 'empire' );
SELECT emp.create_empire( _get_emp_name( 'empire1' ) ,
_get_map_name( 'planet1' ) ,
200.0 );
SELECT emp.create_empire( _get_emp_name( 'empire2' ) ,
_get_map_name( 'planet2' ) ,
200.0 );
SELECT emp.create_empire( _get_emp_name( 'empire3' ) ,
_get_map_name( 'planet4' ) ,
200.0 );
INSERT INTO emp.planet_mining_settings(
empire_id , planet_id , resource_name_id , emppmset_weight
) VALUES (
_get_emp_name( 'empire3' ) , _get_map_name( 'planet4' ) ,
_get_string( 'natRes1' ) , 2
);
/***** TESTS BEGIN HERE *****/
SELECT plan( 2 );
SELECT plan( 3 );
SELECT diag_test_name( 'bugs.dump_planet_resources_view - Records without resource providers' );
SELECT set_eq( $$
@ -58,16 +75,30 @@ BEGIN;
_get_emp_name( 'empire2' ) , _get_map_name( 'planet2' ) , 'basicRes1' , 5 , 6
) , (
_get_emp_name( 'empire2' ) , _get_map_name( 'planet2' ) , 'natRes1' , 7 , 8
) , (
_get_emp_name( 'empire3' ) , _get_map_name( 'planet4' ) , 'basicRes1' , 13 , 14
) $$ );
SELECT diag_test_name( 'bugs.dump_planet_resources_view - Records with resource providers' );
SELECT diag_test_name( 'bugs.dump_planet_resources_view - Records with resource providers, no settings' );
SELECT set_eq( $$
SELECT empire_id , planet_id , resource_name , pres_income , pres_upkeep
FROM bugs.dump_planet_resources_view
WHERE resprov_quantity IS NOT NULL
AND mining_priority IS NULL
$$ , $$ VALUES (
_get_emp_name( 'empire1' ) , _get_map_name( 'planet1' ) , 'natRes1' , 3 , 4
) $$ );
SELECT diag_test_name( 'bugs.dump_planet_resources_view - Records with resource providers and settings' );
SELECT set_eq( $$
SELECT empire_id , planet_id , resource_name , pres_income ,
pres_upkeep , mining_priority
FROM bugs.dump_planet_resources_view
WHERE resprov_quantity IS NOT NULL
AND mining_priority IS NOT NULL
$$ , $$ VALUES (
_get_emp_name( 'empire3' ) , _get_map_name( 'planet4' ) , 'natRes1' , 15 , 16 , 2
) $$ );
SELECT * FROM finish( );
ROLLBACK;