mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 02:06:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2012-04-28 17:37:09 -07:00
parent 82fb03e1a0
commit db6b4cf5ac
2 changed files with 42 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java
View file

@ -16,14 +16,9 @@ import org.eclipse.cdt.codan.core.test.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.CaseBreakChecker; import org.eclipse.cdt.codan.internal.checkers.CaseBreakChecker;
/** /**
* Test for {@link#CaseBreakChecker} class * Test for {@link CaseBreakChecker} class
*/ */
public class CaseBreakCheckerTest extends CheckerTestCase { public class CaseBreakCheckerTest extends CheckerTestCase {
/*
* (non-Javadoc)
*
* @see org.eclipse.cdt.codan.core.test.CodanTestCase#setUp()
*/
@Override @Override
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();

24
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
View file

@ -120,18 +120,13 @@ public class CheckerTestCase extends CodanTestCase {
} }
public void checkNoErrors() { public void checkNoErrors() {
if (markers == null || markers.length == 0) { if (markers != null && markers.length > 0) {
// all good
} else {
IMarker m = markers[0]; IMarker m = markers[0];
fail("Found " + markers.length + " errors but should not. First " + CodanProblemMarker.getProblemId(m) + " at line " fail("Found " + markers.length + " errors but should not. First " +
+ getLine(m)); CodanProblemMarker.getProblemId(m) + " at line " + getLine(m));
} }
} }
/**
*
*/
public void runOnProject() { public void runOnProject() {
try { try {
indexFiles(); indexFiles();
@ -151,9 +146,6 @@ public class CheckerTestCase extends CodanTestCase {
runCodan(); runCodan();
} }
/**
*
*/
protected void runCodan() { protected void runCodan() {
CodanRuntime.getInstance().getBuilder().processResource(cproject.getProject(), new NullProgressMonitor()); CodanRuntime.getInstance().getBuilder().processResource(cproject.getProject(), new NullProgressMonitor());
try { try {
@ -169,8 +161,9 @@ public class CheckerTestCase extends CodanTestCase {
* @return * @return
*/ */
protected IProblemPreference getPreference(String problemId, String paramId) { protected IProblemPreference getPreference(String problemId, String paramId) {
IProblem problem = CodanRuntime.getInstance().getCheckersRegistry().getResourceProfile(cproject.getResource()) IProblemProfile resourceProfile =
.findProblem(problemId); CodanRuntime.getInstance().getCheckersRegistry().getResourceProfile(cproject.getResource());
IProblem problem = resourceProfile.findProblem(problemId);
IProblemPreference pref = ((MapProblemPreference) problem.getPreference()).getChildDescriptor(paramId); IProblemPreference pref = ((MapProblemPreference) problem.getPreference()).getChildDescriptor(paramId);
return pref; return pref;
} }
@ -219,8 +212,8 @@ public class CheckerTestCase extends CodanTestCase {
String pid = ids[j]; String pid = ids[j];
if (p.getId().equals(pid)) { if (p.getId().equals(pid)) {
enabled = true; enabled = true;
// Force the launch mode to FULL_BUILD to make sure we can test the problem even if by default it // Force the launch mode to FULL_BUILD to make sure we can test the problem even
// is not set to run on FULL_BUILD // if by default it is not set to run on FULL_BUILD.
IProblemPreference preference = p.getPreference(); IProblemPreference preference = p.getPreference();
if (preference instanceof RootProblemPreference) { if (preference instanceof RootProblemPreference) {
RootProblemPreference rootProblemPreference = (RootProblemPreference) preference; RootProblemPreference rootProblemPreference = (RootProblemPreference) preference;
@ -232,6 +225,5 @@ public class CheckerTestCase extends CodanTestCase {
((CodanProblem) p).setEnabled(enabled); ((CodanProblem) p).setEnabled(enabled);
} }
CodanRuntime.getInstance().getCheckersRegistry().updateProfile(cproject.getProject(), profile); CodanRuntime.getInstance().getCheckersRegistry().updateProfile(cproject.getProject(), profile);
return;
} }
} }