move more tests to the new expected/actual format

Author: lovasoa

tests/core/mod.rs

@@ -88,7 +88,7 @@ async fn test_routing_with_prefix() {
 
     let app_data = actix_web::web::Data::new(state);
     let resp = req_path_with_app_data(
-        "/prefix/tests/sql_test_files/it_works_simple.sql",
+        "/prefix/tests/sql_test_files/component_rendering/it_works_simple.sql",
         app_data.clone(),
     )
     .await
@@ -121,9 +121,12 @@ async fn test_routing_with_prefix() {
         .to_string();
     assert!(resp.to_lowercase().contains("forbidden"), "{resp}");
 
-    let resp = req_path_with_app_data("/tests/sql_test_files/it_works_simple.sql", app_data)
-        .await
-        .unwrap();
+    let resp = req_path_with_app_data(
+        "/tests/sql_test_files/component_rendering/it_works_simple.sql",
+        app_data,
+    )
+    .await
+    .unwrap();
     assert_eq!(resp.status(), StatusCode::MOVED_PERMANENTLY);
     let location = resp
         .headers()

tests/core/select_temp_t.sql

@@ -1,2 +1,2 @@
--- see tests/sql_test_files/it_works_temp_table_accessible_in_run_sql.sql
+-- see tests/sql_test_files/component_rendering/it_works_temp_table_accessible_in_run_sql_nomssql.sql
 select 'text' as component, x as contents from temp_t;

tests/data_formats/mod.rs

@@ -96,7 +96,7 @@ async fn test_json_columns() {
 #[actix_web::test]
 async fn test_accept_json_returns_json_array() -> actix_web::Result<()> {
     let resp = req_with_accept(
-        "/tests/sql_test_files/it_works_simple.sql",
+        "/tests/sql_test_files/component_rendering/it_works_simple.sql",
         "application/json",
     )
     .await?;
@@ -117,7 +117,7 @@ async fn test_accept_json_returns_json_array() -> actix_web::Result<()> {
 #[actix_web::test]
 async fn test_accept_ndjson_returns_jsonlines() -> actix_web::Result<()> {
     let resp = req_with_accept(
-        "/tests/sql_test_files/it_works_simple.sql",
+        "/tests/sql_test_files/component_rendering/it_works_simple.sql",
         "application/x-ndjson",
     )
     .await?;
@@ -143,7 +143,11 @@ async fn test_accept_ndjson_returns_jsonlines() -> actix_web::Result<()> {
 
 #[actix_web::test]
 async fn test_accept_html_returns_html() -> actix_web::Result<()> {
-    let resp = req_with_accept("/tests/sql_test_files/it_works_simple.sql", "text/html").await?;
+    let resp = req_with_accept(
+        "/tests/sql_test_files/component_rendering/it_works_simple.sql",
+        "text/html",
+    )
+    .await?;
     assert_eq!(resp.status(), StatusCode::OK);
     assert_eq!(
         resp.headers().get(header::CONTENT_TYPE).unwrap(),
@@ -156,7 +160,11 @@ async fn test_accept_html_returns_html() -> actix_web::Result<()> {
 
 #[actix_web::test]
 async fn test_accept_wildcard_returns_html() -> actix_web::Result<()> {
-    let resp = req_with_accept("/tests/sql_test_files/it_works_simple.sql", "*/*").await?;
+    let resp = req_with_accept(
+        "/tests/sql_test_files/component_rendering/it_works_simple.sql",
+        "*/*",
+    )
+    .await?;
     assert_eq!(resp.status(), StatusCode::OK);
     assert_eq!(
         resp.headers().get(header::CONTENT_TYPE).unwrap(),

tests/server_timing/mod.rs

@@ -10,7 +10,7 @@ async fn test_server_timing_disabled_in_production() -> actix_web::Result<()> {
     let app_data = make_app_data_from_config(config).await;
 
     let req = crate::common::get_request_to_with_data(
-        "/tests/sql_test_files/it_works_simple.sql",
+        "/tests/sql_test_files/component_rendering/it_works_simple.sql",
         app_data,
     )
     .await?
@@ -32,7 +32,7 @@ async fn test_server_timing_enabled_in_development() -> actix_web::Result<()> {
     let app_data = make_app_data_from_config(config).await;
 
     let req = crate::common::get_request_to_with_data(
-        "/tests/sql_test_files/it_works_postgres_cast_syntax.sql",
+        "/tests/sql_test_files/data/it_works_postgres_cast_syntax.sql",
         app_data,
     )
     .await?
@@ -72,7 +72,7 @@ async fn test_server_timing_enabled_in_development() -> actix_web::Result<()> {
 
 #[actix_web::test]
 async fn test_server_timing_format() -> actix_web::Result<()> {
-    let req = get_request_to("/tests/sql_test_files/it_works_postgres_cast_syntax.sql")
+    let req = get_request_to("/tests/sql_test_files/data/it_works_postgres_cast_syntax.sql")
         .await?
         .to_srv_request();
     let resp = main_handler(req).await?;