simplify SQL test files

- Simplified SQL test files by removing unnecessary components and restructuring queries to focus on expected vs actual results.
- Updated the request handling in `run_sql_test` to differentiate between JSON and HTML responses based on test file content.
- Enhanced error handling and assertions for both JSON and HTML responses to improve test reliability and clarity.
- Removed redundant code and improved readability in the test execution flow.

Author: lovasoa

tests/common/mod.rs

@@ -53,25 +53,34 @@ pub async fn req_path(
     main_handler(req).await
 }
 
-pub async fn srv_req_path_with_app_data(
+const REQ_TIMEOUT: Duration = Duration::from_secs(8);
+pub async fn req_path_with_app_data(
     path: impl AsRef<str>,
     app_data: Data<AppState>,
-) -> actix_web::dev::ServiceRequest {
-    test::TestRequest::get()
-        .uri(path.as_ref())
-        .app_data(app_data)
-        .insert_header(("cookie", "test_cook=123"))
-        .insert_header(("authorization", "Basic dGVzdDp0ZXN0")) // test:test
-        .to_srv_request()
+) -> anyhow::Result<actix_web::dev::ServiceResponse> {
+    req_path_with_app_data_and_accept(path, app_data, header::Accept::html()).await
 }
 
-const REQ_TIMEOUT: Duration = Duration::from_secs(8);
-pub async fn req_path_with_app_data(
+pub async fn req_path_with_app_data_json(
     path: impl AsRef<str>,
     app_data: Data<AppState>,
+) -> anyhow::Result<actix_web::dev::ServiceResponse> {
+    req_path_with_app_data_and_accept(path, app_data, header::Accept::json()).await
+}
+
+async fn req_path_with_app_data_and_accept(
+    path: impl AsRef<str>,
+    app_data: Data<AppState>,
+    accept: header::Accept,
 ) -> anyhow::Result<actix_web::dev::ServiceResponse> {
     let path = path.as_ref();
-    let req = srv_req_path_with_app_data(path, app_data).await;
+    let req = test::TestRequest::get()
+        .uri(path)
+        .app_data(app_data)
+        .insert_header(("cookie", "test_cook=123"))
+        .insert_header(("authorization", "Basic dGVzdDp0ZXN0"))
+        .insert_header(accept)
+        .to_srv_request();
     let resp = tokio::time::timeout(REQ_TIMEOUT, main_handler(req))
         .await
         .map_err(|e| anyhow::anyhow!("Request to {path} timed out: {e}"))?

tests/server_timing/mod.rs

@@ -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_sqrt.sql",
+        "/tests/sql_test_files/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_sqrt.sql")
+    let req = get_request_to("/tests/sql_test_files/it_works_postgres_cast_syntax.sql")
         .await?
         .to_srv_request();
     let resp = main_handler(req).await?;

tests/sql_test_files/it_works_basic_auth_password.sql

@@ -1,5 +1 @@
-select 'text' as component,
-    case sqlpage.basic_auth_password()
-        when 'test' then 'It works !'
-        else 'error: ' || coalesce(sqlpage.basic_auth_password(), 'NULL')
-    end as contents;
+select 'test' as expected, sqlpage.basic_auth_password() as actual;

tests/sql_test_files/it_works_basic_auth_username.sql

@@ -1,5 +1 @@
-select 'text' as component,
-    case sqlpage.basic_auth_username()
-        when 'test' then 'It works !'
-        else 'error: ' || coalesce(sqlpage.basic_auth_username(), 'NULL')
-    end as contents;
+select 'test' as expected, sqlpage.basic_auth_username() as actual;

tests/sql_test_files/it_works_coalesce_eval.sql

@@ -1,5 +1 @@
-select 'text' as component, 
-    case sqlpage.link(coalesce($i_do_not_exist, 'https://example.com'))
-        when 'https://example.com' then 'It works !'
-        else 'error: ' || coalesce(sqlpage.link(coalesce($i_do_not_exist, 'https://example.com')), 'NULL')
-    end AS contents;
+select 'https://example.com' as expected, sqlpage.link(coalesce($i_do_not_exist, 'https://example.com')) as actual;

tests/sql_test_files/it_works_concat_str_in_pseudofunction.sql

@@ -1,17 +1,3 @@
-select 'text' as component,
-    'With "||": ' ||
-    CASE sqlpage.url_encode('/' || $x)
-        WHEN '%2F1' THEN 'It works !'
-        ELSE 'Error: "/1" should be urlencoded to "%2F1"'
-    END
-    || ' | With CONCAT: ' ||
-    CASE sqlpage.url_encode(CONCAT('/', $x)) -- $x is set to '1' in the test
-        WHEN '%2F1' THEN 'With CONCAT: It works !'
-        ELSE 'Error: "/1" should be urlencoded to "%2F1"'
-    END
-    || ' | With a null value: ' ||
-    CASE COALESCE(sqlpage.url_encode(CONCAT('/', $thisisnull)), 'expected')
-        WHEN 'expected' THEN 'With a null value: It works !'
-        ELSE 'Error: a null value concatenated with "/" should be null, and urlencoded to NULL'
-    END
-    AS contents;
+select '%2F1' as expected, sqlpage.url_encode('/' || $x) as actual;
+select '%2F1' as expected, sqlpage.url_encode(CONCAT('/', $x)) as actual;
+select 'NULL' as expected, coalesce(sqlpage.url_encode(CONCAT('/', $thisisnull)), 'NULL') as actual;

tests/sql_test_files/it_works_cookie.sql

@@ -1,5 +1 @@
-select 'text' as component, 
-    case sqlpage.cookie('test_cook')
-        when '123' then 'It works !'
-        else 'error: ' || coalesce(sqlpage.cookie('test_cook'), 'NULL')
-    end AS contents;
+select '123' as expected, sqlpage.cookie('test_cook') as actual;

tests/sql_test_files/it_works_decimal.sql

@@ -1,7 +1,2 @@
-set my_decimal = CAST(0.47 AS DECIMAL(3,2));
-
-select 'text' as component, 
-    case $my_decimal
-        when '0.47' then 'It works !'
-        else 'error: ' || coalesce($my_decimal, 'NULL')
-    end AS contents;
+set result = CAST(0.47 AS DECIMAL(3,2));
+select '0.47' as expected, $result as actual;

tests/sql_test_files/it_works_fetch_with_meta_error.sql

@@ -1,7 +1,3 @@
 set res = sqlpage.fetch_with_meta('http://not-a-real-url');
 
-select 'text' as component,
-    case
-        when $res LIKE '%"error":"Request failed%' then 'It works !'
-        else CONCAT('Error! Got: ', $res)
-    end as contents; 
+select '"error":"Request failed' as expected_contains, $res as actual;

tests/sql_test_files/it_works_fetch_with_meta_simple.sql

@@ -8,8 +8,7 @@ set fetch_req = '{
 }';
 set res = sqlpage.fetch_with_meta($fetch_req);
 
-select 'text' as component,
-    case
-        when $res LIKE '%"status":200%' AND $res LIKE '%"headers":{%' AND $res LIKE '%"body":"%' then 'It works !'
-        else 'Error! Got: ' || $res
-    end as contents; 
+select '"status":200' as expected_contains,
+       '"headers":{' as expected_contains,
+       '"body":"' as expected_contains,
+       $res as actual;