aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenauxg <19689618+Henauxg@users.noreply.github.com>2023-07-11 18:59:47 +0200
committerHenauxg <19689618+Henauxg@users.noreply.github.com>2023-07-11 18:59:47 +0200
commitbfeb9b5caa8492a696c013037f6f691274109db9 (patch)
treeb96d3c3560ba64bfc8b4b21ed192e4d901a27a6d
parent03fab2e3a49454f0af813601f63ebe306a5fb1f2 (diff)
[tests] Update to bevy 0.11
-rw-r--r--tests/certificates.rs21
-rw-r--r--tests/utils/mod.rs22
2 files changed, 27 insertions, 16 deletions
diff --git a/tests/certificates.rs b/tests/certificates.rs
index 1745b0d..41d7fb0 100644
--- a/tests/certificates.rs
+++ b/tests/certificates.rs
@@ -1,6 +1,9 @@
use std::{fs, path::Path, thread::sleep, time::Duration};
-use bevy::{app::ScheduleRunnerPlugin, prelude::App};
+use bevy::{
+ app::ScheduleRunnerPlugin,
+ prelude::{App, Update},
+};
use bevy_quinnet::{
client::{
self,
@@ -51,17 +54,21 @@ fn trust_on_first_use() {
let mut client_app = App::new();
client_app
- .add_plugin(ScheduleRunnerPlugin::default())
- .add_plugin(QuinnetClientPlugin::default())
+ .add_plugins((
+ ScheduleRunnerPlugin::default(),
+ QuinnetClientPlugin::default(),
+ ))
.insert_resource(ClientTestData::default())
- .add_system(handle_client_events);
+ .add_systems(Update, handle_client_events);
let mut server_app = App::new();
server_app
- .add_plugin(ScheduleRunnerPlugin::default())
- .add_plugin(QuinnetServerPlugin::default())
+ .add_plugins((
+ ScheduleRunnerPlugin::default(),
+ QuinnetServerPlugin::default(),
+ ))
.insert_resource(ServerTestData::default())
- .add_system(handle_server_events);
+ .add_systems(Update, handle_server_events);
// Startup
client_app.update();
diff --git a/tests/utils/mod.rs b/tests/utils/mod.rs
index 55a1353..de45277 100644
--- a/tests/utils/mod.rs
+++ b/tests/utils/mod.rs
@@ -6,7 +6,7 @@ use std::{
use bevy::{
app::ScheduleRunnerPlugin,
- prelude::{App, EventReader, Res, ResMut, Resource},
+ prelude::{App, EventReader, Res, ResMut, Resource, Startup, Update},
};
use bevy_quinnet::{
client::{
@@ -66,22 +66,26 @@ pub const LOCAL_BIND_IP: IpAddr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0));
pub fn build_client_app() -> App {
let mut client_app = App::new();
client_app
- .add_plugin(ScheduleRunnerPlugin::default())
- .add_plugin(QuinnetClientPlugin::default())
+ .add_plugins((
+ ScheduleRunnerPlugin::default(),
+ QuinnetClientPlugin::default(),
+ ))
.insert_resource(ClientTestData::default())
- .add_startup_system(start_simple_connection)
- .add_system(handle_client_events);
+ .add_systems(Startup, start_simple_connection)
+ .add_systems(Update, handle_client_events);
client_app
}
pub fn build_server_app() -> App {
let mut server_app = App::new();
server_app
- .add_plugin(ScheduleRunnerPlugin::default())
- .add_plugin(QuinnetServerPlugin::default())
+ .add_plugins((
+ ScheduleRunnerPlugin::default(),
+ QuinnetServerPlugin::default(),
+ ))
.insert_resource(ServerTestData::default())
- .add_startup_system(start_listening)
- .add_system(handle_server_events);
+ .add_systems(Startup, start_listening)
+ .add_systems(Update, handle_server_events);
server_app
}