diff --git a/test/env.bats b/test/env.bats index 7c7e9fd0bc5f63e20b6be49dfc72270d8c05623e..e385249ae685629df03d4a40d5241f50c47cb2d6 100644 --- a/test/env.bats +++ b/test/env.bats @@ -2,16 +2,15 @@ load test_helper - @test "Simple Query Optimizer" { ${SOAR_BIN_ENV} -query "select * from film where length > 120" | grep -v "散粒度" > ${BATS_TMP_DIRNAME}/${BATS_TEST_NAME}.golden run golden_diff ${BATS_TEST_NAME} [ $status -eq 0 ] } - @test "Run all test cases" { ${SOAR_BIN} -list-test-sqls | ${SOAR_BIN_ENV} | grep -v "散粒度" > ${BATS_TMP_DIRNAME}/${BATS_TEST_NAME}.golden run golden_diff ${BATS_TEST_NAME} [ $status -eq 0 ] } + diff --git a/test/fixture/test_Run_default_printconfig_cases.golden b/test/fixture/test_Run_default_printconfig_cases.golden index 526c475924cc5f4923552b3a331f8ea19647580b..4624675e3fb3f9aad9d6a9132d95756d5d1d9cae 100644 --- a/test/fixture/test_Run_default_printconfig_cases.golden +++ b/test/fixture/test_Run_default_printconfig_cases.golden @@ -50,7 +50,7 @@ trace: false explain: true delimiter: ; log-level: 3 -log-output: /tmp/soar.log +log-output: /dev/null report-type: markdown report-css: "" report-javascript: "" diff --git a/test/main.bats b/test/main.bats index e7e853540bd14aea4295e6ceff4a9483ac5e9802..6c5bbf55329fc68308b11fa79f1417c78549fb0c 100644 --- a/test/main.bats +++ b/test/main.bats @@ -8,7 +8,7 @@ load test_helper [ "${lines[0]%% *}" == "Version:" ] [ "${lines[1]%% *}" == "Branch:" ] [ "${lines[2]%% *}" == "Compile:" ] - echo $output|grep "Compile: $(date +'%Y-%m-%d')" # 检查版本是否为当天编译的 + [ $(expr "${lines[2]}" : "Compile: $(date +'%Y-%m-%d').*") -ne 0 ] } @test "No arguments prints message" { @@ -18,14 +18,13 @@ load test_helper } @test "Run default printconfig cases" { - ${SOAR_BIN} -print-config -log-output=/tmp/soar.log > ${BATS_TMP_DIRNAME}/${BATS_TEST_NAME}.golden + ${SOAR_BIN} -print-config -log-output=/dev/null > ${BATS_TMP_DIRNAME}/${BATS_TEST_NAME}.golden run golden_diff ${BATS_TEST_NAME} [ $status -eq 0 ] } - @test "Check config cases" { - run ${SOAR_BIN_ENV} -check-config + run ${SOAR_BIN_ENV} -check-config [ $status -eq 0 ] [ -z ${output} ] } @@ -33,17 +32,11 @@ load test_helper @test "Syntax Check OK" { run ${SOAR_BIN} -query "select * from film" -only-syntax-check [ $status -eq 0 ] - [ -z $ouput ] + [ -z $ouput ] } @test "Syntax Check Error" { run ${SOAR_BIN} -query "select * frm film" -only-syntax-check [ $status -eq 1 ] - [ -n $ouput ] + [ -n $ouput ] } - - - - - - diff --git a/test/other.bats b/test/other.bats index deb2c7d909ad34b8c6d0feb1a49e0707c408072e..fdc7da46e1a364c106e5d2cded7c7a63e468e6e4 100644 --- a/test/other.bats +++ b/test/other.bats @@ -1,4 +1,3 @@ #!/usr/bin/env bats load test_helper - diff --git a/test/query.bats b/test/query.bats index 19322ac68362ba7d2a3527b49348382437727138..debb93536db69a4d5178ac4f082ad85d2caa80b7 100644 --- a/test/query.bats +++ b/test/query.bats @@ -2,7 +2,8 @@ load test_helper -@test "Simple Query Optimizer" { +@test "Check Query Optimizer" { run ${SOAR_BIN} -query "select * from film where length > 120" [ $status -eq 0 ] } +