Changeset 20 for trunk/epic

Timestamp:

08/28/08 16:50:51 (3 years ago)

Author:

fumanchu

Message:

Made assert_empty more generic; now takes call(s) not just tablename(s). Also ordered the output of run_module and run_all, and added a test for assert_not_empty.

Location:

trunk/epic

Files:

• epic.sql (modified) (9 diffs)
• test/test_asserts.sql (modified) (3 diffs)

trunk/epic/epic.sql

@@ -346 +346 @@
   output_record   test.results%ROWTYPE;
 BEGIN
-  FOR testname IN SELECT name FROM test.testnames WHERE module = modulename
+  FOR testname IN SELECT name FROM test.testnames WHERE module = modulename ORDER BY name ASC
   LOOP
     SELECT INTO output_record * FROM test.run_test(testname);
@@ -364 +364 @@
   FOR modulename in SELECT DISTINCT module FROM test.testnames ORDER BY module ASC
   LOOP
-    FOR testname IN SELECT name FROM test.testnames WHERE module = modulename
+    FOR testname IN SELECT name FROM test.testnames WHERE module = modulename ORDER BY name ASC
     LOOP
       SELECT INTO output_record * FROM test.run_test(testname);
@@ -763 +763 @@
 
 
-CREATE OR REPLACE FUNCTION test.assert_empty(tablenames text[]) RETURNS VOID AS $$
--- Raises an exception if the given tables have any rows.
+CREATE OR REPLACE FUNCTION test.assert_empty(calls text[]) RETURNS VOID AS $$
+-- Raises an exception if the given calls have any rows.
 DECLARE
   result      bool;
@@ -770 +770 @@
   failed_len  int;
 BEGIN
-  IF array_lower(tablenames, 1) IS NOT NULL THEN
-    FOR i in array_lower(tablenames, 1)..array_upper(tablenames, 1)
+  IF array_lower(calls, 1) IS NOT NULL THEN
+    FOR i in array_lower(calls, 1)..array_upper(calls, 1)
     LOOP
-      EXECUTE 'SELECT (EXISTS (SELECT 1 FROM ' || tablenames[i] || '));' INTO result;
+      EXECUTE 'SELECT EXISTS (' || test.statement(calls[i]) || ');' INTO result;
       IF result THEN
-        failed := failed || ('"' || btrim(tablenames[i]) || '"');
+        failed := failed || ('"' || btrim(calls[i]) || '"');
       END IF;
     END LOOP;
@@ -783 +783 @@
     failed_len := (array_upper(failed, 1) - array_lower(failed, 1)) + 1;
     IF failed_len = 1 THEN
-      PERFORM test.fail('The table ' || array_to_string(failed, ', ') || ' is not empty.');
+      PERFORM test.fail('The call ' || array_to_string(failed, ', ') || ' is not empty.');
     ELSEIF failed_len > 1 THEN
-      PERFORM test.fail('The tables ' || array_to_string(failed, ', ') || ' are not empty.');
+      PERFORM test.fail('The calls ' || array_to_string(failed, ', ') || ' are not empty.');
     END IF;
   END IF;
@@ -791 +791 @@
 $$ LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION test.assert_empty(tablename text) RETURNS VOID AS $$
--- Raises an exception if the given table has any rows.
+CREATE OR REPLACE FUNCTION test.assert_empty(call text) RETURNS VOID AS $$
+-- Raises an exception if the given call returns any rows.
 DECLARE
   result    bool;
 BEGIN
-  IF tablename LIKE '%,%' THEN
-    PERFORM test.assert_empty(string_to_array(tablename, ','));
-    RETURN;
-  END IF;
-  
-  EXECUTE 'SELECT (EXISTS (SELECT 1 FROM ' || tablename || '));' INTO result;
+  EXECUTE 'SELECT EXISTS (' || test.statement(call) || ');' INTO result;
   IF result THEN
-    PERFORM test.fail('The table "' || tablename || '" is not empty.');
-  END IF;
-END;
-$$ LANGUAGE plpgsql;
-
-
-CREATE OR REPLACE FUNCTION test.assert_not_empty(tablenames text[]) RETURNS VOID AS $$
--- Raises an exception if the given tables have no rows.
+    PERFORM test.fail('The call "' || call || '" is not empty.');
+  END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test.assert_not_empty(calls text[]) RETURNS VOID AS $$
+-- Raises an exception if the given calls have no rows.
 DECLARE
   result      bool;
@@ -816 +811 @@
   failed_len  int;
 BEGIN
-  IF array_lower(tablenames, 1) IS NOT NULL THEN
-    FOR i in array_lower(tablenames, 1)..array_upper(tablenames, 1)
+  IF array_lower(calls, 1) IS NOT NULL THEN
+    FOR i in array_lower(calls, 1)..array_upper(calls, 1)
     LOOP
