Make failing tests fail more nicely

This commit is contained in:
theoreticalbts 2015-06-18 16:42:10 -04:00
parent 66ab805458
commit a2f7d704fe
3 changed files with 45 additions and 39 deletions

View file

@ -640,10 +640,12 @@ BOOST_FIXTURE_TEST_CASE( change_block_interval, database_fixture )
BOOST_CHECK_EQUAL(db.head_block_time().sec_since_epoch() - past_time, 2); BOOST_CHECK_EQUAL(db.head_block_time().sec_since_epoch() - past_time, 2);
} FC_LOG_AND_RETHROW() } } FC_LOG_AND_RETHROW() }
BOOST_FIXTURE_TEST_CASE( force_settlement, database_fixture ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_force_settlement, 1 )
{ try { BOOST_FIXTURE_TEST_CASE( unimp_force_settlement, database_fixture )
FC_ASSERT( !"TODO" ); {
BOOST_FAIL( "TODO" );
/* /*
try {
auto private_key = delegate_priv_key; auto private_key = delegate_priv_key;
auto private_key = generate_private_key("genesis"); auto private_key = generate_private_key("genesis");
>>>>>>> short_refactor >>>>>>> short_refactor
@ -766,24 +768,14 @@ BOOST_FIXTURE_TEST_CASE( force_settlement, database_fixture )
BOOST_CHECK(db.find(settle_id)); BOOST_CHECK(db.find(settle_id));
BOOST_CHECK_EQUAL(get_balance(nathan_id, asset_id_type()), 5878); BOOST_CHECK_EQUAL(get_balance(nathan_id, asset_id_type()), 5878);
BOOST_CHECK(!db.get_index_type<call_order_index>().indices().empty()); BOOST_CHECK(!db.get_index_type<call_order_index>().indices().empty());
*/ } FC_LOG_AND_RETHROW()
} FC_LOG_AND_RETHROW() } */
}
BOOST_FIXTURE_TEST_CASE( pop_block_twice, database_fixture ) BOOST_FIXTURE_TEST_CASE( pop_block_twice, database_fixture )
{ {
try try
{ {
/*
skip_delegate_signature = 0x01, ///< used while reindexing
skip_transaction_signatures = 0x02, ///< used by non delegate nodes
skip_undo_block = 0x04, ///< used while reindexing
skip_undo_transaction = 0x08, ///< used while applying block
skip_transaction_dupe_check = 0x10, ///< used while reindexing
skip_fork_db = 0x20, ///< used while reindexing
skip_block_size_check = 0x40, ///< used when applying locally generated transactions
skip_tapos_check = 0x80, ///< used while reindexing -- note this skips expiration check as well
*/
uint32_t skip_flags = ( uint32_t skip_flags = (
database::skip_delegate_signature database::skip_delegate_signature
| database::skip_transaction_signatures | database::skip_transaction_signatures

View file

@ -370,7 +370,8 @@ BOOST_AUTO_TEST_CASE( create_mia )
} }
} }
BOOST_AUTO_TEST_CASE( update_mia ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( broken_update_mia, 1 )
BOOST_AUTO_TEST_CASE( broken_update_mia )
{ {
try { try {
INVOKE(create_mia); INVOKE(create_mia);
@ -847,6 +848,7 @@ BOOST_AUTO_TEST_CASE( cancel_limit_order_test )
} }
} }
BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( delegate_feeds, 1 )
BOOST_AUTO_TEST_CASE( delegate_feeds ) BOOST_AUTO_TEST_CASE( delegate_feeds )
{ {
using namespace graphene::chain; using namespace graphene::chain;
@ -947,9 +949,10 @@ BOOST_AUTO_TEST_CASE( trade_amount_equals_zero )
} }
} }
BOOST_AUTO_TEST_CASE( margin_call_limit_test ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_margin_call_limit_test, 1 )
BOOST_AUTO_TEST_CASE( unimp_margin_call_limit_test )
{ try { { try {
FC_ASSERT( !"TODO - Reimplement with new short semantics" ); BOOST_FAIL( "TODO - Reimplement with new short semantics" );
/* /*
const asset_object& bitusd = create_bitasset( "BITUSD" ); const asset_object& bitusd = create_bitasset( "BITUSD" );
const asset_object& core = get_asset( GRAPHENE_SYMBOL ); const asset_object& core = get_asset( GRAPHENE_SYMBOL );
@ -1021,9 +1024,10 @@ BOOST_AUTO_TEST_CASE( margin_call_limit_test )
} }
} }
BOOST_AUTO_TEST_CASE( margin_call_limit_test_protected ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_margin_call_limit_test_protected, 1 )
BOOST_AUTO_TEST_CASE( unimp_margin_call_limit_test_protected )
{ try { { try {
FC_ASSERT( !"TODO - Reimplement with new short semantics" ); BOOST_FAIL( "TODO - Reimplement with new short semantics" );
/* /*
const asset_object& bitusd = create_bitasset( "BITUSD" ); const asset_object& bitusd = create_bitasset( "BITUSD" );
const asset_object& core = get_asset( GRAPHENE_SYMBOL ); const asset_object& core = get_asset( GRAPHENE_SYMBOL );
@ -1060,9 +1064,10 @@ BOOST_AUTO_TEST_CASE( margin_call_limit_test_protected )
} }
} }
BOOST_AUTO_TEST_CASE( dont_margin_call_limit_test ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_dont_margin_call_limit_test, 1 )
BOOST_AUTO_TEST_CASE( unimp_dont_margin_call_limit_test )
{ try { { try {
FC_ASSERT( !"TODO - Reimplement with new short semantics" ); BOOST_FAIL( "TODO - Reimplement with new short semantics" );
/* /*
const asset_object& bitusd = create_bitasset( "BITUSD" ); const asset_object& bitusd = create_bitasset( "BITUSD" );
const asset_object& core = get_asset( GRAPHENE_SYMBOL ); const asset_object& core = get_asset( GRAPHENE_SYMBOL );
@ -1098,9 +1103,10 @@ BOOST_AUTO_TEST_CASE( dont_margin_call_limit_test )
} }
} }
BOOST_AUTO_TEST_CASE( margin_call_short_test ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_margin_call_short_test, 1 )
BOOST_AUTO_TEST_CASE( unimp_margin_call_short_test )
{ try { { try {
FC_ASSERT( !"TODO - Reimplement with new short semantics" ); BOOST_FAIL( "TODO - Reimplement with new short semantics" );
/* /*
const asset_object& bitusd = create_bitasset( "BITUSD" ); const asset_object& bitusd = create_bitasset( "BITUSD" );
const asset_object& core = get_asset( GRAPHENE_SYMBOL ); const asset_object& core = get_asset( GRAPHENE_SYMBOL );
@ -1137,9 +1143,10 @@ BOOST_AUTO_TEST_CASE( margin_call_short_test )
} }
} }
BOOST_AUTO_TEST_CASE( margin_call_short_test_limit_protected ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_margin_call_short_test_limit_protected, 1 )
BOOST_AUTO_TEST_CASE( unimp_margin_call_short_test_limit_protected )
{ try { { try {
FC_ASSERT( !"TODO - Reimplement with new short semantics" ); BOOST_FAIL( "TODO - Reimplement with new short semantics" );
/* /*
const asset_object& bitusd = create_bitasset( "BITUSD" ); const asset_object& bitusd = create_bitasset( "BITUSD" );
const asset_object& core = get_asset( GRAPHENE_SYMBOL ); const asset_object& core = get_asset( GRAPHENE_SYMBOL );
@ -1354,8 +1361,8 @@ BOOST_AUTO_TEST_CASE( unimp_prediction_market_test )
* make sure that global settling cannot be performed by anyone other than the * make sure that global settling cannot be performed by anyone other than the
* issuer and only if the global settle bit is set. * issuer and only if the global settle bit is set.
*/ */
BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_global_settle_test, 1 ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_global_settle_test_2, 1 )
BOOST_AUTO_TEST_CASE( unimp_global_settle_test ) BOOST_AUTO_TEST_CASE( unimp_global_settle_test_2 )
{ {
BOOST_FAIL( "not implemented" ); BOOST_FAIL( "not implemented" );
} }

View file

@ -300,7 +300,8 @@ BOOST_AUTO_TEST_CASE( withdraw_permission_delete )
PUSH_TX( db, trx ); PUSH_TX( db, trx );
} FC_LOG_AND_RETHROW() } } FC_LOG_AND_RETHROW() }
BOOST_AUTO_TEST_CASE( mia_feeds ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( broken_mia_feeds, 1 )
BOOST_AUTO_TEST_CASE( broken_mia_feeds )
{ try { { try {
ACTORS((nathan)(dan)(ben)(vikram)); ACTORS((nathan)(dan)(ben)(vikram));
asset_id_type bit_usd_id = create_bitasset("BITUSD").id; asset_id_type bit_usd_id = create_bitasset("BITUSD").id;
@ -433,11 +434,13 @@ BOOST_AUTO_TEST_CASE( witness_create )
generate_block(0, nathan_private_key); generate_block(0, nathan_private_key);
} FC_LOG_AND_RETHROW() } } FC_LOG_AND_RETHROW() }
BOOST_AUTO_TEST_CASE( global_settle_test ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_global_settle_test, 1 )
{ try { BOOST_AUTO_TEST_CASE( unimp_global_settle_test )
ACTORS((nathan)(ben)(valentine)(dan)); {
FC_ASSERT( !"TODO - Reimplement this" ); BOOST_FAIL( "TODO - Reimplement this" );
/* /*
try {
ACTORS((nathan)(ben)(valentine)(dan));
asset_id_type bit_usd_id = create_bitasset("BITUSD", nathan_id, 100, global_settle | charge_market_fee).get_id(); asset_id_type bit_usd_id = create_bitasset("BITUSD", nathan_id, 100, global_settle | charge_market_fee).get_id();
transfer(genesis_account, ben_id, asset(10000)); transfer(genesis_account, ben_id, asset(10000));
transfer(genesis_account, valentine_id, asset(10000)); transfer(genesis_account, valentine_id, asset(10000));
@ -476,8 +479,9 @@ BOOST_AUTO_TEST_CASE( global_settle_test )
BOOST_CHECK_EQUAL(get_balance(ben_id, asset_id_type()), 10091); BOOST_CHECK_EQUAL(get_balance(ben_id, asset_id_type()), 10091);
BOOST_CHECK_EQUAL(get_balance(dan_id, bit_usd_id), 0); BOOST_CHECK_EQUAL(get_balance(dan_id, bit_usd_id), 0);
BOOST_CHECK_EQUAL(get_balance(dan_id, asset_id_type()), 9850); BOOST_CHECK_EQUAL(get_balance(dan_id, asset_id_type()), 9850);
} FC_LOG_AND_RETHROW()
*/ */
} FC_LOG_AND_RETHROW() } }
BOOST_AUTO_TEST_CASE( worker_create_test ) BOOST_AUTO_TEST_CASE( worker_create_test )
{ try { { try {
@ -669,10 +673,12 @@ BOOST_AUTO_TEST_CASE( refund_worker_test )
BOOST_CHECK_EQUAL(worker_id_type()(db).worker.get<refund_worker_type>().total_burned.value, 2000); BOOST_CHECK_EQUAL(worker_id_type()(db).worker.get<refund_worker_type>().total_burned.value, 2000);
}FC_LOG_AND_RETHROW()} }FC_LOG_AND_RETHROW()}
BOOST_AUTO_TEST_CASE( force_settlement_unavailable ) BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( unimp_force_settlement_unavailable, 1 )
{ try { BOOST_AUTO_TEST_CASE( unimp_force_settlement_unavailable )
FC_ASSERT( !"TODO - Reimplement this" ); {
BOOST_FAIL( "TODO - Reimplement this" );
/* /*
try {
auto private_key = delegate_priv_key; auto private_key = delegate_priv_key;
auto private_key = generate_private_key("genesis"); auto private_key = generate_private_key("genesis");
>>>>>>> short_refactor >>>>>>> short_refactor
@ -787,8 +793,9 @@ BOOST_AUTO_TEST_CASE( force_settlement_unavailable )
BOOST_CHECK(db.get_index_type<force_settlement_index>().indices().empty()); BOOST_CHECK(db.get_index_type<force_settlement_index>().indices().empty());
BOOST_CHECK_EQUAL(get_balance(nathan_id, bit_usd), bit_usd(db).dynamic_data(db).current_supply.value); BOOST_CHECK_EQUAL(get_balance(nathan_id, bit_usd), bit_usd(db).dynamic_data(db).current_supply.value);
} }
} FC_LOG_AND_RETHROW()
*/ */
} FC_LOG_AND_RETHROW() } }
// TODO: Write linear VBO tests // TODO: Write linear VBO tests