move test resources

.gitignore

@@ -1,4 +1,5 @@
 /target
 /Cargo.lock
 /.idea/
-/test/resources/bitsy-archive/
+/src/test-resources/
+/src/test-resources/omnibus/

src/avatar.rs

@@ -41,7 +41,7 @@ impl ToString for Avatar {
 #[test]
 fn test_avatar_from_string() {
     let output = Avatar::from(
-        include_str!("../test/resources/avatar").to_string()
+        include_str!("test-resources/avatar").to_string()
     );
 
     assert_eq!(output, mock::avatar());
@@ -49,5 +49,5 @@ fn test_avatar_from_string() {
 
 #[test]
 fn test_avatar_to_string() {
-    assert_eq!(mock::avatar().to_string(), include_str!("../test/resources/avatar"));
+    assert_eq!(mock::avatar().to_string(), include_str!("test-resources/avatar"));
 }

src/ending.rs

@@ -26,7 +26,7 @@ impl ToString for Ending {
 #[test]
 fn test_ending_from_string() {
     assert_eq!(
-        Ending::from(include_str!("../test/resources/ending").to_string()),
+        Ending::from(include_str!("test-resources/ending").to_string()),
         Ending {
             id: "a".to_string(),
             dialogue: "This is a long line of dialogue. Blah blah blah".to_string()

src/game.rs

@@ -199,7 +199,7 @@ impl Game {
 #[test]
 fn test_game_from_string() {
     let output = Game::from(
-        include_str!["../test/resources/default.bitsy"].to_string()
+        include_str!["test-resources/default.bitsy"].to_string()
     );
 
     let expected = mock::game_default();
@@ -210,7 +210,7 @@ fn test_game_from_string() {
 #[test]
 fn test_game_to_string() {
     let output = mock::game_default().to_string();
-    let expected = include_str!["../test/resources/default.bitsy"].to_string();
+    let expected = include_str!["test-resources/default.bitsy"].to_string();
     assert_eq!(output, expected);
 }
 

src/image.rs

@@ -41,7 +41,7 @@ impl ToString for Image {
 
 #[test]
 fn test_image_from_string() {
-    let output = Image::from(include_str!("../test/resources/image").to_string());
+    let output = Image::from(include_str!("test-resources/image").to_string());
 
     let expected = Image {
         pixels: vec![
@@ -62,6 +62,6 @@ fn test_image_from_string() {
 #[test]
 fn test_image_to_string() {
     let output = mock::image::chequers_1().to_string();
-    let expected = include_str!("../test/resources/image-chequers-1").to_string();
+    let expected = include_str!("test-resources/image-chequers-1").to_string();
     assert_eq!(output, expected);
 }

src/item.rs

@@ -64,7 +64,7 @@ impl ToString for Item {
 
 #[test]
 fn test_item_from_string() {
-    let output = Item::from(include_str!("../test/resources/item").to_string());
+    let output = Item::from(include_str!("test-resources/item").to_string());
     let expected = mock::item();
     assert_eq!(output, expected);
 }
@@ -72,6 +72,6 @@ fn test_item_from_string() {
 #[test]
 fn test_item_to_string() {
     let output = mock::item().to_string();
-    let expected = include_str!("../test/resources/item").to_string();
+    let expected = include_str!("test-resources/item").to_string();
     assert_eq!(output, expected);
 }

src/room.rs

@@ -87,7 +87,7 @@ impl From<String> for Room {
 #[test]
 fn test_room_from_string() {
     assert_eq!(
-        Room::from(include_str!("../test/resources/room").to_string()),
+        Room::from(include_str!("test-resources/room").to_string()),
         mock::room()
     );
 }
@@ -146,5 +146,5 @@ impl ToString for Room {
 
 #[test]
 fn test_room_to_string() {
-    assert_eq!(mock::room().to_string(), include_str!("../test/resources/room").to_string());
+    assert_eq!(mock::room().to_string(), include_str!("test-resources/room").to_string());
 }

src/sprite.rs

@@ -80,7 +80,7 @@ impl ToString for Sprite {
 #[test]
 fn test_sprite_from_string() {
     let output = Sprite::from(
-        include_str!("../test/resources/sprite").to_string()
+        include_str!("test-resources/sprite").to_string()
     );
 
     let expected = mock::sprite();
@@ -90,5 +90,5 @@ fn test_sprite_from_string() {
 
 #[test]
 fn test_sprite_to_string() {
-    assert_eq!(mock::sprite().to_string(), include_str!("../test/resources/sprite").to_string());
+    assert_eq!(mock::sprite().to_string(), include_str!("test-resources/sprite").to_string());
 }

src/tile.rs

@@ -66,7 +66,7 @@ impl ToString for Tile {
 
 #[test]
 fn test_tile_from_string() {
-    let output = Tile::from(include_str!("../test/resources/tile").to_string());
+    let output = Tile::from(include_str!("test-resources/tile").to_string());
 
     let expected = Tile {
         id: 35,
@@ -94,7 +94,7 @@ fn test_tile_to_string() {
         ]
     }.to_string();
 
-    let expected = include_str!("../test/resources/tile-chequers").to_string();
+    let expected = include_str!("test-resources/tile-chequers").to_string();
 
     assert_eq!(output, expected);
 }