Fix and fine-tune suppress_nulls.

[squelch.git] / src / test / java / net / jaekl / squelch / stmt / PSetTest.java

diff --git a/src/test/java/net/jaekl/squelch/stmt/PSetTest.java b/src/test/java/net/jaekl/squelch/stmt/PSetTest.java
index c33e00a42fd4412d88bd0b194e2a41f10fdbec7f..8c17d88efcd030b54a2af98eab66c1bed33c3be6 100644 (file)
--- a/src/test/java/net/jaekl/squelch/stmt/PSetTest.java
+++ b/src/test/java/net/jaekl/squelch/stmt/PSetTest.java
@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.SQLException;
 
+import net.jaekl.squelch.db.DbDriver;
 import net.jaekl.squelch.db.DbDriverMock;
 import net.jaekl.squelch.sql.ConnectionMock;
 
@@ -60,23 +61,23 @@ public class PSetTest {
 
                for (String value : on) {
                        pset.exec(driver, conn, pw, "\\pset suppress_nulls=" + value);
-                       assertTrue(driver.isSuppressNulls());
+                       assertTrue(driver.isSet(DbDriver.SUPPRESS_NULLS));
                        
                        pset.exec(driver, conn, pw, "\\pset Suppress_NULLS=" + value);
-                       assertTrue(driver.isSuppressNulls());
+                       assertTrue(driver.isSet(DbDriver.SUPPRESS_NULLS));
                }
                
                for (String value : off) {
                        pset.exec(driver, conn, pw, "\\pset suppress_nulls=" + value);
-                       assertFalse(driver.isSuppressNulls());
+                       assertFalse(driver.isSet(DbDriver.SUPPRESS_NULLS));
                        
                        pset.exec(driver, conn, pw, "\\pset Suppress_NULLS=" + value);
-                       assertFalse(driver.isSuppressNulls());
+                       assertFalse(driver.isSet(DbDriver.SUPPRESS_NULLS));
                }
                
                for (String value : on) {
                        pset.exec(driver, conn, pw, "\\PSET SuPPreSS_NuLLs=" + value);
-                       assertTrue(driver.isSuppressNulls());
+                       assertTrue(driver.isSet(DbDriver.SUPPRESS_NULLS));
                }
                
                pw.close();
@@ -93,16 +94,35 @@ public class PSetTest {
                for (String cmd : cmds) {
                        DbDriverMock driver = new DbDriverMock();
 
-                       driver.setSuppressNulls(true);
+                       driver.set(DbDriver.SUPPRESS_NULLS, true);
                        String output = doExec(driver, cmd);            
-                       assertEquals("suppress_nulls:  on\n", output);
+                       assertEquals("suppress_nulls:  true\n", output);
                        
-                       driver.setSuppressNulls(false);
+                       driver.set(DbDriver.SUPPRESS_NULLS, false);
                        output = doExec(driver, cmd);
-                       assertEquals("suppress_nulls:  off\n", output);
+                       assertEquals("suppress_nulls:  false\n", output);
                }
        }
        
+       @Test
+       public void testExec_displayAll() throws IOException, SQLException
+       {
+               String[] cmds = { "\\pset", "\\pset  ", "\\pset ",
+                         "\\PsET", "\\PsET ", "\\PSET", "\\PSET  " };
+
+               for (String cmd : cmds) {
+                       DbDriverMock driver = new DbDriverMock();
+               
+                       driver.set(DbDriver.SUPPRESS_NULLS, true);
+                       String output = doExec(driver, cmd);            
+                       assertTrue(output.contains("suppress_nulls:  true\n"));
+                       
+                       driver.set(DbDriver.SUPPRESS_NULLS, false);
+                       output = doExec(driver, cmd);
+                       assertTrue(output.contains("suppress_nulls:  false\n"));
+               }               
+       }
+       
        private String doExec(DbDriverMock driver, String cmd) throws IOException, SQLException 
        {
                ByteArrayOutputStream baos = new ByteArrayOutputStream();