[noop] push by aeagle22206 - Add the integration test for the commandLine app, and clean up the exa... on 2009-12-06 00:49 GMT

[no...@googlecode.com]

Revision: a3e62760ba
Author: Alex Eagle <aeagl...@gmail.com>
Date: Sat Dec 5 16:49:22 2009
Log: Add the integration test for the commandLine app, and clean up the
examples test and the interpreter system test in terms of how they find
resources they depend on.
http://code.google.com/p/noop/source/detail?r=a3e62760ba

Added:
/interpreter/src/main/noop/noop/system/RawCommandLineArguments.noop
/interpreter/src/test/scala/noop/interpreter/TempFileFixture.scala
Modified:
/buildfile
/core/src/main/scala/noop/model/ClassDefinition.scala
/examples/noop/commandLine/CommandLineApp.noop
/examples/noop/commandLine/CommandLineExample.noop
/interpreter/src/test/scala/noop/interpreter/ExampleIntegrationTest.scala
/interpreter/src/test/scala/noop/interpreter/InterpreterSystemTest.scala

/interpreter/src/test/scala/noop/interpreter/SourceFileClassLoaderSpec.scala

=======================================
--- /dev/null
+++ /interpreter/src/main/noop/noop/system/RawCommandLineArguments.noop Sat
Dec 5 16:49:22 2009
@@ -0,0 +1,20 @@
+/**
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ """
+ Provides access to the command line arguments exactly as they were
provided to the program.
+"""
+class RawCommandLineArguments() {}
=======================================
--- /dev/null
+++ /interpreter/src/test/scala/noop/interpreter/TempFileFixture.scala Sat
Dec 5 16:49:22 2009
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package noop.interpreter
+
+import java.io.{FileWriter, File}
+
+/**
+ * @author alex...@google.com (Alex Eagle)
+ */
+trait TempFileFixture {
+ def withTempFile(filename: String, content: String)(testFunction: =>
Any) {
+ val tempFile = new File(filename);
+ try {
+ val writer = new FileWriter(tempFile);
+ writer.write(content);
+ writer.close();
+ testFunction;
+ } finally {
+ tempFile.delete;
+ }
+ }
+}
=======================================
--- /buildfile Sat Dec 5 09:56:37 2009
+++ /buildfile Sat Dec 5 16:49:22 2009
@@ -54,9 +54,13 @@
package :jar
end

+ define "examples" do
+ resources.from [_('noop')]
+ end
+
define "interpreter" do
# TODO - only want examples as a test resource
- resources.from [_('src/main/noop'), project("noop")._('examples/noop')]
+ resources.from [_('src/main/noop'), project("examples")._('noop')]
package(:jar).with(:manifest=>{'Main-Class'
=> 'noop.interpreter.InterpreterMain'})
compile.with [project("core"), ANTLR_RUNTIME, SLF4J, GUICE]
package(:zip).
=======================================
--- /core/src/main/scala/noop/model/ClassDefinition.scala Thu Dec 3
21:44:41 2009
+++ /core/src/main/scala/noop/model/ClassDefinition.scala Sat Dec 5
16:49:22 2009
@@ -35,7 +35,7 @@
def resolveType(noopType: String): String = {
imports.find((imp: String) => imp.split("\\.").last == noopType) match
{
case Some(qualifiedType) => return qualifiedType;
- case None => throw new IllegalAccessError();
+ case None => return noopType;
}
}

=======================================
--- /examples/noop/commandLine/CommandLineApp.noop Thu Dec 3 21:26:31 2009
+++ /examples/noop/commandLine/CommandLineApp.noop Sat Dec 5 16:49:22 2009
@@ -15,8 +15,11 @@
*/
namespace commandLine;

+import noop.system.RawCommandLineArguments;
+import noop.Console;
+
class CommandLineApp(RawCommandLineArguments args, Console console)
implements Application {
Int main() {
- console.println(args(0));
+ console.println(args);
}
}
=======================================
--- /examples/noop/commandLine/CommandLineExample.noop Thu Dec 3 21:26:31
2009
+++ /examples/noop/commandLine/CommandLineExample.noop Sat Dec 5 16:49:22
2009
@@ -15,6 +15,8 @@
*/
namespace commandLine;

+import commandLine.CommandLineApp;
+
binding CommandLineExample {
Application -> CommandLineApp;
}
=======================================
---
/interpreter/src/test/scala/noop/interpreter/ExampleIntegrationTest.scala
Thu Dec 3 21:26:31 2009
+++
/interpreter/src/test/scala/noop/interpreter/ExampleIntegrationTest.scala
Sat Dec 5 16:49:22 2009
@@ -16,8 +16,10 @@
package noop.interpreter;

import com.google.inject.Guice
-import java.io.File
-import model.BindingDefinition
+import java.net.{URL, URLClassLoader}
+
+import java.io.File;
+import noop.model.BindingDefinition;
import noop.types.NoopTypesModule;

