From 10a5a34cd9280cddfa06fc58b3d5cf281a58a550 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Fri, 10 Sep 2021 17:48:25 +0800 Subject: [PATCH] Move files --- sea-orm-codegen/src/entity/writer.rs | 16 ++++++++-------- .../tests/{entity => expanded}/cake.rs | 0 .../tests/{entity => expanded}/cake_filling.rs | 0 .../tests/{entity => expanded}/filling.rs | 0 .../tests/{entity => expanded}/fruit.rs | 0 .../tests/{entity => expanded}/mod.rs | 0 .../tests/{entity => expanded}/prelude.rs | 0 .../tests/{entity => expanded}/vendor.rs | 0 8 files changed, 8 insertions(+), 8 deletions(-) rename sea-orm-codegen/tests/{entity => expanded}/cake.rs (100%) rename sea-orm-codegen/tests/{entity => expanded}/cake_filling.rs (100%) rename sea-orm-codegen/tests/{entity => expanded}/filling.rs (100%) rename sea-orm-codegen/tests/{entity => expanded}/fruit.rs (100%) rename sea-orm-codegen/tests/{entity => expanded}/mod.rs (100%) rename sea-orm-codegen/tests/{entity => expanded}/prelude.rs (100%) rename sea-orm-codegen/tests/{entity => expanded}/vendor.rs (100%) diff --git a/sea-orm-codegen/src/entity/writer.rs b/sea-orm-codegen/src/entity/writer.rs index 19e9af1c..ad356872 100644 --- a/sea-orm-codegen/src/entity/writer.rs +++ b/sea-orm-codegen/src/entity/writer.rs @@ -308,12 +308,12 @@ mod tests { use sea_query::ColumnType; use std::io::{self, BufRead, BufReader}; - const ENTITY_FILES: [&str; 5] = [ - include_str!("../../tests/entity/cake.rs"), - include_str!("../../tests/entity/cake_filling.rs"), - include_str!("../../tests/entity/filling.rs"), - include_str!("../../tests/entity/fruit.rs"), - include_str!("../../tests/entity/vendor.rs"), + const EXPANDED_ENTITY_FILES: [&str; 5] = [ + include_str!("../../tests/expanded/cake.rs"), + include_str!("../../tests/expanded/cake_filling.rs"), + include_str!("../../tests/expanded/filling.rs"), + include_str!("../../tests/expanded/fruit.rs"), + include_str!("../../tests/expanded/vendor.rs"), ]; fn setup() -> Vec { @@ -506,10 +506,10 @@ mod tests { fn test_gen_code_blocks() -> io::Result<()> { let entities = setup(); - assert_eq!(entities.len(), ENTITY_FILES.len()); + assert_eq!(entities.len(), EXPANDED_ENTITY_FILES.len()); for (i, entity) in entities.iter().enumerate() { - let mut reader = BufReader::new(ENTITY_FILES[i].as_bytes()); + let mut reader = BufReader::new(EXPANDED_ENTITY_FILES[i].as_bytes()); let mut lines: Vec = Vec::new(); reader.read_until(b';', &mut Vec::new())?; diff --git a/sea-orm-codegen/tests/entity/cake.rs b/sea-orm-codegen/tests/expanded/cake.rs similarity index 100% rename from sea-orm-codegen/tests/entity/cake.rs rename to sea-orm-codegen/tests/expanded/cake.rs diff --git a/sea-orm-codegen/tests/entity/cake_filling.rs b/sea-orm-codegen/tests/expanded/cake_filling.rs similarity index 100% rename from sea-orm-codegen/tests/entity/cake_filling.rs rename to sea-orm-codegen/tests/expanded/cake_filling.rs diff --git a/sea-orm-codegen/tests/entity/filling.rs b/sea-orm-codegen/tests/expanded/filling.rs similarity index 100% rename from sea-orm-codegen/tests/entity/filling.rs rename to sea-orm-codegen/tests/expanded/filling.rs diff --git a/sea-orm-codegen/tests/entity/fruit.rs b/sea-orm-codegen/tests/expanded/fruit.rs similarity index 100% rename from sea-orm-codegen/tests/entity/fruit.rs rename to sea-orm-codegen/tests/expanded/fruit.rs diff --git a/sea-orm-codegen/tests/entity/mod.rs b/sea-orm-codegen/tests/expanded/mod.rs similarity index 100% rename from sea-orm-codegen/tests/entity/mod.rs rename to sea-orm-codegen/tests/expanded/mod.rs diff --git a/sea-orm-codegen/tests/entity/prelude.rs b/sea-orm-codegen/tests/expanded/prelude.rs similarity index 100% rename from sea-orm-codegen/tests/entity/prelude.rs rename to sea-orm-codegen/tests/expanded/prelude.rs diff --git a/sea-orm-codegen/tests/entity/vendor.rs b/sea-orm-codegen/tests/expanded/vendor.rs similarity index 100% rename from sea-orm-codegen/tests/entity/vendor.rs rename to sea-orm-codegen/tests/expanded/vendor.rs