Skip to content

Commit 2c7717e

Browse files
committed
editoast: clarify a few tests
1 parent 4259b3c commit 2c7717e

File tree

1 file changed

+55
-19
lines changed
  • editoast/src/views/rolling_stocks

1 file changed

+55
-19
lines changed

editoast/src/views/rolling_stocks/mod.rs

+55-19
Original file line numberDiff line numberDiff line change
@@ -505,12 +505,16 @@ pub mod tests {
505505

506506
#[rstest]
507507
async fn get_returns_corresponding_rolling_stock(db_pool: Data<DbPool>) {
508+
// GIVEN
508509
let name = "fast_rolling_stock_get_returns_corresponding_rolling_stock";
509510
let app = create_test_service().await;
510511
let rolling_stock = named_fast_rolling_stock(name, db_pool).await;
511512
let req = rolling_stock_get_request(rolling_stock.id());
513+
514+
// WHEN
512515
let response = call_service(&app, req).await;
513516

517+
// THEN
514518
let response_body: RollingStock = assert_status_and_read!(response, StatusCode::OK);
515519
assert_eq!(response_body.common.name, name);
516520
}
@@ -526,11 +530,13 @@ pub mod tests {
526530

527531
#[rstest]
528532
async fn create_and_delete_unlocked_rolling_stock_successfully() {
533+
// GIVEN
529534
let app = create_test_service().await;
530535
let mut rolling_stock: RollingStockModel = get_fast_rolling_stock(
531536
"fast_rolling_stock_create_and_delete_unlocked_rolling_stock_successfully",
532537
);
533538

539+
// WHEN
534540
let post_response = call_service(
535541
&app,
536542
TestRequest::post()
@@ -540,19 +546,20 @@ pub mod tests {
540546
)
541547
.await;
542548

543-
//Check rolling_stock creation
549+
// THEN
550+
// Check rolling_stock creation
544551
let response_body: RollingStock = assert_status_and_read!(post_response, StatusCode::OK);
545552
let rolling_stock_id: i64 = response_body.id;
546553
rolling_stock.id = Some(response_body.id);
547554
let expected_body = RollingStock::from(rolling_stock.clone());
548555
assert_eq!(response_body, expected_body);
549556

550-
//Check rolling_stock deletion
557+
// Check rolling_stock deletion
551558
let delete_request = rolling_stock_delete_request(rolling_stock_id);
552559
let delete_response = call_service(&app, delete_request).await;
553560
assert_eq!(delete_response.status(), StatusCode::NO_CONTENT);
554561

555-
//Check rolling_stock does not exist anymore
562+
// Check rolling_stock does not exist anymore
556563
let get_request = rolling_stock_get_request(rolling_stock_id);
557564
let get_response = call_service(&app, get_request).await;
558565
assert_eq!(get_response.status(), StatusCode::NOT_FOUND);
@@ -578,13 +585,15 @@ pub mod tests {
578585

579586
#[rstest]
580587
async fn create_rolling_stock_with_base_power_class_empty(db_pool: Data<DbPool>) {
588+
// GIVEN
581589
let app = create_test_service().await;
582590
let mut rolling_stock: RollingStockModel = get_fast_rolling_stock(
583591
"fast_rolling_stock_create_rolling_stock_with_base_power_class_empty",
584592
);
585593

586594
rolling_stock.base_power_class = Some(Some("".to_string()));
587595

596+
// WHEN
588597
let post_response = call_service(
589598
&app,
590599
TestRequest::post()
@@ -594,18 +603,21 @@ pub mod tests {
594603
)
595604
.await;
596605

606+
// THEN
597607
check_create_gave_400(db_pool, post_response).await;
598608
}
599609

600610
#[rstest]
601611
async fn create_rolling_stock_with_duplicate_name(db_pool: Data<DbPool>) {
612+
// GIVEN
602613
let name = "fast_rolling_stock_create_rolling_stock_with_duplicate_name";
603614
let fast_rolling_stock = named_fast_rolling_stock(name, db_pool.clone()).await;
604615
let app = create_test_service().await;
605616
let mut rolling_stock: RollingStockModel = get_fast_rolling_stock(name);
606617

607618
rolling_stock.name = fast_rolling_stock.model.name.clone();
608619

620+
// WHEN
609621
let post_response = call_service(
610622
&app,
611623
TestRequest::post()
@@ -615,15 +627,19 @@ pub mod tests {
615627
)
616628
.await;
617629

630+
// THEN
618631
check_create_gave_400(db_pool, post_response).await;
619632
}
620633

621634
#[rstest]
622635
async fn update_and_delete_locked_rolling_stock_fails(db_pool: Data<DbPool>) {
636+
// GIVEN
623637
let app = create_test_service().await;
624638
let rolling_stock: RollingStockModel = get_fast_rolling_stock(
625639
"fast_rolling_stock_update_and_delete_locked_rolling_stock_fails",
626640
);
641+
642+
// WHEN
627643
let post_response = call_service(
628644
&app,
629645
TestRequest::post()
@@ -632,11 +648,13 @@ pub mod tests {
632648
.to_request(),
633649
)
634650
.await;
651+
652+
// THEN
635653
let locked_rolling_stock: RollingStock =
636654
assert_status_and_read!(post_response, StatusCode::OK);
637655
let rolling_stock_id = locked_rolling_stock.id;
638656

639-
//Check rolling_stock update fails
657+
// Check rolling_stock update fails
640658
let patch_response = call_service(
641659
&app,
642660
TestRequest::patch()
@@ -651,7 +669,7 @@ pub mod tests {
651669
RollingStockError::RollingStockIsLocked { rolling_stock_id }
652670
);
653671

654-
//Check rolling_stock deletion fails
672+
// Check rolling_stock deletion fails
655673
let delete_request = rolling_stock_delete_request(rolling_stock_id);
656674
let delete_response = call_service(&app, delete_request).await;
657675
assert_eq!(delete_response.status(), StatusCode::BAD_REQUEST);
@@ -660,12 +678,12 @@ pub mod tests {
660678
RollingStockError::RollingStockIsLocked { rolling_stock_id }
661679
);
662680

663-
//Check rolling_stock still exists
681+
// Check rolling_stock still exists
664682
let get_request = rolling_stock_get_request(rolling_stock_id);
665683
let get_response = call_service(&app, get_request).await;
666684
assert_eq!(get_response.status(), StatusCode::OK);
667685

668-
//Delete rolling_stock to clean db
686+
// Delete rolling_stock to clean db
669687
let _ = RollingStockModel::delete(db_pool, rolling_stock_id).await;
670688
}
671689

@@ -717,6 +735,7 @@ pub mod tests {
717735

718736
#[rstest]
719737
async fn update_unlocked_rolling_stock(db_pool: Data<DbPool>) {
738+
// GIVEN
720739
let app = create_test_service().await;
721740
let fast_rolling_stock = named_fast_rolling_stock(
722741
"fast_rolling_stock_update_unlocked_rolling_stock",
@@ -729,6 +748,7 @@ pub mod tests {
729748
get_other_rolling_stock("other_rolling_stock_update_unlocked_rolling_stock");
730749
rolling_stock.id = Some(rolling_stock_id);
731750

751+
// WHEN
732752
let response = call_service(
733753
&app,
734754
TestRequest::patch()
@@ -738,13 +758,14 @@ pub mod tests {
738758
)
739759
.await;
740760

761+
// THEN
741762
let response_body: RollingStock = assert_status_and_read!(response, StatusCode::OK);
742763

743764
let rolling_stock = retrieve_existing_rolling_stock(&db_pool, rolling_stock_id)
744765
.await
745766
.unwrap();
746767

747-
//Assert rolling_stock version is 1
768+
// Assert rolling_stock version is 1
748769
assert_eq!(rolling_stock.version.unwrap(), 1);
749770

750771
let expected_body = RollingStock::from(rolling_stock);
@@ -790,8 +811,11 @@ pub mod tests {
790811

791812
#[rstest]
792813
async fn update_locked_successfully(db_pool: Data<DbPool>) {
814+
// GIVEN
793815
let app = create_test_service().await;
794816
let rolling_stock = get_fast_rolling_stock("fast_rolling_stock_update_locked_successfully");
817+
818+
// WHEN
795819
let post_response = call_service(
796820
&app,
797821
TestRequest::post()
@@ -800,31 +824,33 @@ pub mod tests {
800824
.to_request(),
801825
)
802826
.await;
827+
828+
// THEN
803829
let response_body: RollingStock = assert_status_and_read!(post_response, StatusCode::OK);
804830
let rolling_stock_id = response_body.id;
805831
assert!(!response_body.locked);
806832

807-
//Lock rolling_stock
833+
// Lock rolling_stock
808834
let request = rolling_stock_locked_request(rolling_stock_id, true);
809835
let response = call_service(&app, request).await;
810836
assert_eq!(response.status(), StatusCode::NO_CONTENT);
811-
//Assert rolling_stock is locked
837+
// Assert rolling_stock is locked
812838
let rolling_stock = retrieve_existing_rolling_stock(&db_pool, rolling_stock_id)
813839
.await
814840
.unwrap();
815841
assert!(rolling_stock.locked.unwrap());
816842

817-
//Unlock rolling_stock
843+
// Unlock rolling_stock
818844
let request = rolling_stock_locked_request(rolling_stock_id, false);
819845
let response = call_service(&app, request).await;
820846
assert_eq!(response.status(), StatusCode::NO_CONTENT);
821-
//Assert rolling_stock is unlocked
847+
// Assert rolling_stock is unlocked
822848
let rolling_stock = retrieve_existing_rolling_stock(&db_pool, rolling_stock_id)
823849
.await
824850
.unwrap();
825851
assert!(!rolling_stock.locked.unwrap());
826852

827-
//Delete rolling_stock
853+
// Delete rolling_stock
828854
call_service(&app, rolling_stock_delete_request(rolling_stock_id)).await;
829855
}
830856

@@ -845,20 +871,25 @@ pub mod tests {
845871

846872
#[rstest]
847873
async fn check_usage_no_train_schedule_for_this_rolling_stock(db_pool: Data<DbPool>) {
874+
// GIVEN
848875
let rolling_stock = named_fast_rolling_stock(
849876
"fast_rolling_stock_check_usage_no_train_schedule_for_this_rolling_stock",
850877
db_pool,
851878
)
852879
.await;
853880
let app = create_test_service().await;
854881
let rolling_stock_id = rolling_stock.id();
882+
883+
// WHEN
855884
let response = call_service(
856885
&app,
857886
TestRequest::get()
858887
.uri(format!("/rolling_stock/{}/check_usage", rolling_stock_id).as_str())
859888
.to_request(),
860889
)
861890
.await;
891+
892+
// THEN
862893
let response_body: UsageResponse = assert_status_and_read!(response, StatusCode::OK);
863894
let expected_body = UsageResponse { usage: Vec::new() };
864895
assert_eq!(response_body, expected_body);
@@ -980,23 +1011,28 @@ pub mod tests {
9801011

9811012
#[rstest]
9821013
async fn get_power_restrictions_list(db_pool: Data<DbPool>) {
1014+
// GIVEN
9831015
let app = create_test_service().await;
9841016
let rolling_stock =
9851017
named_fast_rolling_stock("fast_rolling_stock_get_power_restrictions_list", db_pool)
9861018
.await;
1019+
let power_restrictions = rolling_stock
1020+
.model
1021+
.power_restrictions
1022+
.clone()
1023+
.unwrap()
1024+
.unwrap();
1025+
1026+
// WHEN
9871027
let response = call_service(
9881028
&app,
9891029
TestRequest::get()
9901030
.uri("/rolling_stock/power_restrictions")
9911031
.to_request(),
9921032
)
9931033
.await;
994-
let power_restrictions = rolling_stock
995-
.model
996-
.power_restrictions
997-
.clone()
998-
.unwrap()
999-
.unwrap();
1034+
1035+
// THEN
10001036
assert!(power_restrictions.to_string().contains(&"C2".to_string()));
10011037
let response_body: Vec<String> = read_body_json(response).await;
10021038
assert!(response_body.contains(&"C2".to_string()));

0 commit comments

Comments
 (0)