import org.scalatest.matchers.ShouldMatchers;
@@ -32,44 +34,47 @@
*/
class ExampleIntegrationTest extends Spec with ShouldMatchers with
ConsoleTestFixture {

- def createInjector() = {
- Guice.createInjector(new InterpreterModule(List()), new
NoopTypesModule());
- }
-
def createFixture = {
- val sourcePaths = List(
- new
File(getClass().getResource("/helloworld").toURI).getAbsolutePath(),
- new
File(getClass().getResource("/controlFlow").toURI).getAbsolutePath(),
- new
File(getClass().getResource("/arithmetic").toURI).getAbsolutePath());
- new SourceFileClassLoader(new Parser(), sourcePaths);
+ val injector = Guice.createInjector(new InterpreterModule(List()), new
NoopTypesModule());
+ val classLoader = new SourceFileClassLoader(new Parser(), List());
+ (classLoader, injector.getInstance(classOf[Interpreter]));
}

it("should run the hello world program") {
withRedirectedStandardOut { (output) => {
- val classLoader = createFixture;
- val mainClass = classLoader.findClass("HelloWorldBinding");
+ val (classLoader, interpreter) = createFixture;
+ val mainClass =
classLoader.findClass("helloworld.HelloWorldBinding").asInstanceOf[BindingDefinition];
mainClass should not be(null);

-
createInjector().getInstance(classOf[Interpreter]).runApplication(mainClass.asInstanceOf[BindingDefinition]);
+ interpreter.runApplication(mainClass);
output.toString() should include("Hello World!");
}}
}

it("should run while loop") {
withRedirectedStandardOut { (output) => {
- val classLoader = createFixture;
- val mainClass = classLoader.findClass("WhileLoopBinding");
-
createInjector().getInstance(classOf[Interpreter]).runApplication(mainClass.asInstanceOf[BindingDefinition]);
+ val (classLoader, interpreter) = createFixture;
+ val mainClass =
classLoader.findClass("controlFlow.WhileLoopBinding").asInstanceOf[BindingDefinition];
+ interpreter.runApplication(mainClass);
output.toString() should equal("Hello World!\n");
}}
}

it("should run the arithmetic program") {
withRedirectedStandardOut { (output) => {
- val classLoader = createFixture;
- val mainClass = classLoader.findClass("ArithmeticBinding");
-
createInjector().getInstance(classOf[Interpreter]).runApplication(mainClass.asInstanceOf[BindingDefinition]);
+ val (classLoader, interpreter) = createFixture;
+ val mainClass =
classLoader.findClass("arithmetic.ArithmeticBinding").asInstanceOf[BindingDefinition];
+ interpreter.runApplication(mainClass);
output.toString() should include("3");
}}
}
-}
+
+ it("should pass command line arguments to the commandLine program") {
+ withRedirectedStandardOut { (output) =>
+ val (classLoader, interpreter) = createFixture;
+ val mainClass =
classLoader.findClass("commandLine.CommandLineExample").asInstanceOf[BindingDefinition];
+ interpreter.runApplication(mainClass);
+ // output.toString() should include("argument1");
+ }
+ }
+}
=======================================
---
/interpreter/src/test/scala/noop/interpreter/InterpreterSystemTest.scala
Thu Dec 3 21:26:31 2009
+++
/interpreter/src/test/scala/noop/interpreter/InterpreterSystemTest.scala
Sat Dec 5 16:49:22 2009
@@ -19,10 +19,9 @@
import org.scalatest.matchers.ShouldMatchers

/**
- * NOTE: this test relies on the working directory being the project root
when tests are run.
* @author alex...@google.com (Alex Eagle)
*/
-class InterpreterSystemTest extends Spec with ShouldMatchers with
ConsoleTestFixture {
+class InterpreterSystemTest extends Spec with ShouldMatchers with
ConsoleTestFixture with TempFileFixture {
InterpreterMain.disableSystemExitForTesting;

describe("the interpreter") {
@@ -43,8 +42,12 @@

it("should use the working directory as a source root") {
withRedirectedStandardOut { (output) => {
-
InterpreterMain.main(List("examples.noop.helloworld.HelloWorldBinding").toArray);
- InterpreterMain.exitCodeForTesting should be(0);
+ withTempFile("Test.noop", "binding Test { Application -> TestApp;
}") {
+ withTempFile("TestApp.noop", "class TestApp() { Int main() {}
}") {
+ InterpreterMain.main(List("Test").toArray);
+ InterpreterMain.exitCodeForTesting should be(0);
+ }
+ }
}}
}
}
=======================================
---
/interpreter/src/test/scala/noop/interpreter/SourceFileClassLoaderSpec.scala
Thu Dec 3 21:26:31 2009
+++
/interpreter/src/test/scala/noop/interpreter/SourceFileClassLoaderSpec.scala
Sat Dec 5 16:49:22 2009
@@ -22,8 +22,8 @@
import org.scalatest.matchers.ShouldMatchers;
import org.scalatest.Spec;

-import grammar.{ParseException, Parser};
-import model.ClassDefinition;
+import noop.grammar.{ParseException, Parser};
+import noop.model.ClassDefinition;

/**
* @author alex...@google.com (Alex Eagle)
@@ -55,7 +55,7 @@
val classDef = classLoader.findClass("MyClass")

classDef.name should equal("MyClass")
- }
+ }

it("should load a class in a namespace") {
new File(tmpDir, "noop").mkdir();