From d77c7ad049bf2ce6acd7c234b4995f9d623605cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norbert=20Pl=F6tt?= Date: Wed, 22 Mar 2006 00:53:02 +0000 Subject: [PATCH] Adding some trace output in case debugging is activated. Helps to compare completion results and expected results. Rearranged test evaluation to get more information before assertions fail. --- .../CompletionProposalsBaseTest.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java index 665194b088f..009c9da44f1 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java @@ -152,6 +152,12 @@ public abstract class CompletionProposalsBaseTest extends TestCase{ // ICompletionProposal[] results = completionProcessor.evalProposals(document, pos, wc, null); ICompletionProposal[] results = completionProcessor.computeCompletionProposals(editor.getCSourceViewer(), getCompletionPosition()); // (document, pos, wc, null); assertTrue(results != null); + if (CTestPlugin.getDefault().isDebugging()) { + for (int i = 0; i < results.length; i++) { + ICompletionProposal proposal = results[i]; + System.out.println("Result: " + proposal.getDisplayString()); + } + } // check the completion node ASTCompletionNode currentCompletionNode = completionProcessor.getCurrentCompletionNode(); @@ -181,7 +187,8 @@ public abstract class CompletionProposalsBaseTest extends TestCase{ // assertEquals( completionNode.getFunctionName(), getFunctionOrConstructorName() ); String[] expected = getExpectedResultsValues(); - assertTrue(results.length >= expected.length); + + boolean allFound = true ; // for the time being, let's be optimistic for (int i = 0; i< expected.length; i++){ boolean found = false; @@ -190,11 +197,21 @@ public abstract class CompletionProposalsBaseTest extends TestCase{ String displayString = proposal.getDisplayString(); if(expected[i].equals(displayString)){ found = true; + if (CTestPlugin.getDefault().isDebugging()) { + System.out.println("Lookup success for " + expected[i]); + } break; } } - assertTrue( "Lookup failed for " + expected[i], found ); //$NON-NLS-1$ + if (!found) { + allFound = false ; + if (CTestPlugin.getDefault().isDebugging()) { + System.out.println( "Lookup failed for " + expected[i]); //$NON-NLS-1$ + } + } } + assertTrue("Not enough results!", results.length >= expected.length); + assertTrue("Some expected results were not found!", allFound); }