Skip to content

Commit

Permalink
Merge commit 'wescheme2012/master' into wescheme2012-master
Browse files Browse the repository at this point in the history
Conflicts:

	wescheme.properties
  • Loading branch information
Danny Yoo committed Aug 11, 2012
2 parents f2dc2e9 + d223489 commit 5cf69c0
Show file tree
Hide file tree
Showing 51 changed files with 2,661 additions and 2,118 deletions.
20 changes: 20 additions & 0 deletions README
Expand Up @@ -96,3 +96,23 @@ per application page.
openEditor: war/openEditor/index.jsp, war/js/openEditor-calc.js

----------------------------------------------------------------------
Things still to change, from summer 2012:
some read errors like 1/0 (first ') ````,,,, not highlighted
#(1234)
(cond [4 5]) -> if: expected a boolean value, but found: 4 Shouldn't say "if"
Wording choices like "found" vs. "given" and "but got 4" vs "but found: 4"
remove "other arguments were" piece?
greens look weird, color space????
(list (define x 5)) -> define: this variable is not defined should read "define: found a definition that is not at the top level"
(x) -> x: this variable is not defined should read "this function is not defined"

To turn off color highlighting, change the colors in war-src/js/openEditor/interaction.js to white (i.e. new Color(255, 255, 255)).

To use selenium test suite:
1. install firefox
2. install selenium IDE @ http://seleniumhq.org/download/
3. open up firefox
4. to open selenium, in firefox go to Tools -> Selenium IDE
5. in the IDE, go to File -> Open Test Suite
6. open full suite in testing/
7. run with the green arrows in the IDE
10 changes: 0 additions & 10 deletions testing/conditional-missing-question-answer
Expand Up @@ -41,21 +41,11 @@
<td>window.plt.wescheme.selenium.hasColoredText(&quot;1&quot;, &quot;rgb(146, 200, 142)&quot;) </td>
<td>true</td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;]&quot;, &quot;rgb(161, 200, 224)&quot;) </td>
<td>true</td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;)&quot;, &quot;rgb(240, 181, 194)&quot;) </td>
<td>true</td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;[&quot;, &quot;rgb(161, 200, 224)&quot;) </td>
<td>true</td>
</tr>
</tbody></table>
</body>
</html>
Expand Up @@ -81,16 +81,6 @@
<td>window.plt.wescheme.selenium.hasColoredText(&quot;)&quot;, &quot;rgb(240, 181, 194)&quot;)</td>
<td>true</td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;[&quot;, &quot;rgb(161, 200, 224)&quot;) </td>
<td>true</td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;]&quot;, &quot;rgb(145, 191, 219)&quot;) </td>
<td>true</td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;[(&quot;, &quot;rgb(146, 200, 142)&quot;) </td>
Expand Down
46 changes: 46 additions & 0 deletions testing/empty-parens-as-body
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:8888/" />
<title>let-empty-parens-as-body</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">let-empty-parens-as-body</td></tr>
</thead><tbody>
<tr>
<td>assertEval</td>
<td>window.myEditor.defn.setCode(&quot;(let () ())&quot;)</td>
<td>null</td>
</tr>
<tr>
<td>click</td>
<td>id=run</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>100</td>
<td></td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.moveCursor(3)</td>
<td>true</td>
</tr>
<tr>
<td>pause</td>
<td>100</td>
<td></td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;()&quot;, &quot;rgb(240, 181, 194)&quot;)</td>
<td>true</td>
</tr>
</tbody></table>
</body>
</html>
25 changes: 25 additions & 0 deletions testing/full-suite
Expand Up @@ -93,6 +93,31 @@
<tr><td><a href="def-val3">def-val3</a></td></tr>
<tr><td><a href="def-val4">def-val4</a></td></tr>
<tr><td><a href="def15">def15</a></td></tr>
<tr><td><a href="lambda-with-no-variable-in-parenthesis">lambda-with-no-variable-in-parenthesis</a></td></tr>
<tr><td><a href="lambda-with-no-body">lambda-with-no-body</a></td></tr>
<tr><td><a href="lambda-with-more-than-one-expression-for-function-body">lambda-with-more-than-one-expression-for-function-body</a></td></tr>
<tr><td><a href="lambda-expression-with-variable-which-is-reused">lambda-expression-with-variable-which-is-reused</a></td></tr>
<tr><td><a href="just-lambda-in-parenthesis">just-lambda-in-parenthesis</a></td></tr>
<tr><td><a href="just-let-within-parentheses">just-let-within-parentheses</a></td></tr>
<tr><td><a href="variables-not-within-parens">let-variables-not-within-parens</a></td></tr>
<tr><td><a href="without-key-value-pair">let-without-key-value-pair</a></td></tr>
<tr><td><a href="missing-parens-around-kv-pairs">let-missing-parens-around-kv-pairs</a></td></tr>
<tr><td><a href="kv-pair-redefinition">let-kv-pair-redefinition</a></td></tr>
<tr><td><a href="having-kv-pair-both-same-variable">let-having-kv-pair-both-same-variable</a></td></tr>
<tr><td><a href="let-no-body">let-no-body</a></td></tr>
<tr><td><a href="let-one-variable-not-in-kv-pair">let-one-variable-not-in-kv-pair</a></td></tr>
<tr><td><a href="empty-parens-as-body">let-empty-parens-as-body</a></td></tr>
<tr><td><a href="just-local-in-parens">just-local-in-parens</a></td></tr>
<tr><td><a href="local-without-list-of-definitions">local-without-list-of-definitions</a></td></tr>
<tr><td><a href="local-not-kv-pair">local-missing-parens-around-def-list</a></td></tr>
<tr><td><a href="local-missing-body">local-missing-body</a></td></tr>
<tr><td><a href="local-missing-variable-name">local-missing-variable-name</a></td></tr>
<tr><td><a href="local-with-just-number-instead-of-def-list">local-with-just-number-instead-of-def-list</a></td></tr>
<tr><td><a href="local-with-empty-parens-as-body">local-with-empty-parens-as-body</a></td></tr>
<tr><td><a href="reuse-lambda-keyword">reuse-lambda-keyword</a></td></tr>
<tr><td><a href="reuse-let-keyword">reuse-let-keyword</a></td></tr>
<tr><td><a href="reuse-if-keyword">reuse-if-keyword</a></td></tr>
<tr><td><a href="reuse-if-keyword">reuse-if-keyword</a></td></tr>
</tbody></table>
</body>
</html>
37 changes: 37 additions & 0 deletions testing/having-kv-pair-both-same-variable
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:8888/" />
<title>let-having-kv-pair-both-same-variable</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">let-having-kv-pair-both-same-variable</td></tr>
</thead><tbody>
<tr>
<td>assertEval</td>
<td>window.myEditor.defn.setCode(&quot;(let ((x x)) x)&quot;)</td>
<td>null</td>
</tr>
<tr>
<td>click</td>
<td>id=run</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>100</td>
<td></td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;x&quot;, &quot;rgb(240, 181, 194)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
1 change: 0 additions & 1 deletion testing/just-lambda-in-parenthesis
Expand Up @@ -31,7 +31,6 @@
<td>window.plt.wescheme.selenium.hasColoredText(&quot;lambda&quot;, &quot;rgb(240, 181, 194)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
37 changes: 37 additions & 0 deletions testing/just-let-within-parentheses
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:8888/" />
<title>just-let-within-parentheses</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">just-let-within-parentheses</td></tr>
</thead><tbody>
<tr>
<td>assertEval</td>
<td>window.myEditor.defn.setCode(&quot;(let)&quot;)</td>
<td>null</td>
</tr>
<tr>
<td>click</td>
<td>id=run</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>100</td>
<td></td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;let&quot;, &quot;rgb(240, 181, 194)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
37 changes: 37 additions & 0 deletions testing/just-local-in-parens
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:8888/" />
<title>just-local-in-parens</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">just-local-in-parens</td></tr>
</thead><tbody>
<tr>
<td>assertEval</td>
<td>window.myEditor.defn.setCode(&quot;(local)&quot;)</td>
<td>null</td>
</tr>
<tr>
<td>click</td>
<td>id=run</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>100</td>
<td></td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;local&quot;, &quot;rgb(240, 181, 194)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
47 changes: 47 additions & 0 deletions testing/kv-pair-redefinition
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:8888/" />
<title>let-kv-pair-redefinition</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">let-kv-pair-redefinition</td></tr>
</thead><tbody>
<tr>
<td>assertEval</td>
<td>window.myEditor.defn.setCode(&quot;(let ((x 3) (x 6)) 5)&quot;)</td>
<td>null</td>
</tr>
<tr>
<td>click</td>
<td>id=run</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>100</td>
<td></td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;let&quot;, &quot;rgb(240, 181, 194)&quot;) </td>
<td>true</td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;x&quot;, &quot;rgb(161, 200, 224)&quot;) </td>
<td>true</td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;x&quot;, &quot;rgb(146, 200, 142)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
1 change: 0 additions & 1 deletion testing/lambda-expression-with-variable-which-is-reused
Expand Up @@ -41,7 +41,6 @@
<td>window.plt.wescheme.selenium.hasColoredText(&quot;x&quot;, &quot;rgb(161, 200, 224)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
Expand Up @@ -41,7 +41,6 @@
<td>window.plt.wescheme.selenium.hasColoredText(&quot;\&quot;hello\&quot;&quot;, &quot;rgb(161, 200, 224)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
1 change: 0 additions & 1 deletion testing/lambda-with-no-body
Expand Up @@ -31,7 +31,6 @@
<td>window.plt.wescheme.selenium.hasColoredText(&quot;lambda&quot;, &quot;rgb(240, 181, 194)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
1 change: 0 additions & 1 deletion testing/lambda-with-no-variable-in-parenthesis
Expand Up @@ -36,7 +36,6 @@
<td>window.plt.wescheme.selenium.hasColoredText(&quot;x&quot;, &quot;rgb(161, 200, 224)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>
37 changes: 37 additions & 0 deletions testing/let-no-body
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="http://localhost:8888/" />
<title>let-no-body</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">let-no-body</td></tr>
</thead><tbody>
<tr>
<td>assertEval</td>
<td>window.myEditor.defn.setCode(&quot;(let ((x 3)))&quot;)</td>
<td>null</td>
</tr>
<tr>
<td>click</td>
<td>id=run</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>100</td>
<td></td>
</tr>
<tr>
<td>assertEval</td>
<td>window.plt.wescheme.selenium.hasColoredText(&quot;let&quot;, &quot;rgb(240, 181, 194)&quot;) </td>
<td>true</td>
</tr>

</tbody></table>
</body>
</html>

0 comments on commit 5cf69c0

Please sign in to comment.