refactor: move world::tests to the corresponding modules

SOF3 · Oct 7, 2023 · e70586c · e70586c
1 parent 1d344fd
commit e70586c
Show file tree

Hide file tree

Showing 15 changed files with 207 additions and 200 deletions.
diff --git a/codegen/src/zip.rs b/codegen/src/zip.rs
@@ -37,42 +37,42 @@ pub(crate) fn imp(input: TokenStream) -> Result<TokenStream> {
             }
 
             impl<__Arch: #crate_name::Archetype, #(#field_ty),*>
-                #crate_name::system::access::IntoZip<__Arch>
+                #crate_name::system::IntoZip<__Arch>
                 for #ident<#(#field_ty,)*>
             where
-                #(#field_ty: #crate_name::system::access::IntoZip<__Arch>,)*
+                #(#field_ty: #crate_name::system::IntoZip<__Arch>,)*
             {
-                type IntoZip = #ident<#(<#field_ty as #crate_name::system::access::IntoZip<__Arch>>::IntoZip,)*>;
+                type IntoZip = #ident<#(<#field_ty as #crate_name::system::IntoZip<__Arch>>::IntoZip,)*>;
 
                 fn into_zip(self) -> Self::IntoZip {
                     let Self { #(#field_ident,)* } = self;
                     #ident { #(
-                        #field_ident: <#field_ty as #crate_name::system::access::IntoZip<__Arch>>::into_zip(#field_ident),
+                        #field_ident: <#field_ty as #crate_name::system::IntoZip<__Arch>>::into_zip(#field_ident),
                     )* }
                 }
             }
 
             impl<__Arch: #crate_name::Archetype, #(#field_ty),*>
-                #crate_name::system::access::Zip<__Arch>
+                #crate_name::system::Zip<__Arch>
                 for #ident<#(#field_ty,)*>
             where
-                #(#field_ty: #crate_name::system::access::Zip<__Arch>,)*
+                #(#field_ty: #crate_name::system::Zip<__Arch>,)*
             {
                 fn split(&mut self, offset: __Arch::RawEntity) -> Self {
                     let Self { #(#field_ident,)* } = self;
                     #ident { #(
-                        #field_ident: <#field_ty as #crate_name::system::access::Zip<__Arch>>::split(#field_ident, offset),
+                        #field_ident: <#field_ty as #crate_name::system::Zip<__Arch>>::split(#field_ident, offset),
                     )* }
                 }
 
                 type Item = #ident<
-                    #(<#field_ty as #crate_name::system::access::Zip<__Arch>>::Item,)*
+                    #(<#field_ty as #crate_name::system::Zip<__Arch>>::Item,)*
                 >;
                 fn get<E: #crate_name::entity::Ref<Archetype = __Arch>>(self, __dynec_entity: E) -> Self::Item {
                     let Self { #(#field_ident,)* } = self;
                     let __dynec_entity = #crate_name::entity::TempRef::<__Arch>::new(__dynec_entity.id());
                     #ident { #(
-                        #field_ident: <#field_ty as #crate_name::system::access::Zip<__Arch>>::get(
+                        #field_ident: <#field_ty as #crate_name::system::Zip<__Arch>>::get(
                             #field_ident,
                             __dynec_entity,
                         ),
@@ -81,18 +81,18 @@ pub(crate) fn imp(input: TokenStream) -> Result<TokenStream> {
             }
 
             impl<__Arch: #crate_name::Archetype, #(#field_ty),*>
-                #crate_name::system::access::ZipChunked<__Arch>
+                #crate_name::system::ZipChunked<__Arch>
                 for #ident<#(#field_ty,)*>
             where
-                #(#field_ty: #crate_name::system::access::ZipChunked<__Arch>,)*
+                #(#field_ty: #crate_name::system::ZipChunked<__Arch>,)*
             {
                 type Chunk = #ident<
-                    #(<#field_ty as #crate_name::system::access::ZipChunked<__Arch>>::Chunk,)*
+                    #(<#field_ty as #crate_name::system::ZipChunked<__Arch>>::Chunk,)*
                 >;
                 fn get_chunk(self, __dynec_chunk: #crate_name::entity::TempRefChunk<__Arch>) -> Self::Chunk {
                     let Self { #(#field_ident,)* } = self;
                     #ident { #(
-                        #field_ident: <#field_ty as #crate_name::system::access::ZipChunked<__Arch>>::get_chunk(
+                        #field_ident: <#field_ty as #crate_name::system::ZipChunked<__Arch>>::get_chunk(
                             #field_ident,
                             __dynec_chunk,
                         ),

diff --git a/src/system.rs b/src/system.rs
@@ -20,13 +20,16 @@ pub use crate::world::rw::isotope::write::partial::WriteIsotopePartial;
 pub use crate::world::rw::simple::{ReadSimple, WriteSimple};
 
 pub mod access;
-pub use access::{Isotope as AccessIsotope, Single as AccessSingle, Try};
+pub use access::{Isotope as AccessIsotope, Single as AccessSingle};
+
+pub mod iter;
+pub use iter::{EntityIterator, IntoZip, Try, Zip, ZipChunked};
 
 pub mod partition;
 pub use partition::{EntityCreationPartition, Partition};
 
-mod entity;
-pub use entity::{EntityCreator, EntityDeleter, EntityIterator};
+mod offline_buffer;
+pub use offline_buffer::{EntityCreator, EntityDeleter};
 
 pub mod spec;
 #[doc(inline)]

diff --git a/src/system/access.rs b/src/system/access.rs
@@ -6,6 +6,3 @@ pub use single::Single;
 pub mod isotope;
 pub use isotope::Isotope;
 pub(crate) use isotope::{PartialStorageMap, StorageMap, StorageMapMut};
-
-mod iter;
-pub use iter::{IntoZip, Try, Zip, ZipChunked};
diff --git a/src/system/access/isotope.rs b/src/system/access/isotope.rs
@@ -320,3 +320,6 @@ where
         storages.map(|storage| AccessSingle::new(storage))
     }
 }
+
+#[cfg(test)]
+mod tests;
diff --git a/src/world/tests/isotope.rs → src/system/access/isotope/tests.rs b/src/world/tests/isotope.rs → src/system/access/isotope/tests.rs
@@ -4,16 +4,8 @@ use crate::test_util::*;
 use crate::{system, system_test, tracer, world};
 
 fn isotope_discrim_read_test_system(
-    mut iso1: system::AccessIsotope<
-        TestArch,
-        IsoNoInit,
-        impl system::access::StorageMap<TestArch, IsoNoInit, Key = TestDiscrim1>,
-    >,
-    mut iso2: system::AccessIsotope<
-        TestArch,
-        IsoWithInit,
-        impl system::access::StorageMap<TestArch, IsoWithInit, Key = TestDiscrim2>,
-    >,
+    mut iso1: impl system::access::isotope::Get<TestArch, IsoNoInit, TestDiscrim1>,
+    mut iso2: impl system::access::isotope::Get<TestArch, IsoWithInit, TestDiscrim2>,
     initials: &InitialEntities,
 ) {
     let ent = initials.strong.as_ref().expect("initials.strong is None");

diff --git a/src/system/access/single.rs b/src/system/access/single.rs
@@ -389,3 +389,6 @@ where
             .map(|(entity, data)| (entity::TempRefChunk::new(entity, entity.add(data.len())), data))
     }
 }
+
+#[cfg(test)]
+mod tests;
diff --git a/src/world/tests/simple.rs → src/system/access/single/tests.rs b/src/world/tests/simple.rs → src/system/access/single/tests.rs
diff --git a/src/system/entity.rs b/src/system/entity.rs