Added some test code to test resource URLs (see #80)

lptr · lptr · commit a87a6629b98e · 2014-05-08T03:01:53.000+02:00
diff --git a/gradle-spaghetti-plugin/src/test/at/app/src/main/haxe/prezi/test/client/Client.hx b/gradle-spaghetti-plugin/src/test/at/app/src/main/haxe/prezi/test/client/Client.hx
@@ -27,6 +27,9 @@ class Client {
 		// 	doAsync(callback:String->(Int->String)->Void, converter:Int->String) {
 		var result = testStuff.doAsync(callback, function(value:Int):String { return Std.string(value + 1); });
 		trace("doAync() returned: " + result);
+
+		trace("Haxe resource: " + Layout.getResource());
+		trace("TypeScript resource: " + TextRenderer.getResource());
 	}
 
 	static function callback(name:String, converter:Int->String)
diff --git a/gradle-spaghetti-plugin/src/test/at/app/src/test/haxe/prezi/test/client/ClientTest.hx b/gradle-spaghetti-plugin/src/test/at/app/src/test/haxe/prezi/test/client/ClientTest.hx
@@ -74,4 +74,10 @@ class ClientTest extends MatchersBase {
 		assertThat(cbConverted, is("43"));
 		assertThat(result, is(12));
 	}
+
+	@Test
+	public function testResourceUrls() {
+		assertThat(Layout.getResource(), is("../../prezi.graphics.text/sample.txt"));
+		assertThat(TextRenderer.getResource(), is("../../prezi.graphics.text.render/some-resource.txt"));
+	}
 }
diff --git a/gradle-spaghetti-plugin/src/test/at/app/src/test/webapp/index.html b/gradle-spaghetti-plugin/src/test/at/app/src/test/webapp/index.html
@@ -2,16 +2,10 @@
 <head>
 	<script src="require.js"></script>
 	<script>
-		require.config({
-			paths: {
-				"prezi.graphics.text": "prezi.graphics.text/prezi.graphics.text",
-				"prezi.graphics.text.render": "prezi.graphics.text.render/prezi.graphics.text.render"
-			}
-		});
 		require(["application"]);
 	</script>
 </head>
-<body style="background: url('prezi.graphics.text/spaghetti.jpg'); background-size: 100%;">
+<body style="background: url('modules/prezi.graphics.text/spaghetti.jpg'); background-size: 100%;">
 <h1>Modularization test drive</h1>
 <canvas id="canvas" width="160" height="100" style="background: lightgoldenrodyellow; margin-left: 100;"></canvas>
 <p>Also watch trace on JavaScript console.</p>
