Commits

Kirill Simonov committed dc6f235

Regression tests: fixed paths.

  • Participants
  • Parent commits 66c2a75

Comments (0)

Files changed (8)

File test/regress.yaml

 title: HTSQL regression tests
 id: all
 tests:
-- include: test/input/routine.yaml
-- include: test/input/sqlite.yaml
-- include: test/input/pgsql.yaml
-- include: test/input/mysql.yaml
+- include: test/regress/input/routine.yaml
+- include: test/regress/input/sqlite.yaml
+- include: test/regress/input/pgsql.yaml
+- include: test/regress/input/mysql.yaml
 

File test/regress/input/mysql.yaml

 
 title: MySQL regression tests
 id: mysql
-output: test/output/mysql.yaml
+output: test/regress/output/mysql.yaml
 tests:
 
 - title: Remove any existing regression database
       password: ${MYSQL_PASSWORD}
       host: ${MYSQL_HOST}
       port: ${MYSQL_PORT}
-    sql-include: test/sql/regress-mysql.sql
+    sql-include: test/regress/sql/regress-mysql.sql
 
 - title: Run the test collection
   id: test-mysql
   - define: mysql
   - db: *connect
   # The Regression Schema
-  - include: test/input/schema.yaml
+  - include: test/regress/input/schema.yaml
   # Examples from the Tutorial
-  - include: test/input/tutorial.yaml
+  - include: test/regress/input/tutorial.yaml
   # Standard Data Types, Functions, and Operations
-  - include: test/input/library.yaml
+  - include: test/regress/input/library.yaml
   # Edge Cases of HTSQL-to-SQL Translation
-  - include: test/input/translation.yaml
+  - include: test/regress/input/translation.yaml
   # Formatting Output Data
-  - include: test/input/format.yaml
+  - include: test/regress/input/format.yaml
 

File test/regress/input/pgsql.yaml

 
 title: PostgreSQL regression tests
 id: pgsql
-output: test/output/pgsql.yaml
+output: test/regress/output/pgsql.yaml
 tests:
 
 - title: Remove any existing regression database
       password: ${PGSQL_PASSWORD}
       host: ${PGSQL_HOST}
       port: ${PGSQL_PORT}
-    sql-include: test/sql/regress-pgsql.sql
+    sql-include: test/regress/sql/regress-pgsql.sql
 
 - title: Run the test collection
   id: test-pgsql
   - define: pgsql
   - db: *connect
   # The Regression Schema
-  - include: test/input/schema.yaml
+  - include: test/regress/input/schema.yaml
   # Examples from the Tutorial
-  - include: test/input/tutorial.yaml
+  - include: test/regress/input/tutorial.yaml
   # Standard Data Types, Functions, and Operations
-  - include: test/input/library.yaml
+  - include: test/regress/input/library.yaml
   # Edge Cases of HTSQL-to-SQL Translation
-  - include: test/input/translation.yaml
+  - include: test/regress/input/translation.yaml
   # Formatting Output Data
-  - include: test/input/format.yaml
+  - include: test/regress/input/format.yaml
 

File test/regress/input/routine.yaml

 
 title: HTSQL-CTL Command-Line Tool
 id: routine
-output: test/output/routine.yaml
+output: test/regress/output/routine.yaml
 tests:
 - ctl: []
 - ctl: [help]

File test/regress/input/sqlite.yaml

 
 title: SQLite regression tests
 id: sqlite
-output: test/output/sqlite.yaml
+output: test/regress/output/sqlite.yaml
 tests:
 
 - title: Remove any existing regression database
   - connect: &connect
       engine: sqlite
       database: ${SQLITE_DIRECTORY}/${SQLITE_DATABASE}
-    sql-include: test/sql/regress-sqlite.sql
+    sql-include: test/regress/sql/regress-sqlite.sql
 
 - title: Run the test collection
   id: test-sqlite
   - define: sqlite
   - db: *connect
   # The Regression Schema
-  - include: test/input/schema.yaml
+  - include: test/regress/input/schema.yaml
   # Examples from the Tutorial
-  - include: test/input/tutorial.yaml
+  - include: test/regress/input/tutorial.yaml
   # Standard Data Types, Functions, and Operations
-  - include: test/input/library.yaml
+  - include: test/regress/input/library.yaml
   # Edge Cases of HTSQL-to-SQL Translation
-  - include: test/input/translation.yaml
+  - include: test/regress/input/translation.yaml
   # Formatting Output Data
