Skip to content

Commit 1c4cfc0

Browse files
committed
style(rust): better format some test code
1 parent 9f0508d commit 1c4cfc0

File tree

1 file changed

+110
-109
lines changed

1 file changed

+110
-109
lines changed

implementations/rust/ockam/ockam_api/src/cli_state/storage/journeys_repository_sql.rs

+110-109
Original file line numberDiff line numberDiff line change
@@ -241,61 +241,61 @@ mod test {
241241
#[tokio::test]
242242
async fn test_several_host_journeys() -> Result<()> {
243243
with_application_dbs(|db| async move {
244-
let repository: Arc<dyn JourneysRepository> =
245-
Arc::new(JourneysSqlxDatabase::new(db));
246-
247-
// create and store a the first host journey
248-
let opentelemetry_context1 = OpenTelemetryContext::from_str("{\"traceparent\":\"00-b9ce70eaad5a86ef6b9fa4db00589e86-8e2d99c5e5ed66e4-01\",\"tracestate\":\"\"}").unwrap();
249-
let start1 = Utc::now();
250-
let host_journey1 = Journey::new(opentelemetry_context1.clone(), None, start1);
251-
repository.store_host_journey(host_journey1.clone()).await?;
252-
253-
// retrieve the journey based on the time
254-
// before the journey 1 start -> None
255-
// equal or after the journey 1 start -> Some(journey1)
256-
let actual = repository
257-
.get_host_journey(start1.sub(Duration::from_secs(3)))
258-
.await?;
259-
assert_eq!(actual, None);
260-
261-
let actual = repository.get_host_journey(start1).await?;
262-
assert_eq!(actual, Some(host_journey1.clone()));
263-
264-
let actual = repository
265-
.get_host_journey(start1.add(Duration::from_secs(3)))
266-
.await?;
267-
assert_eq!(actual, Some(host_journey1.clone()));
268-
269-
// Create the next journey
270-
let opentelemetry_context2 = OpenTelemetryContext::from_str("{\"traceparent\":\"00-b9ce70eaad5a86ef6b9fa4db00589e86-8e2d99c5e5ed66e4-02\",\"tracestate\":\"\"}").unwrap();
271-
let start2 = start1.add(Duration::from_secs(1000));
272-
let host_journey2 = Journey::new(
273-
opentelemetry_context2.clone(),
274-
Some(opentelemetry_context1),
275-
start2,
276-
);
277-
repository.store_host_journey(host_journey2.clone()).await?;
278-
// retrieve the journey based on the time
279-
// right before the journey 2 start -> Some(journey1)
280-
// equal or after the journey 2 start -> Some(journey2)
281-
let actual = repository
282-
.get_host_journey(start2.sub(Duration::from_secs(3)))
283-
.await?;
284-
assert_eq!(actual, Some(host_journey1.clone()));
285-
286-
let actual = repository.get_host_journey(start2).await?;
287-
assert_eq!(actual, Some(host_journey2.clone()));
288-
assert_eq!(
289-
host_journey2.previous_opentelemetry_context(),
290-
Some(host_journey1.opentelemetry_context())
291-
);
244+
let repository: Arc<dyn JourneysRepository> =
245+
Arc::new(JourneysSqlxDatabase::new(db));
246+
247+
// create and store a the first host journey
248+
let opentelemetry_context1 = OpenTelemetryContext::from_str("{\"traceparent\":\"00-b9ce70eaad5a86ef6b9fa4db00589e86-8e2d99c5e5ed66e4-01\",\"tracestate\":\"\"}").unwrap();
249+
let start1 = Utc::now();
250+
let host_journey1 = Journey::new(opentelemetry_context1.clone(), None, start1);
251+
repository.store_host_journey(host_journey1.clone()).await?;
252+
253+
// retrieve the journey based on the time
254+
// before the journey 1 start -> None
255+
// equal or after the journey 1 start -> Some(journey1)
256+
let actual = repository
257+
.get_host_journey(start1.sub(Duration::from_secs(3)))
258+
.await?;
259+
assert_eq!(actual, None);
260+
261+
let actual = repository.get_host_journey(start1).await?;
262+
assert_eq!(actual, Some(host_journey1.clone()));
263+
264+
let actual = repository
265+
.get_host_journey(start1.add(Duration::from_secs(3)))
266+
.await?;
267+
assert_eq!(actual, Some(host_journey1.clone()));
268+
269+
// Create the next journey
270+
let opentelemetry_context2 = OpenTelemetryContext::from_str("{\"traceparent\":\"00-b9ce70eaad5a86ef6b9fa4db00589e86-8e2d99c5e5ed66e4-02\",\"tracestate\":\"\"}").unwrap();
271+
let start2 = start1.add(Duration::from_secs(1000));
272+
let host_journey2 = Journey::new(
273+
opentelemetry_context2.clone(),
274+
Some(opentelemetry_context1),
275+
start2,
276+
);
277+
repository.store_host_journey(host_journey2.clone()).await?;
278+
// retrieve the journey based on the time
279+
// right before the journey 2 start -> Some(journey1)
280+
// equal or after the journey 2 start -> Some(journey2)
281+
let actual = repository
282+
.get_host_journey(start2.sub(Duration::from_secs(3)))
283+
.await?;
284+
assert_eq!(actual, Some(host_journey1.clone()));
285+
286+
let actual = repository.get_host_journey(start2).await?;
287+
assert_eq!(actual, Some(host_journey2.clone()));
288+
assert_eq!(
289+
host_journey2.previous_opentelemetry_context(),
290+
Some(host_journey1.opentelemetry_context())
291+
);
292292

293-
let actual = repository
294-
.get_host_journey(start2.add(Duration::from_secs(3)))
295-
.await?;
296-
assert_eq!(actual, Some(host_journey2));
293+
let actual = repository
294+
.get_host_journey(start2.add(Duration::from_secs(3)))
295+
.await?;
296+
assert_eq!(actual, Some(host_journey2));
297297

298-
Ok(())
298+
Ok(())
299299
}).await
300300
}
301301

@@ -307,63 +307,64 @@ mod test {
307307
Arc::new(JourneysSqlxDatabase::new(db));
308308

309309
// create and store a the first host journey
310-
let opentelemetry_context1 = OpenTelemetryContext::from_str("{\"traceparent\":\"00-b9ce70eaad5a86ef6b9fa4db00589e86-8e2d99c5e5ed66e4-01\",\"tracestate\":\"\"}").unwrap();
311-
let start1 = Utc::now();
312-
let project_journey1 =
313-
ProjectJourney::new("project_id", opentelemetry_context1.clone(), None, start1);
314-
repository
315-
.store_project_journey(project_journey1.clone())
316-
.await?;
317-
318-
// retrieve the journey based on the time
319-
// before the journey 1 start -> None
320-
// equal or after the journey 1 start -> Some(journey1)
321-
let actual = repository
322-
.get_project_journey("project_id", start1.sub(Duration::from_secs(3)))
323-
.await?;
324-
assert_eq!(actual, None);
325-
326-
let actual = repository.get_project_journey("project_id", start1).await?;
327-
assert_eq!(actual, Some(project_journey1.clone()));
328-
329-
let actual = repository
330-
.get_project_journey("project_id", start1.add(Duration::from_secs(3)))
331-
.await?;
332-
assert_eq!(actual, Some(project_journey1.clone()));
333-
334-
// Create the next journey
335-
let opentelemetry_context2 = OpenTelemetryContext::from_str("{\"traceparent\":\"00-b9ce70eaad5a86ef6b9fa4db00589e86-8e2d99c5e5ed66e4-02\",\"tracestate\":\"\"}").unwrap();
336-
let start2 = start1.add(Duration::from_secs(1000));
337-
let project_journey2 = ProjectJourney::new(
338-
"project_id",
339-
opentelemetry_context2.clone(),
340-
Some(opentelemetry_context1),
341-
start2,
342-
);
343-
repository
344-
.store_project_journey(project_journey2.clone())
345-
.await?;
346-
347-
// retrieve the journey based on the time
348-
// right before the journey 2 start -> Some(journey1)
349-
// equal or after the journey 2 start -> Some(journey2)
350-
let actual = repository
351-
.get_project_journey("project_id", start2.sub(Duration::from_secs(3)))
352-
.await?;
353-
assert_eq!(actual, Some(project_journey1.clone()));
354-
355-
let actual = repository.get_project_journey("project_id", start2).await?;
356-
assert_eq!(actual, Some(project_journey2.clone()));
357-
assert_eq!(
358-
project_journey2.previous_opentelemetry_context(),
359-
Some(project_journey1.opentelemetry_context())
360-
);
310+
let opentelemetry_context1 = OpenTelemetryContext::from_str("{\"traceparent\":\"00-b9ce70eaad5a86ef6b9fa4db00589e86-8e2d99c5e5ed66e4-01\",\"tracestate\":\"\"}").unwrap();
311+
let start1 = Utc::now();
312+
let project_journey1 =
313+
ProjectJourney::new("project_id", opentelemetry_context1.clone(), None, start1);
314+
repository
315+
.store_project_journey(project_journey1.clone())
316+
.await?;
317+
318+
// retrieve the journey based on the time
319+
// before the journey 1 start -> None
320+
// equal or after the journey 1 start -> Some(journey1)
321+
let actual = repository
322+
.get_project_journey("project_id", start1.sub(Duration::from_secs(3)))
323+
.await?;
324+
assert_eq!(actual, None);
325+
326+
let actual = repository.get_project_journey("project_id", start1).await?;
327+
assert_eq!(actual, Some(project_journey1.clone()));
328+
329+
let actual = repository
330+
.get_project_journey("project_id", start1.add(Duration::from_secs(3)))
331+
.await?;
332+
assert_eq!(actual, Some(project_journey1.clone()));
333+
334+
// Create the next journey
335+
let opentelemetry_context2 = OpenTelemetryContext::from_str("{\"traceparent\":\"00-b9ce70eaad5a86ef6b9fa4db00589e86-8e2d99c5e5ed66e4-02\",\"tracestate\":\"\"}").unwrap();
336+
let start2 = start1.add(Duration::from_secs(1000));
337+
let project_journey2 = ProjectJourney::new(
338+
"project_id",
339+
opentelemetry_context2.clone(),
340+
Some(opentelemetry_context1),
341+
start2,
342+
);
343+
repository
344+
.store_project_journey(project_journey2.clone())
345+
.await?;
346+
347+
// retrieve the journey based on the time
348+
// right before the journey 2 start -> Some(journey1)
349+
// equal or after the journey 2 start -> Some(journey2)
350+
let actual = repository
351+
.get_project_journey("project_id", start2.sub(Duration::from_secs(3)))
352+
.await?;
353+
assert_eq!(actual, Some(project_journey1.clone()));
361354

362-
let actual = repository
363-
.get_project_journey("project_id", start2.add(Duration::from_secs(3)))
364-
.await?;
365-
assert_eq!(actual, Some(project_journey2));
355+
let actual = repository.get_project_journey("project_id", start2).await?;
356+
assert_eq!(actual, Some(project_journey2.clone()));
357+
assert_eq!(
358+
project_journey2.previous_opentelemetry_context(),
359+
Some(project_journey1.opentelemetry_context())
360+
);
366361

367-
Ok(()) }).await
362+
let actual = repository
363+
.get_project_journey("project_id", start2.add(Duration::from_secs(3)))
364+
.await?;
365+
assert_eq!(actual, Some(project_journey2));
366+
367+
Ok(())
368+
}).await
368369
}
369370
}

0 commit comments

Comments
 (0)