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

[dsf-gdb] tests: Check if a line tag is defined more than once

Browse source 
As a safety net, fail if a line tag is defined more than once.

Also, allow calling resolveLineTagLocations more than once for a single
test.

Change-Id: I0832d3d28c4d688c38fd33dfc668b0ec6b8c4ffa
Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
This commit is contained in:
Simon Marchi 2015-02-18 13:30:02 -05:00 • committed by Gerrit Code Review @ Eclipse.org
parent 08d96189f1
commit 13978c1567
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/framework/BaseTestCase.java
View file

@ -113,7 +113,7 @@ public class BaseTestCase {
private static boolean fgStatusHandlersEnabled = true; private static boolean fgStatusHandlersEnabled = true;
private static HashMap<String, Integer> fTagLocations = new HashMap<>(); private HashMap<String, Integer> fTagLocations = new HashMap<>();
public GdbLaunch getGDBLaunch() { return fLaunch; } public GdbLaunch getGDBLaunch() { return fLaunch; }
@ -253,15 +253,19 @@ public class BaseTestCase {
Set<String> tagsToFind = new HashSet<>(Arrays.asList(tags)); Set<String> tagsToFind = new HashSet<>(Arrays.asList(tags));
String line; String line;
int lineNumber = 1; int lineNumber = 1;
int numberFound = 0;
fTagLocations.clear();
line = reader.readLine(); line = reader.readLine();
while (line != null) { while (line != null) {
for (String tag : tagsToFind) { for (String tag : tagsToFind) {
if (line.contains(tag)) { if (line.contains(tag)) {
if (fTagLocations.containsKey(tag)) {
throw new RuntimeException("Tag " + tag
+ " was found twice in " + sourceName);
}
fTagLocations.put(tag, lineNumber); fTagLocations.put(tag, lineNumber);
tagsToFind.remove(tag); numberFound++;
break; break;
} }
} }
@ -271,7 +275,7 @@ public class BaseTestCase {
} }
/* Make sure all tags have been found */ /* Make sure all tags have been found */
if (tagsToFind.size() > 0) { if (numberFound != tagsToFind.size()) {
throw new RuntimeException( throw new RuntimeException(
"Some tags were not found in " + sourceName); "Some tags were not found in " + sourceName);
} }