Index: lexer/test/unit/src/org/netbeans/lib/lexer/test/dump/TokenDumpCheck.java
===================================================================
RCS file: /cvs/lexer/test/unit/src/org/netbeans/lib/lexer/test/dump/TokenDumpCheck.java,v
retrieving revision 1.4
diff -u -u -r1.4 TokenDumpCheck.java
--- lexer/test/unit/src/org/netbeans/lib/lexer/test/dump/TokenDumpCheck.java	5 Mar 2007 15:18:50 -0000	1.4
+++ lexer/test/unit/src/org/netbeans/lib/lexer/test/dump/TokenDumpCheck.java	20 Aug 2007 21:39:32 -0000
@@ -27,6 +27,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
+import junit.framework.Assert;
 import org.netbeans.api.lexer.Language;
 import org.netbeans.api.lexer.Token;
 import org.netbeans.api.lexer.TokenHierarchy;
@@ -159,10 +161,15 @@
                 tdc.setTestName(testName);
                 TokenHierarchy<?> langHi = TokenHierarchy.create(input, language);
                 TokenSequence<? extends TokenId> langTS = langHi.tokenSequence();
+                Set<? extends TokenId> tokenIds = language.tokenIds();
                 tdc.compareLine(testName, -1);
                 while (langTS.moveNext()) {
                     // Debug the token
                     Token<? extends TokenId> token = langTS.token();
+
+                    Assert.assertTrue("Language does not declare membership of " + token.id().toString(), 
+                          tokenIds.contains(token.id()));
+
                     tokenDesc.append(token.id().name());
                     int spaceCount = 14 - token.id().name().length();
                     while (--spaceCount >= 0) {