Unify mocks and test-util feature in crates

restatedev · Jun 14, 2024 · a173914 · a173914
1 parent 17fd0df
commit a173914
Show file tree

Hide file tree

Showing 26 changed files with 49 additions and 51 deletions.
diff --git a/crates/admin/Cargo.toml b/crates/admin/Cargo.toml
@@ -52,7 +52,7 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 restate-schema = { workspace = true, features = ["test-util"] }
-restate-schema-api = { workspace = true, features = ["mocks"] }
+restate-schema-api = { workspace = true, features = ["test-util"] }
 restate-test-util = { workspace = true }
 
 tempfile = { workspace = true }

diff --git a/crates/ingress-dispatcher/Cargo.toml b/crates/ingress-dispatcher/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 
 [features]
 default = []
-mocks = ["dep:restate-test-util"]
+test-util = ["dep:restate-test-util"]
 
 [dependencies]
 restate-bifrost = { workspace = true }

diff --git a/crates/ingress-dispatcher/src/lib.rs b/crates/ingress-dispatcher/src/lib.rs
@@ -276,8 +276,8 @@ impl IngressDispatcherRequest {
     }
 }
 
-#[cfg(feature = "mocks")]
-pub mod mocks {
+#[cfg(feature = "test-util")]
+pub mod test_util {
     use super::*;
 
     use crate::error::IngressDispatchError;

diff --git a/crates/ingress-http/Cargo.toml b/crates/ingress-http/Cargo.toml
@@ -65,10 +65,10 @@ humantime = { workspace = true }
 
 [dev-dependencies]
 restate-core = { workspace = true, features = ["test-util"] }
-restate-ingress-dispatcher = { workspace = true, features = ["mocks"] }
+restate-ingress-dispatcher = { workspace = true, features = ["test-util"] }
 restate-test-util = { workspace = true }
 restate-types = { workspace = true, features = ["test-util"] }
-restate-schema-api = { workspace = true, features = ["mocks"]}
+restate-schema-api = { workspace = true, features = ["test-util"]}
 
 hyper = { version = "1.0", features = ["full"] }
 hyper-util = { version = "0.1", features = ["full"] }

diff --git a/crates/ingress-http/src/handler/tests.rs b/crates/ingress-http/src/handler/tests.rs
@@ -24,7 +24,7 @@ use http::StatusCode;
 use http::{Method, Request, Response};
 use http_body_util::{BodyExt, Empty, Full};
 use restate_core::TestCoreEnv;
-use restate_ingress_dispatcher::mocks::MockDispatcher;
+use restate_ingress_dispatcher::test_util::MockDispatcher;
 use restate_ingress_dispatcher::IngressDispatcherRequest;
 use restate_schema_api::invocation_target::{
     InputContentType, InputRules, InputValidationRule, InvocationTargetMetadata,

diff --git a/crates/ingress-http/src/lib.rs b/crates/ingress-http/src/lib.rs
@@ -58,11 +58,11 @@ mod mocks {
     use super::*;
 
     use anyhow::Error;
-    use restate_schema_api::invocation_target::mocks::MockInvocationTargetResolver;
+    use restate_schema_api::invocation_target::test_util::MockInvocationTargetResolver;
     use restate_schema_api::invocation_target::{
         InvocationTargetMetadata, InvocationTargetResolver, DEFAULT_IDEMPOTENCY_RETENTION,
     };
-    use restate_schema_api::service::mocks::MockServiceMetadataResolver;
+    use restate_schema_api::service::test_util::MockServiceMetadataResolver;
     use restate_schema_api::service::{HandlerMetadata, ServiceMetadata, ServiceMetadataResolver};
     use restate_types::identifiers::DeploymentId;
     use restate_types::ingress::InvocationResponse;

diff --git a/crates/ingress-http/src/server.rs b/crates/ingress-http/src/server.rs
@@ -246,7 +246,7 @@ mod tests {
     use hyper_util::client::legacy::Client;
     use hyper_util::rt::TokioExecutor;
     use restate_core::{TaskCenter, TaskKind, TestCoreEnv};
-    use restate_ingress_dispatcher::mocks::MockDispatcher;
+    use restate_ingress_dispatcher::test_util::MockDispatcher;
     use restate_ingress_dispatcher::{IngressDispatcherRequest, IngressInvocationResponse};
     use restate_test_util::assert_eq;
     use restate_types::identifiers::InvocationId;

diff --git a/crates/ingress-kafka/Cargo.toml b/crates/ingress-kafka/Cargo.toml
@@ -33,9 +33,9 @@ tracing = { workspace = true }
 tracing-opentelemetry = { workspace = true }
 
 [dev-dependencies]
-restate-ingress-dispatcher = { workspace = true, features = ["mocks"] }
+restate-ingress-dispatcher = { workspace = true, features = ["test-util"] }
 restate-schema = { workspace = true }
-restate-schema-api = { workspace = true, features = ["mocks"] }
+restate-schema-api = { workspace = true, features = ["test-util"] }
 restate-test-util = { workspace = true }
 restate-types = { workspace = true, features = ["test-util"] }
 

diff --git a/crates/invoker-api/Cargo.toml b/crates/invoker-api/Cargo.toml
@@ -9,14 +9,13 @@ publish = false
 
 [features]
 default = []
-mocks = []
+test-util = ["restate-types/test-util"]
 serde = ["dep:serde"]
 
 [dependencies]
 restate-errors = { workspace = true }
 restate-types = { workspace = true }
 
-
 anyhow = { workspace = true }
 bytes = { workspace = true }
 bytestring = { workspace = true }

diff --git a/crates/invoker-api/src/entry_enricher.rs b/crates/invoker-api/src/entry_enricher.rs
@@ -22,8 +22,8 @@ pub trait EntryEnricher {
     ) -> Result<EnrichedRawEntry, InvocationError>;
 }
 
-#[cfg(any(test, feature = "mocks"))]
-pub mod mocks {
+#[cfg(any(test, feature = "test-util"))]
+pub mod test_util {
     use super::*;
 
     use restate_types::identifiers::{InvocationId, InvocationUuid};

diff --git a/crates/invoker-api/src/lib.rs b/crates/invoker-api/src/lib.rs
@@ -22,8 +22,8 @@ pub use journal_reader::{JournalMetadata, JournalReader};
 pub use state_reader::{EagerState, StateReader};
 pub use status_handle::{InvocationErrorReport, InvocationStatusReport, StatusHandle};
 
-#[cfg(any(test, feature = "mocks"))]
-pub mod mocks {
+#[cfg(any(test, feature = "test-util"))]
+pub mod test_util {
     use super::*;
     use bytes::Bytes;
     use restate_types::identifiers::{InvocationId, ServiceId};

diff --git a/crates/invoker-api/src/status_handle.rs b/crates/invoker-api/src/status_handle.rs
@@ -124,8 +124,8 @@ pub trait StatusHandle {
     ) -> impl Future<Output = Self::Iterator> + Send;
 }
 
-#[cfg(any(test, feature = "mocks"))]
-pub mod mocks {
+#[cfg(any(test, feature = "test-util"))]
+pub mod test_util {
     use super::*;
 
     #[derive(Debug, Clone, Default)]

diff --git a/crates/invoker-impl/Cargo.toml b/crates/invoker-impl/Cargo.toml
@@ -47,8 +47,8 @@ tracing-opentelemetry = { workspace = true }
 
 [dev-dependencies]
 restate-core = { workspace = true, features = ["test-util"] }
-restate-invoker-api = { workspace = true, features = ["mocks"] }
-restate-schema-api = { workspace = true, features = ["mocks"] }
+restate-invoker-api = { workspace = true, features = ["test-util"] }
+restate-schema-api = { workspace = true, features = ["test-util"] }
 restate-service-protocol = { workspace = true, features = ["codec"] }
 restate-test-util = { workspace = true }
 restate-types = { workspace = true }

diff --git a/crates/invoker-impl/src/invocation_task/service_protocol_runner.rs b/crates/invoker-impl/src/invocation_task/service_protocol_runner.rs
@@ -40,8 +40,7 @@ use restate_types::journal::EntryType;
 use restate_types::service_protocol::ServiceProtocolVersion;
 use std::collections::HashSet;
 use std::future::poll_fn;
-use tracing::log::warn;
-use tracing::{debug, info, trace, Span};
+use tracing::{debug, info, trace, warn, Span};
 use tracing_opentelemetry::OpenTelemetrySpanExt;
 
 /// Runs the interaction between the server and the service endpoint.

diff --git a/crates/invoker-impl/src/lib.rs b/crates/invoker-impl/src/lib.rs
@@ -1021,7 +1021,7 @@ mod tests {
     use bytes::Bytes;
     use restate_core::TaskKind;
     use restate_core::TestCoreEnv;
-    use restate_invoker_api::mocks::EmptyStorageReader;
+    use restate_invoker_api::test_util::EmptyStorageReader;
     use restate_types::arc_util::Constant;
     use restate_types::config::InvokerOptionsBuilder;
     use tempfile::tempdir;
@@ -1030,7 +1030,7 @@ mod tests {
     use tokio_util::sync::CancellationToken;
 
     use restate_invoker_api::{entry_enricher, ServiceHandle};
-    use restate_schema_api::deployment::mocks::MockDeploymentMetadataRegistry;
+    use restate_schema_api::deployment::test_util::MockDeploymentMetadataRegistry;
     use restate_test_util::{check, let_assert};
     use restate_types::identifiers::{LeaderEpoch, PartitionId};
     use restate_types::journal::enriched::EnrichedEntryHeader;
@@ -1161,7 +1161,7 @@ mod tests {
                 restate_service_client::AssumeRoleCacheMode::None,
             )
             .unwrap(),
-            entry_enricher::mocks::MockEntryEnricher,
+            entry_enricher::test_util::MockEntryEnricher,
         );
 
         let mut handle = service.handle();

diff --git a/crates/schema-api/Cargo.toml b/crates/schema-api/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 default = []
 
 deployment = ["dep:restate-types", "dep:http", "dep:base64", "dep:restate-base64-util", "dep:bytestring", "service"]
-mocks = []
+test-util = []
 serde = ["dep:serde", "dep:serde_with", "dep:restate-serde-util"]
 serde_schema = ["serde", "dep:schemars", "restate-types?/schemars", "restate-serde-util?/schema"]
 service = ["dep:bytes", "dep:restate-types", "dep:humantime"]

diff --git a/crates/schema-api/src/invocation_target.rs b/crates/schema-api/src/invocation_target.rs
@@ -388,9 +388,9 @@ impl fmt::Display for OutputContentTypeRule {
     }
 }
 
-#[cfg(feature = "mocks")]
+#[cfg(feature = "test-util")]
 #[allow(dead_code)]
-pub mod mocks {
+pub mod test_util {
     use super::*;
 
     use std::collections::HashMap;

diff --git a/crates/schema-api/src/lib.rs b/crates/schema-api/src/lib.rs
@@ -188,8 +188,8 @@ pub mod deployment {
         fn get_deployments(&self) -> Vec<(Deployment, Vec<(String, ServiceRevision)>)>;
     }
 
-    #[cfg(feature = "mocks")]
-    pub mod mocks {
+    #[cfg(feature = "test-util")]
+    pub mod test_util {
         use super::*;
 
         use restate_types::service_protocol::MAX_SERVICE_PROTOCOL_VERSION_VALUE;
@@ -413,9 +413,9 @@ pub mod service {
         fn list_services(&self) -> Vec<ServiceMetadata>;
     }
 
-    #[cfg(feature = "mocks")]
+    #[cfg(feature = "test-util")]
     #[allow(dead_code)]
-    pub mod mocks {
+    pub mod test_util {
         use super::*;
 
         use std::collections::HashMap;

diff --git a/crates/service-protocol/Cargo.toml b/crates/service-protocol/Cargo.toml
@@ -14,7 +14,7 @@ awakeable-id = ["dep:base64", "dep:restate-base64-util", "dep:restate-types"]
 codec = ["dep:restate-types", "dep:paste"]
 discovery = ["dep:serde", "dep:serde_json", "dep:regress", "dep:tracing", "dep:codederror", "dep:restate-errors", "dep:restate-schema-api", "dep:hyper", "dep:restate-service-client", "dep:restate-types", "dep:tokio"]
 message = ["dep:restate-types", "dep:bytes-utils", "dep:codederror", "dep:restate-errors", "dep:size", "dep:tracing"]
-mocks = ["awakeable-id"]
+test-util = ["awakeable-id"]
 
 [dependencies]
 restate-base64-util = { workspace = true, optional = true }

diff --git a/crates/service-protocol/src/codec.rs b/crates/service-protocol/src/codec.rs
@@ -161,8 +161,8 @@ impl RawEntryCodec for ProtobufRawEntryCodec {
     }
 }
 
-#[cfg(feature = "mocks")]
-mod mocks {
+#[cfg(feature = "test-util")]
+mod test_util {
     use std::str::FromStr;
 
     use super::*;

diff --git a/crates/storage-api/Cargo.toml b/crates/storage-api/Cargo.toml
@@ -8,7 +8,7 @@ license.workspace = true
 publish = false
 
 [features]
-mocks = []
+test-util = []
 serde = ["dep:serde"]
 
 [dependencies]

diff --git a/crates/storage-api/src/invocation_status_table/mod.rs b/crates/storage-api/src/invocation_status_table/mod.rs
@@ -387,8 +387,8 @@ pub trait InvocationStatusTable: ReadOnlyInvocationStatusTable {
     ) -> impl Future<Output = ()> + Send;
 }
 
-#[cfg(any(test, feature = "mocks"))]
-mod mocks {
+#[cfg(any(test, feature = "test-util"))]
+mod test_util {
     use super::*;
 
     use restate_types::invocation::VirtualObjectHandlerType;

diff --git a/crates/storage-query-datafusion/Cargo.toml b/crates/storage-query-datafusion/Cargo.toml
@@ -41,11 +41,11 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 restate-core = { workspace = true, features = ["test-util"] }
-restate-invoker-api = { workspace = true, features = ["mocks"] }
+restate-invoker-api = { workspace = true, features = ["test-util"] }
 restate-rocksdb = { workspace = true, features = ["test-util"] }
-restate-schema-api = { workspace = true, features = ["mocks"] }
-restate-storage-api = { workspace = true, features = ["mocks"] }
-restate-service-protocol = { workspace = true, features = ["mocks"] }
+restate-schema-api = { workspace = true, features = ["test-util"] }
+restate-storage-api = { workspace = true, features = ["test-util"] }
+restate-service-protocol = { workspace = true, features = ["test-util"] }
 restate-types = { workspace = true, features = ["test-util"] }
 
 googletest = { workspace = true }
diff --git a/crates/storage-query-datafusion/src/mocks.rs b/crates/storage-query-datafusion/src/mocks.rs
@@ -18,13 +18,13 @@ use datafusion::arrow::record_batch::RecordBatch;
 use datafusion::execution::SendableRecordBatchStream;
 use googletest::matcher::{Matcher, MatcherResult};
 use restate_core::task_center;
-use restate_invoker_api::status_handle::mocks::MockStatusHandle;
+use restate_invoker_api::status_handle::test_util::MockStatusHandle;
 use restate_invoker_api::StatusHandle;
 use restate_partition_store::{OpenMode, PartitionStore, PartitionStoreManager};
 use restate_rocksdb::RocksDbManager;
-use restate_schema_api::deployment::mocks::MockDeploymentMetadataRegistry;
+use restate_schema_api::deployment::test_util::MockDeploymentMetadataRegistry;
 use restate_schema_api::deployment::{Deployment, DeploymentResolver};
-use restate_schema_api::service::mocks::MockServiceMetadataResolver;
+use restate_schema_api::service::test_util::MockServiceMetadataResolver;
 use restate_schema_api::service::{ServiceMetadata, ServiceMetadataResolver};
 use restate_types::arc_util::Constant;
 use restate_types::config::{CommonOptions, QueryEngineOptions, WorkerOptions};

diff --git a/crates/storage-query-datafusion/src/tests.rs b/crates/storage-query-datafusion/src/tests.rs
@@ -16,7 +16,7 @@ use futures::StreamExt;
 use googletest::all;
 use googletest::prelude::{assert_that, eq};
 use restate_core::TaskCenterBuilder;
-use restate_invoker_api::status_handle::mocks::MockStatusHandle;
+use restate_invoker_api::status_handle::test_util::MockStatusHandle;
 use restate_invoker_api::status_handle::InvocationStatusReportInner;
 use restate_invoker_api::{InvocationErrorReport, InvocationStatusReport};
 use restate_storage_api::invocation_status_table::{

diff --git a/crates/worker/Cargo.toml b/crates/worker/Cargo.toml
@@ -76,9 +76,9 @@ tracing-opentelemetry = { workspace = true }
 [dev-dependencies]
 restate-core = { workspace = true, features = ["test-util"] }
 restate-rocksdb = { workspace = true, features = ["test-util"] }
-restate-schema-api = { workspace = true, features = ["mocks"] }
-restate-service-protocol = { workspace = true, features = ["mocks"] }
-restate-storage-api = { workspace = true, features = ["mocks"] }
+restate-schema-api = { workspace = true, features = ["test-util"] }
+restate-service-protocol = { workspace = true, features = ["test-util"] }
+restate-storage-api = { workspace = true, features = ["test-util"] }
 restate-test-util = { workspace = true, features = ["prost"] }
 restate-types = { workspace = true, features = ["test-util"] }
 prost = { workspace = true }