<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#copied {background-color:#ccccff;}
tr.alt #copied {background-color:#bbbbf7;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="5">Commit in <b><tt>metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</tt></b></td></tr>
<tr><td><tt><a href="#file1">CodeMirror.java</a></tt> </td><td></td><td align="right" id="added">+57</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center">499 -> 500</td></tr>
</table>
<pre class="comment">
yet another assertion to catch corruption of the token-linked-list
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>CodeMirror.java</b></big> <small id="info">499 -> 500</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/CodeMirror.java 2007-08-02 21:10:16 UTC (rev 499)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/CodeMirror.java 2007-08-02 21:36:55 UTC (rev 500)
@@ -3,9 +3,12 @@
</small></pre><pre class="diff" id="context"> import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
</pre><pre class="diff" id="added">+import java.util.HashSet;
+import java.util.Set;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
import uk.co.badgersinfoil.metaas.impl.ASTASCompilationUnit;
import uk.co.badgersinfoil.metaas.impl.ASTIterator;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTUtils;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
import junit.framework.Assert;
</pre><pre class="diff"><small id="info">@@ -23,12 +26,14 @@
</small></pre><pre class="diff" id="context"> LinkedListTree ast = ((ASTASCompilationUnit)unit).getAST();
saintyCheckTokenStream(ast);
saintyCheckStartStopTokens(ast);
</pre><pre class="diff" id="added">+ assertTokenStreamNotDisjoint(ast);
</pre><pre class="diff" id="context"> StringWriter out = new StringWriter();
ActionScriptWriter writer = fact.newWriter();
writer.write(out, unit);
try {
ASCompilationUnit unit2 = fact.newParser().parse(new StringReader(out.toString()));
</pre><pre class="diff" id="removed">- assertASTMatch(ast, ((ASTASCompilationUnit)unit2).getAST());
</pre><pre class="diff" id="added">+ LinkedListTree ast2 = ((ASTASCompilationUnit)unit2).getAST();
+ assertASTMatch(ast, ast2);
</pre><pre class="diff" id="context"> StringWriter out2 = new StringWriter();
writer.write(out2, unit2);
Assert.assertEquals(out.toString(), out2.toString());
</pre><pre class="diff"><small id="info">@@ -39,10 +44,34 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="added">+ private static Set assertTokenStreamNotDisjoint(LinkedListTree ast) {
+ Set tokensFromStartToStop = tokenStreamToSet(ast);
+ for (int i=0; i<ast.getChildCount(); i++) {
+ LinkedListTree child = (LinkedListTree)ast.getChild(i);
+ Set childTokens = assertTokenStreamNotDisjoint(child);
+ Assert.assertTrue("'"+child+"' (child "+i+" of '"+ast+"') had a token stream disjoint with its parent",
+ tokensFromStartToStop.containsAll(childTokens));
+ }
+ return tokensFromStartToStop;
+ }
+
+ private static Set tokenStreamToSet(LinkedListTree ast) {
+ Set tokens = new HashSet();
+ for (LinkedListToken tok = ast.getStartToken(); tok!=null;) {
+ tokens.add(tok);
+ if (tok == ast.getStopToken()) {
+ break;
+ }
+ tok = tok.getNext();
+ }
+ return tokens;
+ }
+
</pre><pre class="diff" id="context"> private static void assertASTMatch(LinkedListTree ast1, LinkedListTree ast2) {
</pre><pre class="diff" id="removed">- Assert.assertEquals(ast1.getType(), ast2.getType());
- Assert.assertEquals(ast1.getText(), ast2.getText());
- Assert.assertEquals("Child count mismatch at node "+ast1+": "+ast1.toStringTree()+" vs. "+ast2.toStringTree(),
</pre><pre class="diff" id="added">+ String path = pathTo(ast1);
+ ASTUtils.assertAS3TokenTypeIs("At "+path, ast1.getType(), ast2.getType());
+ Assert.assertEquals("At "+path, ast1.getText(), ast2.getText());
+ Assert.assertEquals("At "+path+" child count mismatch: "+stringifyFirstLevel(ast1)+" vs. "+stringifyFirstLevel(ast2),
</pre><pre class="diff" id="context"> ast1.getChildCount(), ast2.getChildCount());
for (int i=0; i<ast1.getChildCount(); i++) {
assertASTMatch((LinkedListTree)ast1.getChild(i),
</pre><pre class="diff"><small id="info">@@ -50,6 +79,30 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="added">+ private static String pathTo(LinkedListTree ast) {
+ StringBuffer buff = new StringBuffer();
+ while (ast != null) {
+ buff.insert(0, ast);
+ ast = ast.getParent();
+ if (ast != null) {
+ buff.insert(0, "/");
+ }
+ }
+ return buff.toString();
+ }
+
+ private static String stringifyFirstLevel(LinkedListTree ast) {
+ StringBuffer buf = new StringBuffer("(");
+ for (int i=0; i<ast.getChildCount(); i++) {
+ if (i > 0) {
+ buf.append(" ");
+ }
+ buf.append(ast.getChild(i));
+ }
+ buf.append(")");
+ return buf.toString();
+ }
+
</pre><pre class="diff" id="context"> /**
* Search through the stream for tokens who's 'prev' property doesn't
* match the token who's 'last' property we just dereferenced in
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>