Changeset 9 for trunk/epic

Timestamp:

08/17/08 01:47:59 (4 years ago)

Author:

fumanchu

Message:

Removed the suite_results type in favor of directly using test.results.

Location:

trunk/epic

Files:

• epic.sql (modified) (5 diffs)
• test/test_asserts.sql (modified) (1 diff)

trunk/epic/epic.sql

@@ -190 +190 @@
   BEGIN
     CREATE TABLE test.results (name text PRIMARY KEY, module text,
-                               ok boolean, errcode text, errmsg text);
-  EXCEPTION WHEN duplicate_table THEN
-    NULL;
-  END;
-  
-  BEGIN
-    CREATE TYPE test.suite_results AS (name text, module text, result text,
-                                       errcode text, errmsg text);
+                               result text, errcode text, errmsg text);
   EXCEPTION WHEN duplicate_table THEN
     NULL;
@@ -219 +212 @@
 
 
-CREATE OR REPLACE FUNCTION test.run_test(testname text) RETURNS test.suite_results AS $$
+CREATE OR REPLACE FUNCTION test.run_test(testname text) RETURNS test.results AS $$
 -- Runs the named test, stores in test.results, and returns success.
 DECLARE
   modulename      text;
-  output_record   test.suite_results%ROWTYPE;
+  output_record   test.results%ROWTYPE;
 BEGIN
   SELECT module INTO modulename FROM test.testnames WHERE name = testname;
@@ -231 +224 @@
     EXECUTE 'SELECT * FROM test.' || testname || '();';
   EXCEPTION WHEN OTHERS THEN
-    IF SQLERRM = '[OK]' THEN
-      INSERT INTO test.results (name, module, ok)
-        VALUES (testname, modulename, TRUE)
-        RETURNING name, module, CASE WHEN ok=true THEN '[OK]' ELSE '[FAIL]' END, errcode, errmsg
-        INTO output_record;
+    IF SQLERRM LIKE '[%]' THEN
+      INSERT INTO test.results (name, module, result)
+        VALUES (testname, modulename, SQLERRM)
+        RETURNING * INTO output_record;
       RETURN output_record;
     ELSE
-      INSERT INTO test.results (name, module, ok, errcode, errmsg)
-        VALUES (testname, modulename, FALSE, SQLSTATE, SQLERRM)
-        RETURNING name, module, CASE WHEN ok=true THEN '[OK]' ELSE '[FAIL]' END, errcode, errmsg
-        INTO output_record;
+      INSERT INTO test.results (name, module, result, errcode, errmsg)
+        VALUES (testname, modulename, '[FAIL]', SQLSTATE, SQLERRM)
+        RETURNING * INTO output_record;
       RETURN output_record;
     END IF;
@@ -251 +242 @@
 
 
-CREATE OR REPLACE FUNCTION test.run_module(modulename text) RETURNS SETOF test.suite_results AS $$
+CREATE OR REPLACE FUNCTION test.run_module(modulename text) RETURNS SETOF test.results AS $$
 -- Runs all tests in the given module, stores in test.results, and returns results.
 DECLARE
   testname        pg_proc.proname%TYPE;
-  output_record   test.suite_results%ROWTYPE;
+  output_record   test.results%ROWTYPE;
 BEGIN
   FOR testname IN SELECT name FROM test.testnames WHERE module = modulename
@@ -266 +257 @@
 
 
-CREATE OR REPLACE FUNCTION test.run_all() RETURNS SETOF test.suite_results AS $$
+CREATE OR REPLACE FUNCTION test.run_all() RETURNS SETOF test.results AS $$
 -- Runs all known test functions, stores in test.results, and returns results.
 DECLARE
   testname pg_proc.proname%TYPE;
   modulename text;
-  output_record test.suite_results%ROWTYPE;
+  output_record test.results%ROWTYPE;
 BEGIN
   FOR modulename in SELECT DISTINCT module FROM test.testnames ORDER BY module ASC

trunk/epic/test/test_asserts.sql

@@ -24 +24 @@
   IF objname IS NULL THEN
     RAISE EXCEPTION 'assert_test_schema did not create a test.results table.';
-  END IF;
-  
-  -- assert_test_schema MUST create a 'test.suite_results' type
-  SELECT typname INTO objname FROM pg_type
-    WHERE typnamespace = nsoid AND typname = 'suite_results';
-  IF objname IS NULL THEN
-    RAISE EXCEPTION 'assert_test_schema did not create a test.suite_results type.';
   END IF;