Changeset 12 for trunk

Timestamp:

08/20/08 11:39:29 (4 years ago)

Author:

fumanchu

Message:

A var name tweak and some doc tweaks.

Location:

trunk/epic

Files:

• epic.sql (modified) (13 diffs)
• test/test_results.sql (modified) (1 diff)

trunk/epic/epic.sql

@@ -49 +49 @@
     1. ALWAYS RAISE EXCEPTION at the end of test procs to rollback! Even if
         the test passes, RAISE EXCEPTION '[OK]'. You may instead PERFORM the
-        Epic functions test.pass(), test.fail(errmsg), test.todo(msg) and
+        Epic functions test.pass(), test.fail(msg), test.todo(msg) and
         test.skip(msg).
     2. Put your test in the "test" schema.
@@ -104 +104 @@
     * test.assert_less_than(elem_1 anyelement, elem_2 anyelement)
     * test.assert_less_than_or_equal(elem_1 anyelement, elem_2 anyelement)
+    
     * test.assert_rows(row_1 text, row_2 text):
         Raises an exception if the SELECT statement row_1 != the SELECT statement row_2.
@@ -208 +209 @@
   WHERE pg_namespace.nspname = 'test'
     AND pg_proc.proname LIKE E'test\_%';
+
+
+------------------------------ Runners ------------------------------
 
 
@@ -278 +282 @@
 
 
-CREATE OR REPLACE FUNCTION test.finish(result text, errmsg text) RETURNS VOID AS $$
+------------------------------ Pass/fail ------------------------------
+
+
+CREATE OR REPLACE FUNCTION test.finish(result text, msg text) RETURNS VOID AS $$
 -- Use this to finish a test. Raises the given result as an exception (for rollback).
 DECLARE
-  msg        text;
-BEGIN
-  msg := '[' || result || ']';
-  IF errmsg IS NOT NULL THEN
-    msg := msg || ' ' || errmsg;
-  END IF;
-  RAISE EXCEPTION '%', msg;
-END;
-$$ LANGUAGE plpgsql;
+  fullmsg        text;
+BEGIN
+  fullmsg := '[' || result || ']';
+  IF msg IS NOT NULL THEN
+    fullmsg := fullmsg || ' ' || msg;
+  END IF;
+  RAISE EXCEPTION '%', fullmsg;
+END;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
@@ -297 +304 @@
   PERFORM test.finish('OK', msg);
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;
 CREATE OR REPLACE FUNCTION test.pass() RETURNS VOID AS $$
 -- Use this to finish a successful test. Raises exception '[OK]'.
@@ -303 +310 @@
   PERFORM test.finish('OK', NULL);
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
@@ -311 +318 @@
   PERFORM test.finish('FAIL', msg);
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;
 CREATE OR REPLACE FUNCTION test.fail() RETURNS VOID AS $$
 -- Use this to finish a failed test. Raises exception '[FAIL]'.
@@ -317 +324 @@
   PERFORM test.finish('FAIL', NULL);
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
@@ -325 +332 @@
   PERFORM test.finish('TODO', msg);
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;
 CREATE OR REPLACE FUNCTION test.todo() RETURNS VOID AS $$
 -- Use this to abort a test as 'todo'. Raises exception '[TODO]'.
@@ -331 +338 @@
   PERFORM test.finish('TODO', NULL);
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
@@ -339 +346 @@
   PERFORM test.finish('SKIP', msg);
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;
 CREATE OR REPLACE FUNCTION test.skip() RETURNS VOID AS $$
 -- Use this to skip a test. Raises exception '[SKIP]'.
@@ -345 +352 @@
   PERFORM test.finish('SKIP', NULL);
 END;
-$$ LANGUAGE plpgsql;
-
-
------------------------------- Test helpers ------------------------------
+$$ LANGUAGE plpgsql IMMUTABLE;
+
+
+------------------------------ Assertions ------------------------------
 
 
@@ -520 +527 @@
 --
 -- Both arguments should be SELECT statements yielding a single row or a set of rows.
+-- It is common for the 'expected' arg to be sans a FROM clause, and simply SELECT values.
 -- Neither source nor expected need to be sorted. Either may include a trailing semicolon.
 --
 -- Example:
 -- 
---    PERFORM test.assert_row('SELECT first, last, city FROM table1',
---                            'SELECT ROW(''Davy'', ''Crockett'', NULL)');
+--    PERFORM test.assert_rows('SELECT first, last, city FROM table1',
+--                             'SELECT ''Davy'', ''Crockett'', NULL';
 DECLARE
   rec     record;

trunk/epic/test/test_results.sql

@@ -20 +20 @@
   PERFORM test.fail('test.pass() did not raise the ''[OK]'' exception.');
 END;
-$$ LANGUAGE plpgsql;
+$$ LANGUAGE plpgsql IMMUTABLE;