-  - include: test/input/format.yaml
+  - include: test/regress/input/format.yaml
 

File test/regress/output/mysql.yaml

 tests:
 - id: test-mysql
   tests:
-  - include: test/input/schema.yaml
+  - include: test/regress/input/schema.yaml
     output:
       id: schema
       tests:
                    AND (`program_requirement`.`program` = 'uacct')
                    AND (`program_requirement`.`classification` = 'accounting')
              ORDER BY `program_requirement`.`school` ASC, `program_requirement`.`program` ASC, `program_requirement`.`classification` ASC
-  - include: test/input/tutorial.yaml
+  - include: test/regress/input/tutorial.yaml
     output:
       id: tutorial
       tests:
              ORDER BY 1 ASC, 2 ASC
              LIMIT 5
              OFFSET 20
-  - include: test/input/library.yaml
+  - include: test/regress/input/library.yaml
     output:
       id: library
       tests:
              FROM `htsql_regress`.`course` AS `course`
              WHERE (`course`.`department` = 'stdart')
              ORDER BY 1 DESC, 2 ASC, `course`.`department` ASC
-  - include: test/input/translation.yaml
+  - include: test/regress/input/translation.yaml
     output:
       id: translation
       tests:
                                      GROUP BY 2, 3) AS `student_3`
                                     ON ((`student_1`.`year` = `student_3`.`year`) AND (`student_1`.`gender` = `student_3`.`gender`))
                ORDER BY 1 ASC, 2 ASC
-  - include: test/input/format.yaml
+  - include: test/regress/input/format.yaml
     output:
       id: format
       tests:

File test/regress/output/pgsql.yaml

 tests:
 - id: test-pgsql
   tests:
-  - include: test/input/schema.yaml
+  - include: test/regress/input/schema.yaml
     output:
       id: schema
       tests:
                    AND ("program_requirement"."program" = 'uacct')
                    AND ("program_requirement"."classification" = 'accounting')
              ORDER BY "program_requirement"."school" ASC, "program_requirement"."program" ASC, "program_requirement"."classification" ASC
-  - include: test/input/tutorial.yaml
+  - include: test/regress/input/tutorial.yaml
     output:
       id: tutorial
       tests:
              ORDER BY 1 ASC, 2 ASC
              LIMIT 5
              OFFSET 20
-  - include: test/input/library.yaml
+  - include: test/regress/input/library.yaml
     output:
       id: library
       tests:
              FROM "ad"."course" AS "course"
              WHERE ("course"."department" = 'stdart')
              ORDER BY 1 DESC NULLS LAST, 2 ASC, "course"."department" ASC
-  - include: test/input/translation.yaml
+  - include: test/regress/input/translation.yaml
     output:
       id: translation
       tests:
                                      GROUP BY 2, 3) AS "student_3"
                                     ON (("student_1"."year" = "student_3"."year") AND ("student_1"."gender" = "student_3"."gender"))
                ORDER BY 1 ASC, 2 ASC
-  - include: test/input/format.yaml
+  - include: test/regress/input/format.yaml
     output:
       id: format
       tests:

File test/regress/output/sqlite.yaml

 tests:
 - id: test-sqlite
   tests:
-  - include: test/input/schema.yaml
+  - include: test/regress/input/schema.yaml
     output:
       id: schema
       tests:
                    AND ("program_requirement"."program" = 'uacct')
                    AND ("program_requirement"."classification" = 'accounting')
              ORDER BY "program_requirement"."school" ASC, "program_requirement"."program" ASC, "program_requirement"."classification" ASC
-  - include: test/input/tutorial.yaml
+  - include: test/regress/input/tutorial.yaml
     output:
       id: tutorial
       tests:
              ORDER BY 1 ASC, 2 ASC
              LIMIT 5
              OFFSET 20
-  - include: test/input/library.yaml
+  - include: test/regress/input/library.yaml
     output:
       id: library
       tests:
              FROM "course" AS "course"
              WHERE ("course"."department" = 'stdart')
              ORDER BY 1 DESC, 2 ASC, "course"."department" ASC
-  - include: test/input/translation.yaml
+  - include: test/regress/input/translation.yaml
     output:
       id: translation
       tests:
                                      GROUP BY 2, 3) AS "student_3"
                                     ON (("student_1"."year" = "student_3"."year") AND ("student_1"."gender" = "student_3"."gender"))
                ORDER BY 1 ASC, 2 ASC
-  - include: test/input/format.yaml
+  - include: test/regress/input/format.yaml
     output:
       id: format
       tests: