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

SQL unit tests fixes

Browse source 
* Added plan() instead of no_plan() where necessary

* Removed junk from dirty tests system self-check
This commit is contained in:
Emmanuel BENOîT 2012-01-31 12:14:38 +01:00
parent 44b6ec1920
commit ba6a1e2b41
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
legacyworlds-server-data/db-structure/tests/admin/040-functions/025-resources/005-add-resource-records.sql
View file

@ -23,7 +23,7 @@ BEGIN;
SELECT defs.add_resource_records( _get_string( 'test1' ) ); SELECT defs.add_resource_records( _get_string( 'test1' ) );
/***** TESTS BEGIN HERE *****/ /***** TESTS BEGIN HERE *****/
SELECT no_plan( ); SELECT plan( 2 );
SELECT diag_test_name( 'defs.add_resource_records() - Empire record created' ); SELECT diag_test_name( 'defs.add_resource_records() - Empire record created' );
SELECT is( COUNT(*)::INT , 1 ) SELECT is( COUNT(*)::INT , 1 )
@ -36,4 +36,4 @@ BEGIN;
WHERE planet_id = 1 AND resource_name_id = _get_string( 'test1' ); WHERE planet_id = 1 AND resource_name_id = _get_string( 'test1' );
SELECT * FROM finish( ); SELECT * FROM finish( );
ROLLBACK; ROLLBACK;

4
legacyworlds-server-data/db-structure/tests/admin/040-functions/045-empire-mining/030-mset-update-apply.sql
View file

@ -21,7 +21,7 @@ BEGIN;
INSERT INTO mset_update VALUES ( 1 , 1 , 0 ) , ( 1 , 2 , 4 ); INSERT INTO mset_update VALUES ( 1 , 1 , 0 ) , ( 1 , 2 , 4 );
/***** TESTS BEGIN HERE *****/ /***** TESTS BEGIN HERE *****/
SELECT no_plan( ); SELECT plan( 8 );
SELECT diag_test_name( 'emp.mset_update_apply() - Applying valid empire update' ); SELECT diag_test_name( 'emp.mset_update_apply() - Applying valid empire update' );
SELECT ok( emp.mset_update_apply( ) ); SELECT ok( emp.mset_update_apply( ) );
@ -90,4 +90,4 @@ BEGIN;
); );
SELECT * FROM finish( ); SELECT * FROM finish( );
ROLLBACK; ROLLBACK;

4
legacyworlds-server-data/db-structure/tests/admin/050-updates/120-planet-mining/030-gu-pmc-get-data.sql
View file

@ -11,7 +11,7 @@ BEGIN;
/***** TESTS BEGIN HERE *****/ /***** TESTS BEGIN HERE *****/
SELECT no_plan( ); SELECT plan( 9 );
SELECT diag_test_name( 'sys.gu_pmc_get_data() - Neutral planet without resource providers not included' ); SELECT diag_test_name( 'sys.gu_pmc_get_data() - Neutral planet without resource providers not included' );
SELECT is_empty( $$ SELECT is_empty( $$
@ -86,4 +86,4 @@ BEGIN;
$$ ); $$ );
SELECT * FROM finish( ); SELECT * FROM finish( );
ROLLBACK; ROLLBACK;

4
legacyworlds-server-data/db-structure/tests/admin/050-updates/120-planet-mining/050-process-planet-mining-updates.sql
View file

@ -42,7 +42,7 @@ BEGIN;
/***** TESTS BEGIN HERE *****/ /***** TESTS BEGIN HERE *****/
SELECT no_plan( ); SELECT plan( 2 );
SELECT sys.process_planet_mining_updates( 0 ); SELECT sys.process_planet_mining_updates( 0 );
@ -55,4 +55,4 @@ BEGIN;
); );
SELECT * FROM finish( ); SELECT * FROM finish( );
ROLLBACK; ROLLBACK;

4
legacyworlds-server-data/db-structure/tests/dirty/000-dirty-tests-self-check/run-test.sql
View file

@ -4,9 +4,7 @@
* Insert an address, it should exist during the main test. * Insert an address, it should exist during the main test.
*/ */
BEGIN; BEGIN;
SELECT no_plan( ); SELECT plan( 1 );
SELECT pg_advisory_lock( 1 );
SELECT diag_test_name( 'Dirty test system self-check - prepare.sql was executed' ); SELECT diag_test_name( 'Dirty test system self-check - prepare.sql was executed' );
SELECT is( COUNT(*)::INT , 1 ) SELECT is( COUNT(*)::INT , 1 )