Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify mockall usage #214

Merged
merged 3 commits into from
Jan 21, 2021
Merged

Simplify mockall usage #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b82dcb
Simplify mockall usage
jiayihu Jan 20, 2021
9c1eef7
Merge branch 'main' into mockall
jiayihu Jan 20, 2021
4984286
Bump patch version
jiayihu Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@
h2 = { git = "https://github.com/kate-goldenring/h2", branch = "master" }

[workspace]
members = ["shared", "controller", "agent", "samples/brokers/udev-video-broker"]
members = [
"shared",
"controller",
"agent",
"samples/brokers/udev-video-broker"
]
4 changes: 2 additions & 2 deletions agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "agent"
version = "0.1.11"
version = "0.1.12"
authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
edition = "2018"

Expand All @@ -24,7 +24,7 @@ kube = { version = "0.23.0", features = ["openapi"] }
k8s-openapi = { version = "0.6.0", features = ["v1_16"] }
lazy_static = "1.4"
log = "0.4"
mockall = "0.6.0"
mockall = "0.9.0"
opcua-client = { version = "0.7.0", optional = true }
pest = { version = "2.0", optional = true }
pest_derive = { version = "2.0", optional = true }
Expand Down
26 changes: 13 additions & 13 deletions agent/src/protocols/onvif/discovery_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ impl DiscoveryHandler for OnvifDiscoveryHandler {
#[cfg(test)]
mod tests {
use super::*;
use akri_shared::onvif::device_info::test_onvif::MockOnvifQueryImpl;
use akri_shared::onvif::device_info::MockOnvifQuery;

struct IpAndMac {
mock_uri: &'static str,
Expand All @@ -165,7 +165,7 @@ mod tests {
}

fn configure_scenario(
mock: &mut MockOnvifQueryImpl,
mock: &mut MockOnvifQuery,
ip_and_mac: Option<IpAndMac>,
scope: Option<Scope>,
) {
Expand All @@ -183,7 +183,7 @@ mod tests {
}

fn configure_get_device_ip_and_mac_address(
mock: &mut MockOnvifQueryImpl,
mock: &mut MockOnvifQuery,
uri: &'static str,
ip: &'static str,
mac: &'static str,
Expand All @@ -195,7 +195,7 @@ mod tests {
}

fn configure_get_device_scopes(
mock: &mut MockOnvifQueryImpl,
mock: &mut MockOnvifQuery,
uri: &'static str,
scope: &'static str,
) {
Expand All @@ -209,7 +209,7 @@ mod tests {
async fn test_apply_filters_no_filters() {
let mock_uri = "device_uri";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down Expand Up @@ -242,7 +242,7 @@ mod tests {
let mock_uri = "device_uri";
let mock_ip = "mock.ip";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down Expand Up @@ -277,7 +277,7 @@ mod tests {
async fn test_apply_filters_include_ip_nonexist() {
let mock_uri = "device_uri";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down Expand Up @@ -309,7 +309,7 @@ mod tests {
async fn test_apply_filters_exclude_ip_nonexist() {
let mock_uri = "device_uri";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down Expand Up @@ -345,7 +345,7 @@ mod tests {
let mock_uri = "device_uri";
let mock_ip = "mock.ip";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down Expand Up @@ -378,7 +378,7 @@ mod tests {
let mock_uri = "device_uri";
let mock_mac = "mock:mac";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down Expand Up @@ -413,7 +413,7 @@ mod tests {
async fn test_apply_filters_include_mac_nonexist() {
let mock_uri = "device_uri";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down Expand Up @@ -445,7 +445,7 @@ mod tests {
async fn test_apply_filters_exclude_mac_nonexist() {
let mock_uri = "device_uri";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down Expand Up @@ -481,7 +481,7 @@ mod tests {
let mock_uri = "device_uri";
let mock_mac = "mock:mac";

let mut mock = MockOnvifQueryImpl::new();
let mut mock = MockOnvifQuery::new();
configure_scenario(
&mut mock,
Some(IpAndMac {
Expand Down
8 changes: 4 additions & 4 deletions agent/src/util/config_action.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ impl PeriodicDiscovery {
#[cfg(test)]
mod config_action_tests {
use super::*;
use akri_shared::k8s::test_kube::MockKubeImpl;
use akri_shared::k8s::MockKubeInterface;
use protocols::debug_echo::{DEBUG_ECHO_AVAILABILITY_CHECK_PATH, OFFLINE};
use std::{env, fs};
use tempfile::Builder;
Expand Down Expand Up @@ -555,7 +555,7 @@ mod config_action_tests {
let config_name = config.metadata.name.clone();
let mut list_and_watch_message_receivers = Vec::new();
let mut visible_discovery_results = Vec::new();
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
let instance_map: InstanceMap = build_instance_map(
&config,
&mut visible_discovery_results,
Expand Down Expand Up @@ -620,7 +620,7 @@ mod config_action_tests {
let config_name = config.metadata.name.clone();
let mut list_and_watch_message_receivers = Vec::new();
let mut visible_discovery_results = Vec::new();
let mock = MockKubeImpl::new();
let mock = MockKubeInterface::new();

//
// 1: Assert that ConnectivityStatus of instance that are no longer visible is changed to Offline
Expand Down Expand Up @@ -747,7 +747,7 @@ mod config_action_tests {
let mut list_and_watch_message_receivers = Vec::new();
let (mut watch_periph_tx, watch_periph_rx) = mpsc::channel(2);
let (finished_watching_tx, mut finished_watching_rx) = broadcast::channel(2);
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();

// Set instance count metric to ensure it is cleared
INSTANCE_COUNT_METRIC
Expand Down
30 changes: 15 additions & 15 deletions agent/src/util/device_plugin_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ mod device_plugin_service_tests {
use akri_shared::akri::configuration::KubeAkriConfig;
use akri_shared::{
akri::instance::{Instance, KubeAkriInstance},
k8s::test_kube::MockKubeImpl,
k8s::MockKubeInterface,
};
use mockall::predicate::*;
use std::{
Expand All @@ -1016,7 +1016,7 @@ mod device_plugin_service_tests {
}

fn configure_find_instance(
mock: &mut MockKubeImpl,
mock: &mut MockKubeInterface,
result_file: &'static str,
instance_name: String,
instance_namespace: String,
Expand Down Expand Up @@ -1129,7 +1129,7 @@ mod device_plugin_service_tests {
}

fn configure_find_configuration(
mock: &mut MockKubeImpl,
mock: &mut MockKubeInterface,
config_name: String,
config_namespace: String,
) {
Expand All @@ -1154,7 +1154,7 @@ mod device_plugin_service_tests {
let _ = env_logger::builder().is_test(true).try_init();
let (device_plugin_service, _device_plugin_service_receivers) =
create_device_plugin_service(ConnectivityStatus::Online, false);
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_configuration(
&mut mock,
device_plugin_service.config_name.clone(),
Expand Down Expand Up @@ -1202,7 +1202,7 @@ mod device_plugin_service_tests {
let _ = env_logger::builder().is_test(true).try_init();
let (device_plugin_service, _device_plugin_service_receivers) =
create_device_plugin_service(ConnectivityStatus::Online, false);
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_configuration(
&mut mock,
device_plugin_service.config_name.clone(),
Expand Down Expand Up @@ -1245,7 +1245,7 @@ mod device_plugin_service_tests {
let _ = env_logger::builder().is_test(true).try_init();
let (device_plugin_service, _device_plugin_service_receivers) =
create_device_plugin_service(ConnectivityStatus::Online, false);
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_configuration(
&mut mock,
device_plugin_service.config_name.clone(),
Expand Down Expand Up @@ -1278,7 +1278,7 @@ mod device_plugin_service_tests {
create_device_plugin_service(ConnectivityStatus::Online, false);
let config_name = device_plugin_service.config_name.clone();
let config_namespace = device_plugin_service.config_namespace.clone();
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
mock.expect_find_configuration()
.times(1)
.withf(move |name: &str, namespace: &str| {
Expand All @@ -1301,7 +1301,7 @@ mod device_plugin_service_tests {
let _ = env_logger::builder().is_test(true).try_init();
let (device_plugin_service, _device_plugin_service_receivers) =
create_device_plugin_service(ConnectivityStatus::Online, false);
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_configuration(
&mut mock,
device_plugin_service.config_name.clone(),
Expand Down Expand Up @@ -1451,7 +1451,7 @@ mod device_plugin_service_tests {
let _ = env_logger::builder().is_test(true).try_init();
let (device_plugin_service, _device_plugin_service_receivers) =
create_device_plugin_service(ConnectivityStatus::Offline(Instant::now()), true);
let mock = MockKubeImpl::new();
let mock = MockKubeInterface::new();
let devices =
build_list_and_watch_response(Arc::new(device_plugin_service), Arc::new(mock))
.await
Expand All @@ -1469,7 +1469,7 @@ mod device_plugin_service_tests {
create_device_plugin_service(ConnectivityStatus::Online, true);
let instance_name = device_plugin_service.instance_name.clone();
let instance_namespace = device_plugin_service.config_namespace.clone();
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
mock.expect_find_instance()
.times(1)
.withf(move |name: &str, namespace: &str| {
Expand All @@ -1496,7 +1496,7 @@ mod device_plugin_service_tests {
create_device_plugin_service(ConnectivityStatus::Online, true);
let instance_name = device_plugin_service.instance_name.clone();
let instance_namespace = device_plugin_service.config_namespace.clone();
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_instance(
&mut mock,
"../test/json/local-instance.json",
Expand All @@ -1522,7 +1522,7 @@ mod device_plugin_service_tests {
let device_usage_id_slot = format!("{}-0", device_plugin_service.instance_name);
let device_usage_id_slot_2 = device_usage_id_slot.clone();
let node_name = device_plugin_service.node_name.clone();
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_instance(
&mut mock,
"../test/json/local-instance.json",
Expand Down Expand Up @@ -1563,7 +1563,7 @@ mod device_plugin_service_tests {
create_device_plugin_service(ConnectivityStatus::Online, true);
let device_usage_id_slot = format!("{}-0", device_plugin_service.instance_name);
let device_usage_id_slot_2 = device_usage_id_slot.clone();
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_instance(
&mut mock,
"../test/json/local-instance.json",
Expand Down Expand Up @@ -1615,7 +1615,7 @@ mod device_plugin_service_tests {
let (device_plugin_service, mut device_plugin_service_receivers) =
create_device_plugin_service(ConnectivityStatus::Online, true);
let device_usage_id_slot = format!("{}-0", device_plugin_service.instance_name);
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_instance(
&mut mock,
"../test/json/local-instance.json",
Expand Down Expand Up @@ -1654,7 +1654,7 @@ mod device_plugin_service_tests {
let (device_plugin_service, mut device_plugin_service_receivers) =
create_device_plugin_service(ConnectivityStatus::Online, true);
let device_usage_id_slot = format!("{}-100", device_plugin_service.instance_name);
let mut mock = MockKubeImpl::new();
let mut mock = MockKubeInterface::new();
configure_find_instance(
&mut mock,
"../test/json/local-instance.json",
Expand Down