Author: dmacvicar Date: Mon Jul 9 18:41:07 2007 New Revision: 5938 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5938&view=rev Log: test Modified: branches/REFACTORING-10_3/libzypp/tests/zypp/ProgressData_test.cc Modified: branches/REFACTORING-10_3/libzypp/tests/zypp/ProgressData_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/tests/zypp/ProgressData_test.cc?rev=5938&r1=5937&r2=5938&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/tests/zypp/ProgressData_test.cc (original) +++ branches/REFACTORING-10_3/libzypp/tests/zypp/ProgressData_test.cc Mon Jul 9 18:41:07 2007 @@ -20,33 +20,45 @@ using namespace std; using namespace zypp; - -struct ProgressCollector +void progressdata_test() { - bool operator()( const ProgressData &progress ) { - + ProgressData progress(100); + CombinedProgressData sub1rcv(progress, 80); + + ProgressData sub1progress(100); + sub1progress.sendTo(sub1rcv); + + // task 1 goes to 50% + sub1progress.set(50); + // which is 50% of 80% in task 1 + BOOST_CHECK_EQUAL( progress.val(), 40 ); } - ProgressData::value_type lastReported; -}; - -void progressdata_test() -{ - ProgressData progress; - CombinedProgressData sub1rcv(progress, 80); - CombinedProgressData sub2rcv(progress, 20); - - ProgressData sub1progress; - sub1progress.sendTo(sub1rcv); + { + ProgressData progress(40000); + CombinedProgressData sub2rcv(progress, 10000); + + ProgressData sub2progress(500); + sub2progress.sendTo(sub2rcv); + sub2progress.set(250); + + // which is 50% of 80% in task 1 + BOOST_CHECK_EQUAL( progress.val(), 5000 ); + } - ProgressData sub2progress; - sub2progress.sendTo(sub2rcv); + { + ProgressData progress(20000,60000); + CombinedProgressData sub2rcv(progress, 10000); + + ProgressData sub2progress(500); + sub2progress.sendTo(sub2rcv); + sub2progress.set(250); + + // which is 50% of 80% in task 1 + BOOST_CHECK_EQUAL( progress.val(), 25000 ); + } - // task 1 goes to 50% - sub1progress.set(50); - // which is 50% of 80% in task 1 - BOOST_CHECK_EQUAL( progress.val(), 40 ); } test_suite* -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org