Migrating to test-r, work in progress

Cargo.toml

@@ -164,6 +164,7 @@ testcontainers-modules = { version = "0.3.2", features = [
     "redis",
     "minio",
 ] }
+test-r = "0.0.6"
 thiserror = "1.0.56"
 tokio = { version = "1.0", features = [
     "macros",

golem-api-grpc/Cargo.toml

@@ -8,6 +8,7 @@ repository = "https://github.com/golemcloud/golem"
 description = "GRPC API for Golem services"
 
 [lib]
+harness = false
 
 [dependencies]
 async-trait = { workspace = true }
@@ -24,6 +25,9 @@ tonic = { workspace = true }
 tracing = { workspace = true }
 uuid = { workspace = true }
 
+[dev-dependencies]
+test-r = { workspace = true }
+
 [build-dependencies]
 cargo_metadata = "0.18.1"
 tonic-build = "0.11.0"

golem-api-grpc/src/lib.rs

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(test)]
+test_r::enable!();
+
 #[allow(clippy::large_enum_variant)]
 pub mod proto {
     use crate::proto::golem::worker::UpdateMode;
@@ -215,6 +218,8 @@ pub mod proto {
 
     #[cfg(test)]
     mod tests {
+        use test_r::test;
+
         use crate::proto::golem;
         use prost::Message;
         use std::str::FromStr;

golem-common/Cargo.toml

@@ -9,7 +9,7 @@ description = "Shared code between Golem services"
 
 
 [lib]
-
+harness = false
 
 [dependencies]
 golem-api-grpc = { path = "../golem-api-grpc", version = "0.0.0" }
@@ -54,4 +54,5 @@ wasm-wave = { workspace = true }
 itertools = { workspace = true }
 
 [dev-dependencies]
+test-r = { workspace = true }
 tracing-test = { workspace = true }

golem-common/src/lib.rs

@@ -31,6 +31,9 @@ pub mod serialization;
 pub mod tracing;
 pub mod uri;
 
+#[cfg(test)]
+test_r::enable!();
+
 /// Trait to convert a value to a string which is safe to return through a public API.
 pub trait SafeDisplay {
     fn to_safe_string(&self) -> String;

golem-common/src/model/mod.rs

@@ -2470,6 +2470,8 @@ impl FromStr for ComponentType {
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use std::collections::HashSet;
     use std::str::FromStr;
     use std::time::SystemTime;

golem-common/src/model/regions.rs

@@ -227,6 +227,8 @@ impl Display for DeletedRegions {
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use crate::model::oplog::OplogIndex;
     use crate::model::regions::{DeletedRegionsBuilder, OplogRegion};
 

golem-common/src/retries.rs

@@ -219,9 +219,10 @@ where
 
 #[cfg(test)]
 mod tests {
-    use std::time::Duration;
+    use test_r::test;
 
     use crate::config::RetryConfig;
+    use std::time::Duration;
 
     #[test]
     pub fn get_delay_example_without_jitter() {

golem-common/src/serialization.rs

@@ -82,6 +82,8 @@ pub fn try_deserialize_with_version<T: Decode>(
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use bincode::{Decode, Encode};
     use rand::distributions::Alphanumeric;
     use rand::Rng;

golem-common/src/tracing.rs

@@ -605,6 +605,8 @@ mod test {
     }
 
     mod json_flatten_span_formatter {
+        use test_r::test;
+
         use tracing;
         use tracing::{field, info, span, Level};
         use tracing_subscriber::FmtSubscriber;

golem-common/src/uri/cloud/uri.rs

@@ -177,6 +177,8 @@ uri_from_into!(ResourceUri);
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use crate::model::{ComponentId, TargetWorkerId, WorkerId};
     use crate::uri::cloud::uri::{
         ApiDefinitionUri, ApiDeploymentUri, ComponentOrVersionUri, ComponentUri,

golem-common/src/uri/cloud/url.rs

@@ -667,6 +667,8 @@ impl Display for ResourceUrl {
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use crate::uri::cloud::url::{
         AccountUrl, ApiDefinitionUrl, ApiDeploymentUrl, ComponentOrVersionUrl, ComponentUrl,
         ComponentVersionUrl, ProjectUrl, ResourceUrl, WorkerFunctionUrl, WorkerOrFunctionUrl,

golem-common/src/uri/cloud/urn.rs

@@ -171,6 +171,8 @@ impl Display for ResourceUrn {
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use crate::model::{AccountId, ProjectId};
     use crate::uri::cloud::urn::{AccountUrn, ProjectUrn, ResourceUrn};
     use crate::uri::GolemUrn;

golem-common/src/uri/mod.rs

@@ -715,6 +715,8 @@ impl<'de> Deserialize<'de> for GolemUrl {
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use crate::uri::{GolemUri, GolemUrl, GolemUrn};
     use std::str::FromStr;
     use url::Url;

golem-common/src/uri/oss/uri.rs

@@ -131,6 +131,8 @@ uri_from_into!(ResourceUri);
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use crate::model::{ComponentId, TargetWorkerId, WorkerId};
     use crate::uri::oss::uri::{
         ApiDefinitionUri, ApiDeploymentUri, ComponentOrVersionUri, ComponentUri,

golem-common/src/uri/oss/url.rs

@@ -432,6 +432,8 @@ impl Display for ResourceUrl {
 
 #[cfg(test)]
 mod tests {
+    use test_r::test;
+
     use crate::uri::oss::url::{
         ApiDefinitionUrl, ApiDeploymentUrl, ComponentOrVersionUrl, ComponentUrl,
         ComponentVersionUrl, ResourceUrl, WorkerFunctionUrl, WorkerOrFunctionUrl, WorkerUrl,