fixing tests

src/lisp.rs

@@ -71,8 +71,7 @@ mod test {
 
     #[test]
     fn test_parsing_lisp_presentation() {
-        let lisp =
+        let lisp = read_to_string("./testypres.lisp").expect("oops");
-            read_to_string("./test_presentation.lisp").expect("oops");
         let lisp_value = crisp::reader::read(&lisp);
         let test_vec = vec![
             service_item_1(),

test_presentation.lisp

@@ -3,7 +3,7 @@
 (slide (video :source "~/vids/test/camprules2024.mp4" :fit contain))
 (slide (video :source "~/vids/The magic of Rust's type system.mkv" :fit contain))
 (song :id 7 :author "North Point Worship"
-      :font "Treasuremap" :font-size 60
+      :font "Quicksand Bold" :font-size 60
       :title "Death Was Arrested"
       :background (image :source "file:///home/chris/nc/tfc/openlp/CMG - Bright Mountains 01.jpg" :fit cover)
       :text-alignment center

test_song.lisp

@@ -1,7 +1,7 @@
 (song :id 7 :author "North Point Worship"
       :font "Quicksand Bold" :font-size 60
       :title "Death Was Arrested"
-      :background (video :source "~/nc/tfc/openlp/Flood/motions/Brook_HD.mp4" :fit cover)
+      :background (image :source "~/nc/tfc/openlp/CMG - Bright Mountains 01.jpg" :fit cover)
       :text-alignment center
       :audio "file:///home/chris/music/North Point InsideOut/Nothing Ordinary, Pt. 1 (Live)/05 Death Was Arrested (feat. Seth Condrey).mp3"
       :verse-order (i1 v1 v2 c1 v3 c1 v4 c1 b1 b1 e1 e2)

testypres.lisp

@@ -1,3 +1,97 @@
 (slide :background (image :source "~/pics/frodo.jpg" :fit fill)
        (text "This is frodo" :font-size 70))
 (slide (video :source "~/vids/test/camprules2024.mp4" :fit contain))
+(song :id 7 :author "North Point Worship"
+      :font "Quicksand Bold" :font-size 60
+      :title "Death Was Arrested"
+      :background (image :source "file:///home/chris/nc/tfc/openlp/CMG - Bright Mountains 01.jpg" :fit cover)
+      :text-alignment center
+      :audio "file:///home/chris/music/North Point InsideOut/Nothing Ordinary, Pt. 1 (Live)/05 Death Was Arrested (feat. Seth Condrey).mp3"
+      :verse-order (i1 v1 v2 c1 v3 c1 v4 c1 b1 b1 e1 e2)
+      (i1 "Death Was Arrested\nNorth Point Worship")
+      (v1 "Alone in my sorrow
+And dead in my sin
+
+Lost without hope
+With no place to begin
+
+Your love made a way
+To let mercy come in
+
+When death was arrested
+And my life began")
+      (v2 "Ash was redeemed
+Only beauty remains
+
+My orphan heart
+Was given a name
+
+My mourning grew quiet,
+My feet rose to dance
+
+When death was arrested
+And my life began")
+      (c1 "Oh, Your grace so free,
+Washes over me
+
+You have made me new,
+Now life begins with You
+
+It's Your endless love,
+Pouring down on us
+
+You have made us new,
+Now life begins with You")
+      (v3 "Released from my chains,
+I'm a prisoner no more
+
+My shame was a ransom
+He faithfully bore
+
+He cancelled my debt and
+He called me His friend
+
+When death was arrested
+And my life began")
+      (v4 "Our Savior displayed
+On a criminal's cross
+
+Darkness rejoiced as though
+Heaven had lost
+
+But then Jesus arose
+With our freedom in hand
+
+That's when death was arrested
+And my life began
+
+That's when death was arrested
+And my life began")
+      (b1 "Oh, we're free, free,
+Forever we're free
+
+Come join the song
+Of all the redeemed
+
+Yes, we're free, free,
+Forever amen
+
+When death was arrested
+And my life began
+
+Oh, we're free, free,
+Forever we're free
+
+Come join the song
+Of all the redeemed
+
+Yes, we're free, free,
+Forever amen
+
+When death was arrested
+And my life began")
+      (e1 "When death was arrested
+And my life began
+
+That's when death was arrested
+And my life began"))