From 71740d65f244a5d5ce551c922727d2582c5a837d Mon Sep 17 00:00:00 2001 From: Grzegorz Slowikowski Date: Thu, 24 May 2012 14:56:41 +0200 Subject: [PATCH 1/3] Removed Scala version suffix from artifactName. "com.novocode:junit-interface:0.7" test dependency replaced by "junit:junit:4.8.2" - "junit-interface" is not needed. --- project/Build.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index c43d8c2..f4374b7 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -33,7 +33,7 @@ object GTEngineBuild extends Build { "commons-collections" % "commons-collections" % "3.2.1", "commons-lang" % "commons-lang" % "2.6", "org.easytesting" % "fest-assert" % "1.4" % "test", - "com.novocode" % "junit-interface" % "0.7" % "test" + "junit" % "junit" % "4.8.2" % "test" ) } @@ -47,9 +47,13 @@ object GTEngineBuild extends Build { val buildSbtVersion = "0.11.2" val buildSettings = Defaults.defaultSettings ++ Seq ( + artifactName := {(config: String, module: ModuleID, artifact: Artifact) => { + module.name + "-" + module.revision + "." + artifact.extension + }}, organization := buildOrganization, version := buildVersion, scalaVersion := buildScalaVersion, + autoScalaLibrary := false, // Must ignore generating scaladoc since it gives an error // where I, with intention, left out specifying the generic type when extending Closure in GTContentRendererFakeClosure. publishArtifact in packageDoc := false From 273574df7cab7d26e0ca35570d892dfb03a9a385 Mon Sep 17 00:00:00 2001 From: Grzegorz Slowikowski Date: Thu, 24 May 2012 15:00:37 +0200 Subject: [PATCH 2/3] "buildOrganization" changed from "kjetland" to "com.kjetland" --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index f4374b7..7fd018d 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -41,7 +41,7 @@ object GTEngineBuild extends Build { object BuildSettings { - val buildOrganization = "kjetland" + val buildOrganization = "com.kjetland" val buildVersion = "0.2.1" val buildScalaVersion = "2.9.1" val buildSbtVersion = "0.11.2" From d77f4a8f5b291ac8d993832b6280041b3df38e3e Mon Sep 17 00:00:00 2001 From: Grzegorz Slowikowski Date: Fri, 25 May 2012 09:14:13 +0200 Subject: [PATCH 3/3] Test classes quick fix. --- src/test/java/play/template2/ExtendsTest.java | 4 ++-- src/test/java/play/template2/OutOveridingTest.java | 2 +- src/test/java/play/template2/SpecialTests.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/play/template2/ExtendsTest.java b/src/test/java/play/template2/ExtendsTest.java index 14c5062..135990e 100644 --- a/src/test/java/play/template2/ExtendsTest.java +++ b/src/test/java/play/template2/ExtendsTest.java @@ -30,12 +30,12 @@ public void testExtends() throws Exception { GTJavaBase t = tr.getTemplateInstance(new GTTemplateLocation("templateUsingExtendsAndTag.txt")); t.renderTemplate(args); - assertThat( t.getAsString() ).isEqualTo("maintemplateUsingExtends2\n[from tag: x]"); + assertThat( t.getAsString() ).isEqualTo("maintemplateUsingExtends2" + System.getProperty("line.separator") + "[from tag: x]"); // test nested extends t = tr.getTemplateInstance(new GTTemplateLocation("templateUsingExtendsExtendsAndTag.txt")); t.renderTemplate(args); - assertThat( t.getAsString() ).isEqualTo("maintemplateUsingExtendsxtemplateUsingExtends3\n[from tag: x]"); + assertThat( t.getAsString() ).isEqualTo("maintemplateUsingExtendsxtemplateUsingExtends3" + System.getProperty("line.separator") + "[from tag: x]"); assertThat( sr.renderSrc("#{tagUsingExtends/}template", args) ).isEqualTo("maintag1template"); assertThat( sr.renderSrc("#{tagUsingTagUsingExtends/}template", args) ).isEqualTo("maintag1tagxtemplate"); diff --git a/src/test/java/play/template2/OutOveridingTest.java b/src/test/java/play/template2/OutOveridingTest.java index fb5969b..fb5fe84 100644 --- a/src/test/java/play/template2/OutOveridingTest.java +++ b/src/test/java/play/template2/OutOveridingTest.java @@ -17,7 +17,7 @@ public void testLegacyOutOverriding() throws Exception { args.put("myData", "xxx"); assertThat( sr.renderSrc("a%{ print 'b' }%c", args) ).isEqualTo("abc"); - assertThat( sr.renderSrc("a%{ println('b') }%c", args) ).isEqualTo("ab\nc"); + assertThat( sr.renderSrc("a%{ println('b') }%c", args) ).isEqualTo("ab" + System.getProperty("line.separator") + "c"); assertThat( sr.renderSrc("a%{ printf('%d',1) }%c", args) ).isEqualTo("a1c"); diff --git a/src/test/java/play/template2/SpecialTests.java b/src/test/java/play/template2/SpecialTests.java index b1e6724..914bb9e 100644 --- a/src/test/java/play/template2/SpecialTests.java +++ b/src/test/java/play/template2/SpecialTests.java @@ -21,9 +21,9 @@ public void testTagFileBodyToStringAndInclude() throws Exception{ Map args = new HashMap(); - assertThat(sr.renderSrc("A#{printBodyInVerbatim}BC#{/printBodyInVerbatim}C", args)).isEqualTo("A\n[from tag. body: BC]\nC"); - assertThat(sr.renderSrc("#{include 'simpleTemplate.txt'/}-A#{printBodyInVerbatim}BC#{/printBodyInVerbatim}C", args)).isEqualTo("[from simpleTemplate]-A\n[from tag. body: BC]\nC"); - assertThat(sr.renderSrc("A#{printBodyInVerbatim}BC\n#{include 'simpleTemplate.txt'/}#{/printBodyInVerbatim}C", args)).isEqualTo("A\n[from tag. body: BC\n[from simpleTemplate]]\nC"); + assertThat(sr.renderSrc("A#{printBodyInVerbatim}BC#{/printBodyInVerbatim}C", args)).isEqualTo("A" + System.getProperty("line.separator") + "[from tag. body: BC]" + System.getProperty("line.separator") + "C"); + assertThat(sr.renderSrc("#{include 'simpleTemplate.txt'/}-A#{printBodyInVerbatim}BC#{/printBodyInVerbatim}C", args)).isEqualTo("[from simpleTemplate]-A" + System.getProperty("line.separator") + "[from tag. body: BC]" + System.getProperty("line.separator") + "C"); + assertThat(sr.renderSrc("A#{printBodyInVerbatim}BC\n#{include 'simpleTemplate.txt'/}#{/printBodyInVerbatim}C", args)).isEqualTo("A" + System.getProperty("line.separator") + "[from tag. body: BC\n[from simpleTemplate]]" + System.getProperty("line.separator") + "C"); }