diff --git a/gradle-spaghetti-plugin/src/test/at/layout/src/main/haxe/prezi/graphics/text/LayoutImpl.hx b/gradle-spaghetti-plugin/src/test/at/layout/src/main/haxe/prezi/graphics/text/LayoutImpl.hx
@@ -12,6 +12,11 @@ class LayoutImpl implements Layout {
 	{
 		return new TestStuffImpl<String, String>();
 	}
+
+	public function getResource():String
+	{
+		return Spaghetti.getResourceUrl("sample.txt");
+	}
 }
 
 class TestStuffImpl<Pre, Post> implements TestStuff<Pre, Post> {
diff --git a/gradle-spaghetti-plugin/src/test/at/layout/src/main/spaghetti-resources/sample.txt b/gradle-spaghetti-plugin/src/test/at/layout/src/main/spaghetti-resources/sample.txt
@@ -0,0 +1 @@
+SAMPLE
diff --git a/gradle-spaghetti-plugin/src/test/at/layout/src/main/spaghetti/Layout.module b/gradle-spaghetti-plugin/src/test/at/layout/src/main/spaghetti/Layout.module
@@ -124,3 +124,4 @@ const Values {
 
 Text createText()
 TestStuff<string, string> createTestStuff()
+string getResource()
diff --git a/gradle-spaghetti-plugin/src/test/at/text-renderer/src/main/spaghetti-resources/some-resource.txt b/gradle-spaghetti-plugin/src/test/at/text-renderer/src/main/spaghetti-resources/some-resource.txt
@@ -0,0 +1 @@
+Such resource!
diff --git a/gradle-spaghetti-plugin/src/test/at/text-renderer/src/main/spaghetti/TextRenderer.module b/gradle-spaghetti-plugin/src/test/at/text-renderer/src/main/spaghetti/TextRenderer.module
@@ -27,3 +27,5 @@ const Values {
 	 */
 	Renderer DEFAULT_RENDERER
 }
+
+string getResource()
diff --git a/gradle-spaghetti-plugin/src/test/at/text-renderer/src/main/ts/TextRendererImpl.ts b/gradle-spaghetti-plugin/src/test/at/text-renderer/src/main/ts/TextRendererImpl.ts
@@ -6,6 +6,9 @@ export class TextRendererImpl implements TextRenderer {
 	createRenderer(prefix:string, suffix:string):Renderer {
 		return new RendererImpl(prefix, suffix);
 	}
+	getResource():string {
+		return Spaghetti.getResourceUrl("some-resource.txt");
+	}
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@ class Client {`
`27`	`27`	`// doAsync(callback:String->(Int->String)->Void, converter:Int->String) {`
`28`	`28`	`var result = testStuff.doAsync(callback, function(value:Int):String { return Std.string(value + 1); });`
`29`	`29`	`trace("doAync() returned: " + result);`
	`30`	`+`
	`31`	`+ trace("Haxe resource: " + Layout.getResource());`
	`32`	`+ trace("TypeScript resource: " + TextRenderer.getResource());`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`static function callback(name:String, converter:Int->String)`
Original file line number	Diff line number	Diff line change
`@@ -74,4 +74,10 @@ class ClientTest extends MatchersBase {`
`74`	`74`	`assertThat(cbConverted, is("43"));`
`75`	`75`	`assertThat(result, is(12));`
`76`	`76`	`}`
	`77`	`+`
	`78`	`+ @Test`
	`79`	`+ public function testResourceUrls() {`
	`80`	`+ assertThat(Layout.getResource(), is("../../prezi.graphics.text/sample.txt"));`
	`81`	`+ assertThat(TextRenderer.getResource(), is("../../prezi.graphics.text.render/some-resource.txt"));`
	`82`	`+ }`
`77`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,11 @@ class LayoutImpl implements Layout {`
`12`	`12`	`{`
`13`	`13`	`return new TestStuffImpl<String, String>();`
`14`	`14`	`}`
	`15`	`+`
	`16`	`+ public function getResource():String`
	`17`	`+ {`
	`18`	`+ return Spaghetti.getResourceUrl("sample.txt");`
	`19`	`+ }`
`15`	`20`	`}`
`16`	`21`
`17`	`22`	`class TestStuffImpl<Pre, Post> implements TestStuff<Pre, Post> {`
Original file line number	Diff line number	Diff line change
`@@ -124,3 +124,4 @@ const Values {`
`124`	`124`
`125`	`125`	`Text createText()`
`126`	`126`	`TestStuff<string, string> createTestStuff()`
	`127`	`+string getResource()`
Original file line number	Diff line number	Diff line change
`@@ -27,3 +27,5 @@ const Values {`
`27`	`27`	`*/`
`28`	`28`	`Renderer DEFAULT_RENDERER`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+string getResource()`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ export class TextRendererImpl implements TextRenderer {`
`6`	`6`	`createRenderer(prefix:string, suffix:string):Renderer {`
`7`	`7`	`return new RendererImpl(prefix, suffix);`
`8`	`8`	`}`
	`9`	`+ getResource():string {`
	`10`	`+ return Spaghetti.getResourceUrl("some-resource.txt");`
	`11`	`+ }`
`9`	`12`	`}`
`10`	`13`
`11`	`14`