Skip to content

Commit 47ceeb0

Browse files
andriyDevandriyDev
committed
Fix up regular asset tests to register sources after the AssetPlugin.
1 parent a6ddbcc commit 47ceeb0

File tree

1 file changed

+88
-60
lines changed

1 file changed

+88
-60
lines changed

‎crates/bevy_asset/src/lib.rs‎

Lines changed: 88 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,8 @@ mod tests {
757757
},
758758
loader::{AssetLoader, LoadContext},
759759
Asset, AssetApp, AssetEvent, AssetId, AssetLoadError, AssetLoadFailedEvent, AssetPath,
760-
AssetPlugin, AssetServer, Assets, InvalidGenerationError, LoadState, UnapprovedPathMode,
761-
UntypedHandle,
760+
AssetPlugin, AssetServer, Assets, DefaultAssetSource, InvalidGenerationError, LoadState,
761+
UnapprovedPathMode, UntypedHandle,
762762
};
763763
use alloc::{
764764
boxed::Box,
@@ -943,13 +943,14 @@ mod tests {
943943
fn test_app(dir: Dir) -> (App, GateOpener) {
944944
let mut app = App::new();
945945
let (gated_memory_reader, gate_opener) = GatedReader::new(MemoryAssetReader { root: dir });
946-
app.register_asset_source(
947-
AssetSourceId::Default,
948-
AssetSourceBuilder::new(move || Box::new(gated_memory_reader.clone())),
949-
)
950-
.add_plugins((
946+
app.add_plugins((
951947
TaskPoolPlugin::default(),
952-
AssetPlugin::default(),
948+
AssetPlugin {
949+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(
950+
AssetSourceBuilder::new(move || Box::new(gated_memory_reader.clone())),
951+
)),
952+
..Default::default()
953+
},
953954
DiagnosticsPlugin,
954955
));
955956
(app, gate_opener)
@@ -1882,18 +1883,18 @@ mod tests {
18821883
let unstable_reader = UnstableMemoryAssetReader::new(dir, 2);
18831884

18841885
let mut app = App::new();
1885-
app.register_asset_source(
1886-
"unstable",
1887-
AssetSourceBuilder::new(move || Box::new(unstable_reader.clone())),
1888-
)
1889-
.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
1890-
.init_asset::<CoolText>()
1891-
.register_asset_loader(CoolTextLoader)
1892-
.init_resource::<ErrorTracker>()
1893-
.add_systems(
1894-
Update,
1895-
(asset_event_handler, asset_load_error_event_handler).chain(),
1896-
);
1886+
app.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
1887+
.register_asset_source(
1888+
"unstable",
1889+
AssetSourceBuilder::new(move || Box::new(unstable_reader.clone())),
1890+
)
1891+
.init_asset::<CoolText>()
1892+
.register_asset_loader(CoolTextLoader)
1893+
.init_resource::<ErrorTracker>()
1894+
.add_systems(
1895+
Update,
1896+
(asset_event_handler, asset_load_error_event_handler).chain(),
1897+
);
18971898

18981899
let asset_server = app.world().resource::<AssetServer>().clone();
18991900
let a_path = format!("unstable://{a_path}");
@@ -1952,11 +1953,17 @@ mod tests {
19521953
);
19531954
dir.insert_asset_text(Path::new("empty.txt"), "");
19541955

1955-
app.register_asset_source(
1956-
AssetSourceId::Default,
1957-
AssetSourceBuilder::new(move || Box::new(MemoryAssetReader { root: dir.clone() })),
1958-
)
1959-
.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()));
1956+
app.add_plugins((
1957+
TaskPoolPlugin::default(),
1958+
AssetPlugin {
1959+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(
1960+
AssetSourceBuilder::new(move || {
1961+
Box::new(MemoryAssetReader { root: dir.clone() })
1962+
}),
1963+
)),
1964+
..Default::default()
1965+
},
1966+
));
19601967

19611968
app.init_asset::<CoolText>()
19621969
.init_asset::<SubText>()
@@ -2075,13 +2082,12 @@ mod tests {
20752082

20762083
let mut app = App::new();
20772084
let memory_reader = MemoryAssetReader { root: dir };
2078-
app.register_asset_source(
2079-
AssetSourceId::Default,
2080-
AssetSourceBuilder::new(move || Box::new(memory_reader.clone())),
2081-
)
2082-
.add_plugins((
2085+
app.add_plugins((
20832086
TaskPoolPlugin::default(),
20842087
AssetPlugin {
2088+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(
2089+
AssetSourceBuilder::new(move || Box::new(memory_reader.clone())),
2090+
)),
20852091
unapproved_path_mode: mode,
20862092
..Default::default()
20872093
},
@@ -2213,11 +2219,15 @@ mod tests {
22132219
let dir = Dir::default();
22142220
let mut app = App::new();
22152221
let reader = MemoryAssetReader { root: dir.clone() };
2216-
app.register_asset_source(
2217-
AssetSourceId::Default,
2218-
AssetSourceBuilder::new(move || Box::new(reader.clone())),
2219-
)
2220-
.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()));
2222+
app.add_plugins((
2223+
TaskPoolPlugin::default(),
2224+
AssetPlugin {
2225+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(
2226+
AssetSourceBuilder::new(move || Box::new(reader.clone())),
2227+
)),
2228+
..Default::default()
2229+
},
2230+
));
22212231

22222232
let (in_loader_sender, in_loader_receiver) = async_channel::bounded(1);
22232233
let (gate_sender, gate_receiver) = async_channel::bounded(1);
@@ -2269,11 +2279,15 @@ mod tests {
22692279
let dir = Dir::default();
22702280
let mut app = App::new();
22712281
let reader = MemoryAssetReader { root: dir.clone() };
2272-
app.register_asset_source(
2273-
AssetSourceId::Default,
2274-
AssetSourceBuilder::new(move || Box::new(reader.clone())),
2275-
)
2276-
.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()));
2282+
app.add_plugins((
2283+
TaskPoolPlugin::default(),
2284+
AssetPlugin {
2285+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(
2286+
AssetSourceBuilder::new(move || Box::new(reader.clone())),
2287+
)),
2288+
..Default::default()
2289+
},
2290+
));
22772291

22782292
let (in_loader_sender, in_loader_receiver) = async_channel::bounded(1);
22792293
let (gate_sender, gate_receiver) = async_channel::bounded(1);
@@ -2335,18 +2349,17 @@ mod tests {
23352349
struct FakeWatcher;
23362350
impl AssetWatcher for FakeWatcher {}
23372351

2338-
app.register_asset_source(
2339-
AssetSourceId::Default,
2340-
AssetSourceBuilder::new(move || Box::new(memory_reader.clone())).with_watcher(
2341-
move |sender| {
2342-
sender_sender.send(sender).unwrap();
2343-
Some(Box::new(FakeWatcher))
2344-
},
2345-
),
2346-
)
2347-
.add_plugins((
2352+
app.add_plugins((
23482353
TaskPoolPlugin::default(),
23492354
AssetPlugin {
2355+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(
2356+
AssetSourceBuilder::new(move || Box::new(memory_reader.clone())).with_watcher(
2357+
move |sender| {
2358+
sender_sender.send(sender).unwrap();
2359+
Some(Box::new(FakeWatcher))
2360+
},
2361+
),
2362+
)),
23502363
watch_for_changes_override: Some(true),
23512364
..Default::default()
23522365
},
@@ -2532,10 +2545,15 @@ mod tests {
25322545

25332546
let mut app = App::new();
25342547

2535-
app.register_asset_source(AssetSourceId::Default, asset_source)
2536-
.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
2537-
.init_asset::<U8Asset>()
2538-
.register_asset_loader(U8Loader);
2548+
app.add_plugins((
2549+
TaskPoolPlugin::default(),
2550+
AssetPlugin {
2551+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(asset_source)),
2552+
..Default::default()
2553+
},
2554+
))
2555+
.init_asset::<U8Asset>()
2556+
.register_asset_loader(U8Loader);
25392557

25402558
let asset_server = app.world().resource::<AssetServer>();
25412559

@@ -2592,9 +2610,14 @@ mod tests {
25922610
let asset_source =
25932611
AssetSourceBuilder::new(move || Box::new(MemoryAssetReader { root: dir.clone() }));
25942612

2595-
app.register_asset_source(AssetSourceId::Default, asset_source)
2596-
.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
2597-
.init_asset::<TestAsset>();
2613+
app.add_plugins((
2614+
TaskPoolPlugin::default(),
2615+
AssetPlugin {
2616+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(asset_source)),
2617+
..Default::default()
2618+
},
2619+
))
2620+
.init_asset::<TestAsset>();
25982621

25992622
struct TwoSubassetLoader;
26002623

@@ -2644,9 +2667,14 @@ mod tests {
26442667
let asset_source =
26452668
AssetSourceBuilder::new(move || Box::new(MemoryAssetReader { root: dir.clone() }));
26462669

2647-
app.register_asset_source(AssetSourceId::Default, asset_source)
2648-
.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
2649-
.init_asset::<TestAsset>();
2670+
app.add_plugins((
2671+
TaskPoolPlugin::default(),
2672+
AssetPlugin {
2673+
default_source: DefaultAssetSource::FromBuilder(Mutex::new(asset_source)),
2674+
..Default::default()
2675+
},
2676+
))
2677+
.init_asset::<TestAsset>();
26502678

26512679
struct TrivialLoader;
26522680

0 commit comments

Comments
 (0)