-      EXECUTE 'SELECT (EXISTS (SELECT 1 FROM ' || tablenames[i] || '));' INTO result;
+      EXECUTE 'SELECT EXISTS (' || test.statement(calls[i]) || ');' INTO result;
       IF NOT result THEN
-        failed := failed || ('"' || btrim(tablenames[i]) || '"');
+        failed := failed || ('"' || btrim(calls[i]) || '"');
       END IF;
     END LOOP;
@@ -832 +827 @@
     failed_len := (array_upper(failed, 1) - array_lower(failed, 1)) + 1;
     IF failed_len = 1 THEN
-      PERFORM test.fail('The table ' || array_to_string(failed, ', ') || ' is empty.');
+      PERFORM test.fail('The call ' || array_to_string(failed, ', ') || ' is empty.');
     ELSEIF failed_len > 1 THEN
-      PERFORM test.fail('The tables ' || array_to_string(failed, ', ') || ' are empty.');
+      PERFORM test.fail('The calls ' || array_to_string(failed, ', ') || ' are empty.');
     END IF;
   END IF;
@@ -840 +835 @@
 $$ LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION test.assert_not_empty(tablename text) RETURNS VOID AS $$
+CREATE OR REPLACE FUNCTION test.assert_not_empty(call text) RETURNS VOID AS $$
 -- Raises an exception if the given table has no rows.
 DECLARE
   result    bool;
 BEGIN
-  IF tablename LIKE '%,%' THEN
-    PERFORM test.assert_not_empty(string_to_array(tablename, ','));
-    RETURN;
-  END IF;
-  
-  EXECUTE 'SELECT (EXISTS (SELECT 1 FROM ' || tablename || '));' INTO result;
+  EXECUTE 'SELECT EXISTS (' || test.statement(call) || ');' INTO result;
   IF NOT result THEN
-    PERFORM test.fail('The table "' || tablename || '" is empty.');
-  END IF;
-END;
-$$ LANGUAGE plpgsql;
-
+    PERFORM test.fail('The call "' || call || '" is empty.');
+  END IF;
+END;
+$$ LANGUAGE plpgsql;
+

trunk/epic/test/test_asserts.sql

@@ -400 +400 @@
   -- array version
   CREATE TEMP TABLE testtemp2 (a int);
-  PERFORM test.assert_empty('testtemp, testtemp2');
+  PERFORM test.assert_empty('{testtemp, testtemp2}'::text[]);
   PERFORM test.assert_empty(ARRAY['testtemp', 'testtemp2']);
   
@@ -406 +406 @@
   failed := false;
   BEGIN
-    PERFORM test.assert_empty('pg_type,pg_proc');
+    PERFORM test.assert_empty('{pg_type,pg_proc}'::text[]);
   EXCEPTION WHEN OTHERS THEN
     failed := true;
-    IF SQLERRM = '[FAIL] The tables "pg_type", "pg_proc" are not empty.' THEN
+    IF SQLERRM = '[FAIL] The calls "pg_type", "pg_proc" are not empty.' THEN
       NULL;
     ELSE
@@ -422 +422 @@
 END;
 $$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION test.test_assert_not_empty() RETURNS VOID AS $$
+-- Assert the correct operation of test.assert_not_empty
+-- module: test_asserts
+DECLARE
+  failed     bool;
+BEGIN
+  -- Test an assertion that should pass
+  CREATE TEMP TABLE testtemp AS SELECT * FROM generate_series(1, 10);
+  PERFORM test.assert_not_empty('testtemp');
+  -- array version
+  CREATE TEMP TABLE testtemp2 AS SELECT * FROM generate_series(1, 5);
+  PERFORM test.assert_not_empty('{testtemp, testtemp2}'::text[]);
+  PERFORM test.assert_not_empty(ARRAY['testtemp', 'testtemp2']);
+  
+  -- ...and an assertion that should fail
+  CREATE TEMP TABLE testtemp3 (a int);
+  failed := false;
+  BEGIN
+    PERFORM test.assert_not_empty('testtemp3');
+  EXCEPTION WHEN OTHERS THEN
+    failed := true;
+    IF SQLERRM = '[FAIL] The call "testtemp3" is empty.' THEN
+      NULL;
+    ELSE
+      RAISE EXCEPTION 'test.assert_not_empty() did not raise the correct error. Raised: %', SQLERRM;
+    END IF;
+  END;
+  IF NOT failed THEN
+    PERFORM test.fail('test.assert_not_empty() did not fail.');
+  END IF;
+  
+  RAISE EXCEPTION '[OK]';
+END;
+$$ LANGUAGE plpgsql;