Commits

Meikel Brandmeyer committed a1168f8

First stab at test integration

At the moment rather ugly, but it works for the usual case.

Comments (0)

Files changed (3)

clojuresque/src/main/groovy/clojuresque/ClojureBasePlugin.groovy

         configureConfigurations(project)
         configureSourceSets(project)
         configureCompilation(project)
+        configureTests(project)
         configureClojarsUpload(project)
     }
 
 
     private void configureCompilation(Project project) {
         project.sourceSets.each { set ->
+            if (set.equals(project.sourceSets.test))
+                return
             String compileTaskName = set.getCompileTaskName("clojure")
             ClojureCompileTask task = project.tasks.add(name: compileTaskName,
                     type: ClojureCompileTask.class) {
         }
     }
 
+    private void configureTests(Project project) {
+        ClojureTestTask clojureTest = project.tasks.add(name: "clojureTest",
+                type: ClojureTestTask.class) {
+            source project.sourceSets.test.clojure
+            testRoots = project.sourceSets.test.clojure
+            testClasspath = project.configurations.testRuntime
+            classesDir = project.sourceSets.main.classesDir
+            dependsOn project.tasks.classes, project.configurations.testRuntime
+            description = "Run Clojure tests in src/test."
+        }
+        project.tasks.test.dependsOn clojureTest
+    }
+
     private void configureClojarsUpload(Project project) {
         project.tasks.whenTaskAdded { upload ->
             if (!(upload instanceof Upload))

clojuresque/src/main/groovy/clojuresque/ClojureTestTask.groovy

+/*-
+ * Copyright 2009-2011 © Meikel Brandmeyer.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package clojuresque
+
+import org.gradle.api.file.FileCollection
+import org.gradle.api.file.SourceDirectorySet
+import org.gradle.api.tasks.TaskAction
+
+import java.io.File
+import java.io.InputStream
+
+import groovy.lang.Closure
+
+public class ClojureTestTask extends ClojureSourceTask {
+    def File classesDir
+    def FileCollection testClasspath
+    def SourceDirectorySet testRoots
+    def Closure jvmOptions = {}
+
+    @TaskAction
+    public void runTests() {
+        project.clojureexec {
+            this.jvmOptions()
+            classpath = project.files(
+                this.testRoots.srcDirs,
+                this.classesDir,
+                this.testClasspath
+            )
+            main = "clojuresque.tasks.test/main"
+            args = this.source.files
+        }
+    }
+}

runtime/src/main/resources/clojuresque/tasks/test.clj

+(ns clojuresque.tasks.test
+  (:use
+    [clojure.test :only (run-tests)]
+    [clojuresque.cli :only (deftask)]
+    [clojuresque.util :only (namespaces)]))
+
+(deftask main
+  "Run all tests in the namespaces of the given files by virtue of clojure.test."
+  [files]
+  (let [namespaces (namespaces files)]
+    (apply require namespaces)
+    (let [result (apply run-tests namespaces)]
+      (when (or (pos? (:fail result)) (pos? (:error result)))
+        (System/exit 1)))))
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.