Skip to content

Commit c1f77c1

Browse files
committed
Refactor wildcard use declarations in integration tests
1 parent d138446 commit c1f77c1

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

sim/tests/coupled.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
use sim::input_modeling::ContinuousRandomVariable;
2-
use sim::models::*;
3-
use sim::output_analysis::*;
4-
use sim::simulator::*;
2+
use sim::models::{
3+
Coupled, ExternalOutputCoupling, Generator, InternalCoupling, Model, Processor, Storage,
4+
};
5+
use sim::output_analysis::{ConfidenceInterval, SteadyStateOutput};
6+
use sim::simulator::{Connector, Message, Simulation};
57

68
fn get_message_number(message: &str) -> &str {
79
message.split_whitespace().last().unwrap()

sim/tests/custom.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use sim::models::{Generator, Model, ModelMessage, ModelRecord};
77
use sim::simulator::{Connector, Message, Services, Simulation, WebSimulation};
88
use sim::utils::errors::SimulationError;
99
use sim_derive::{register, SerializableModel};
10-
use wasm_bindgen_test::*;
10+
use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
1111

1212
#[cfg(feature = "simx")]
1313
use simx::event_rules;

sim/tests/simulations.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
use sim::input_modeling::{BooleanRandomVariable, ContinuousRandomVariable, IndexRandomVariable};
2-
use sim::models::*;
3-
use sim::output_analysis::*;
4-
use sim::simulator::*;
2+
use sim::models::stopwatch::Metric as StopwatchMetric;
3+
use sim::models::{
4+
Batcher, ExclusiveGateway, Gate, Generator, LoadBalancer, Model, ParallelGateway, Processor,
5+
StochasticGate, Stopwatch, Storage,
6+
};
7+
use sim::output_analysis::{IndependentSample, SteadyStateOutput};
8+
use sim::simulator::{Connector, Message, Simulation};
59

610
fn epsilon() -> f64 {
711
0.34
@@ -974,7 +978,7 @@ fn min_and_max_stopwatch() {
974978
String::from("stop"),
975979
String::from("min"),
976980
String::from("min"),
977-
stopwatch::Metric::Minimum,
981+
StopwatchMetric::Minimum,
978982
false,
979983
)),
980984
),
@@ -985,7 +989,7 @@ fn min_and_max_stopwatch() {
985989
String::from("stop"),
986990
String::from("max"),
987991
String::from("max"),
988-
stopwatch::Metric::Maximum,
992+
StopwatchMetric::Maximum,
989993
false,
990994
)),
991995
),

sim/tests/web.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::collections::HashMap;
22
use std::f64::INFINITY;
33

4-
use sim::models::*;
5-
use sim::output_analysis::*;
6-
use sim::simulator::*;
7-
use wasm_bindgen_test::*;
4+
use sim::models::{Model, ModelRecord};
5+
use sim::output_analysis::IndependentSample;
6+
use sim::simulator::{Connector, Message, WebSimulation};
7+
use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
88

99
wasm_bindgen_test_configure!(run_in_browser);
1010

0 commit comments

Comments
 (0)