From 730465604bac6c50ce197756705ea9db4b8f485c Mon Sep 17 00:00:00 2001 From: Sergey Yanovich Date: Thu, 17 Jan 2008 16:52:24 +0200 Subject: [PATCH] [report] Fix segfaults in transcript test --- report/test/aaReportTest.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/report/test/aaReportTest.cpp b/report/test/aaReportTest.cpp index c3ed49f..2aff7d4 100644 --- a/report/test/aaReportTest.cpp +++ b/report/test/aaReportTest.cpp @@ -396,11 +396,11 @@ aaReportTest::testTranscript(nsITestRunner *aTestRunner) NS_TEST_ASSERT_MSG(count == 2, "[transcript] [1] wrong fact count"); nsCOMPtr txn = do_QueryElementAt(transcript, 0); - NS_TEST_ASSERT_MSG(testFact(aTestRunner, txn->PickFact(), 2, 3, + NS_TEST_ASSERT_MSG(txn && testFact(aTestRunner, txn->PickFact(), 2, 3, AA_EVENT_AMOUNT_2), "[transcript] [1] 1st fact is wrong"); txn = do_QueryElementAt(transcript, 1); - NS_TEST_ASSERT_MSG(testFact(aTestRunner, txn->PickFact(), 1, 3, + NS_TEST_ASSERT_MSG(txn && testFact(aTestRunner, txn->PickFact(), 1, 3, AA_EVENT_AMOUNT_3), "[transcript] [1] 2nd fact is wrong"); /* *** Transcript [2] *** */ @@ -432,15 +432,15 @@ aaReportTest::testTranscript(nsITestRunner *aTestRunner) NS_TEST_ASSERT_MSG(count == 4, "[transcript] [2] wrong fact count"); txn = do_QueryElementAt(transcript, 0); - NS_TEST_ASSERT_MSG(testFact(aTestRunner, txn->PickFact(), 2, 3, + NS_TEST_ASSERT_MSG(txn && testFact(aTestRunner, txn->PickFact(), 2, 3, AA_EVENT_AMOUNT_2), "[transcript] [2] 1st fact is wrong"); txn = do_QueryElementAt(transcript, 1); - NS_TEST_ASSERT_MSG(testFact(aTestRunner, txn->PickFact(), 1, 3, + NS_TEST_ASSERT_MSG(txn && testFact(aTestRunner, txn->PickFact(), 1, 3, AA_EVENT_AMOUNT_3), "[transcript] [2] 2nd fact is wrong"); txn = do_QueryElementAt(transcript, 2); - NS_TEST_ASSERT_MSG(testFact(aTestRunner, txn->PickFact(), 3, 4, + NS_TEST_ASSERT_MSG(txn && testFact(aTestRunner, txn->PickFact(), 3, 4, AA_EVENT_AMOUNT_4), "[update txn] pending fact is wrong"); /* *** Transcript [3] *** */ @@ -457,13 +457,13 @@ aaReportTest::testTranscript(nsITestRunner *aTestRunner) rv = transcript->GetOpening(getter_AddRefs( balance )); NS_TEST_ASSERT_OK(rv); - NS_TEST_ASSERT_MSG(testBalance(aTestRunner, balance, 3, 1, AA_EVENT_AMOUNT_2 + NS_TEST_ASSERT_MSG(txn && testBalance(aTestRunner, balance, 3, 1, AA_EVENT_AMOUNT_2 + AA_EVENT_AMOUNT_3, AA_EVENT_AMOUNT_2 + AA_EVENT_AMOUNT_3, 1), "[transcript] [3] opening is wrong"); rv = transcript->GetClosing(getter_AddRefs( balance )); NS_TEST_ASSERT_OK(rv); - NS_TEST_ASSERT_MSG(testBalance(aTestRunner, balance, 3, 1, AA_EVENT_AMOUNT_2 + NS_TEST_ASSERT_MSG(txn && testBalance(aTestRunner, balance, 3, 1, AA_EVENT_AMOUNT_2 + AA_EVENT_AMOUNT_3 - AA_EVENT_AMOUNT_4 - AA_EVENT_AMOUNT_6 * AA_EVENT_RATE_2, AA_EVENT_AMOUNT_2 + AA_EVENT_AMOUNT_3 - AA_EVENT_AMOUNT_4 @@ -476,7 +476,7 @@ aaReportTest::testTranscript(nsITestRunner *aTestRunner) NS_TEST_ASSERT_MSG(count == 2, "[transcript] [3] wrong fact count"); txn = do_QueryElementAt(transcript, 0); - NS_TEST_ASSERT_MSG(testFact(aTestRunner, txn->PickFact(), 3, 4, + NS_TEST_ASSERT_MSG(txn && testFact(aTestRunner, txn->PickFact(), 3, 4, AA_EVENT_AMOUNT_4), "[transcript] [3] pending fact is wrong"); /* *** Transcript [4] *** */ @@ -524,7 +524,7 @@ aaReportTest::testTranscript(nsITestRunner *aTestRunner) rv = transcript->GetClosing(getter_AddRefs( balance )); NS_TEST_ASSERT_OK(rv); - NS_TEST_ASSERT_MSG(testBalance(aTestRunner, balance, 4, 3, AA_EVENT_AMOUNT_5, + NS_TEST_ASSERT_MSG(txn && testBalance(aTestRunner, balance, 4, 3, AA_EVENT_AMOUNT_5, AA_EVENT_AMOUNT_4, 1), "[transcript] [5] closing is wrong"); count = 0; @@ -533,7 +533,7 @@ aaReportTest::testTranscript(nsITestRunner *aTestRunner) NS_TEST_ASSERT_MSG(count == 1, "[transcript] [5] wrong fact count"); txn = do_QueryElementAt(transcript, 0); - NS_TEST_ASSERT_MSG(testFact(aTestRunner, txn->PickFact(), 3, 4, + NS_TEST_ASSERT_MSG(txn && testFact(aTestRunner, txn->PickFact(), 3, 4, AA_EVENT_AMOUNT_4), "[update txn] pending fact is wrong"); return NS_OK; -- 2.11.4.GIT