From 81403137759037f4464eb41afc25aa43d48e8274 Mon Sep 17 00:00:00 2001 From: Dom Dwyer Date: Thu, 26 Jan 2023 17:55:39 +0100 Subject: [PATCH] test: drive catalog in ns rejection test Use the actual catalog resolver, not the mock to assert the correct behaviour with a populated catalog. --- router/src/namespace_resolver/ns_autocreation.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/router/src/namespace_resolver/ns_autocreation.rs b/router/src/namespace_resolver/ns_autocreation.rs index 4ebd751cc3..feced6178c 100644 --- a/router/src/namespace_resolver/ns_autocreation.rs +++ b/router/src/namespace_resolver/ns_autocreation.rs @@ -153,7 +153,8 @@ mod tests { use super::*; use crate::{ - namespace_cache::MemoryNamespaceCache, namespace_resolver::mock::MockNamespaceResolver, + namespace_cache::MemoryNamespaceCache, + namespace_resolver::{mock::MockNamespaceResolver, NamespaceSchemaResolver}, }; /// Common retention period value we'll use in tests @@ -299,7 +300,7 @@ mod tests { // First drive the population of the catalog let creator = NamespaceAutocreation::new( - MockNamespaceResolver::default().with_mapping(ns.clone(), NamespaceId::new(1)), + NamespaceSchemaResolver::new(Arc::clone(&catalog), Arc::clone(&cache)), Arc::clone(&cache), Arc::clone(&catalog), TopicId::new(42), @@ -314,7 +315,7 @@ mod tests { // Now try in "reject" mode. let creator = NamespaceAutocreation::new( - MockNamespaceResolver::default().with_mapping(ns.clone(), NamespaceId::new(1)), + NamespaceSchemaResolver::new(Arc::clone(&catalog), Arc::clone(&cache)), cache, Arc::clone(&catalog), TopicId::new(42),