luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix test

Browse source
This commit is contained in:
Michiel Borkent 2022-04-02 17:47:27 +02:00
parent ea4c4eae77
commit 7af93adf15
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test-resources/babashka/uberjar/src/my/main_pod.clj Normal file
View file

@ -0,0 +1,5 @@
(ns my.main-pod
(:require [pod.babashka.go-sqlite3 :as sqlite]))
(defn -main [& _args]
(sqlite/query ":memory:" ["SELECT 1 + 2 as sum"]))

30
test/babashka/uberjar_test.clj
View file

@ -63,21 +63,21 @@
(deftest uberjar-with-pods-test
(testing "jar contains bb.edn w/ only :pods when bb.edn has :pods"
(when (= "amd64" (System/getProperty "os.arch")) ; TODO: Build bootleg for aarch64 too or use a different pod
(let [tmp-file (java.io.File/createTempFile "uber" ".jar")
path (.getPath tmp-file)]
(.deleteOnExit tmp-file)
(let [config {:paths ["test-resources/babashka/uberjar/src"]
:deps '{local/deps {:local/root "test-resources/babashka/uberjar"}}
:pods (cond-> '{retrogradeorbit/bootleg {:version "0.1.9"}
(not (fs/windows?)) (assoc 'pod/test-pod {:path "test-resources/pod"})})}]
(tu/with-config config
(tu/bb nil "uberjar" path "-m" "my.main-main")
(let [bb-edn-entry (get-entry tmp-file "bb.edn")
bb-edn (-> path JarFile. (.getInputStream bb-edn-entry)
InputStreamReader. PushbackReader. edn/read)]
(is (= #{:pods} (-> bb-edn keys set)))
(is (= (:pods config) (:pods bb-edn))))))))))
(let [tmp-file (java.io.File/createTempFile "uber" ".jar")
path (.getPath tmp-file)]
(.deleteOnExit tmp-file)
(let [config {:paths ["test-resources/babashka/uberjar/src"]
:deps '{local/deps {:local/root "test-resources/babashka/uberjar"}}
:pods (cond-> '{org.babashka/go-sqlite3 {:version "0.1.0"}}
(not (fs/windows?)) (assoc 'pod/test-pod {:path "test-resources/pod"}))}]
(tu/with-config config
(tu/bb nil "uberjar" path "-m" "my.main-pod")
(let [bb-edn-entry (get-entry tmp-file "bb.edn")
bb-edn (-> path JarFile. (.getInputStream bb-edn-entry)
InputStreamReader. PushbackReader. edn/read)]
(is (= #{:pods} (-> bb-edn keys set)))
(is (= (:pods config) (:pods bb-edn))))
(is (str/includes? (tu/bb nil "--jar" path) "3")))))))
(deftest throw-on-empty-classpath
;; this test fails the windows native test in CI