From b66a046609dbb84d70c3d346e2f8a6ca7c1e1ad1 Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Tue, 7 Dec 2010 11:07:05 -0800 Subject: [PATCH] Fix tests to reflect sample project version change. --- test/test_core.clj | 2 +- test/test_jar.clj | 4 ++-- test_projects/sample/src/nom/nom/nom.clj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_core.clj b/test/test_core.clj index 298e86f6..88b565e6 100644 --- a/test/test_core.clj +++ b/test/test_core.clj @@ -35,6 +35,6 @@ (deftest test-unquote (let [project (binding [*ns* (find-ns 'leiningen.core)] (read-project "test_projects/sample/project.clj"))] - (is (= ['org.clojure/clojure "1.1.0-master-SNAPSHOT"] + (is (= ['org.clojure/clojure "1.1.0"] (first (:dependencies project)))) (is (= '(fn [_] (> (rand) 0.5)))))) diff --git a/test/test_jar.clj b/test/test_jar.clj index e8e395ac..506fd56d 100644 --- a/test/test_jar.clj +++ b/test/test_jar.clj @@ -23,8 +23,8 @@ bat (slurp (.getInputStream jar-file (.getEntry jar-file "bin/nom.bat")))] (is (= "bin/nom" (manifest "Leiningen-shell-wrapper"))) - (is (re-find #"org/clojure/clojure/1\.1\.0-master-SNAPSHOT/" bin)) - (is (re-find #"org\\clojure\\clojure\\1\.1\.0-master-SNAPSHOT" bat)) + (is (re-find #"org/clojure/clojure/1\.1\.0/" bin)) + (is (re-find #"org\\clojure\\clojure\\1\.1\.0" bat)) (is (re-find #"use 'nom\.nom\.nom\)\(apply -main .command-line-args." bin)) (is (re-find #"use 'nom\.nom\.nom\)\(apply -main .command-line-args." bat)) (is (re-find #"\$HOME/\.m2/repository/rome/rome/0\.9/rome-0\.9\.jar" bin)) diff --git a/test_projects/sample/src/nom/nom/nom.clj b/test_projects/sample/src/nom/nom/nom.clj index 1163d4c6..be685402 100644 --- a/test_projects/sample/src/nom/nom/nom.clj +++ b/test_projects/sample/src/nom/nom/nom.clj @@ -3,7 +3,7 @@ (:require [sample2.core]) (:gen-class)) -(when-not (= "1.1.0-master-SNAPSHOT" (clojure-version)) +(when-not (= "1.1.0" (clojure-version)) (throw (Exception. (str "Not running Clojure 1.1.0 Snapshot: " (clojure-version)))))