[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/tests DBObjectTest.java

JCorporate Ltd jcorp at jcorp2.servlets.net
Mon Jun 7 23:15:49 PDT 2004


Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/tests
In directory jcorp2.servlets.net:/tmp/cvs-serv31061/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/tests

Modified Files:
	DBObjectTest.java 
Log Message:
add testLargeText() to test clob support (mysql driver bug?)


Index: DBObjectTest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/tests/DBObjectTest.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** DBObjectTest.java	8 Jun 2004 05:49:30 -0000	1.33
--- DBObjectTest.java	8 Jun 2004 06:15:46 -0000	1.34
***************
*** 96,100 ****
       * Constructs a test case with the given name.
       *
!      *@param name The name of the test case
       */
      public DBObjectTest(String name) {
--- 96,100 ----
       * Constructs a test case with the given name.
       *
!      * @param name The name of the test case
       */
      public DBObjectTest(String name) {
***************
*** 114,119 ****
       * Sets up the fixture, for example, open a network connection.
       * This method is called before a test is executed.
-      *
-      * @throws Exception
       */
      public void setUp()
--- 114,117 ----
***************
*** 124,128 ****
              ConfigManager.getContext(TestSystemInitializer.getTestContext());
          } catch (ConfigurationException ce) {
!             fail("Specified context to test:" + TestSystemInitializer.getTestContext() + " but couldn't find that context");
          }
  
--- 122,127 ----
              ConfigManager.getContext(TestSystemInitializer.getTestContext());
          } catch (ConfigurationException ce) {
!             fail(
!                     "Specified context to test:" + TestSystemInitializer.getTestContext() + " but couldn't find that context");
          }
  
***************
*** 139,144 ****
       * Tears down the fixture, for example, close a network connection.
       * This method is called after a test is executed.
-      *
-      * @throws Exception
       */
      public void tearDown()
--- 138,141 ----
***************
*** 274,278 ****
              oneTest.setDataContext(TestSystemInitializer.getTestContext());
              oneTest.setField("TestKey", "1");
!             log.warn("About to throw intentional exception having to do with duplicate key. Ignore this dup-key exception.");
              oneTest.add();
              fail("Test add should have thrown exception on duplicate key here");
--- 271,276 ----
              oneTest.setDataContext(TestSystemInitializer.getTestContext());
              oneTest.setField("TestKey", "1");
!             log.warn(
!                     "About to throw intentional exception having to do with duplicate key. \nIgnore this dup-key exception.");
              oneTest.add();
              fail("Test add should have thrown exception on duplicate key here");
***************
*** 690,734 ****
          String resourceId = null;
          try {
!           log.info("Test null values");
!           Test1 resource = new Test1();
!           resource.setDataContext(TestSystemInitializer.getTestContext());
!           resource.setField("TestKey", 1);
!           resource.setField("CharTest", "FZI");
!           resource.setField(
!            "DateTimeTest",
!             DateTime.getDateTimeForDB(resource.getDataContext()));
!           resource.add();
!           resourceId = resource.getField("TestKey");
!           resource = new Test1();
!           resource.setDataContext(TestSystemInitializer.getTestContext());
!           resource.setField("TestKey", resourceId);
!           resource.retrieve();
!           assertTrue(resource.isFieldNull("VarCharTest"));
!           assertTrue(resource.isFieldNull("IntTest"));
!           resource.retrieve();
!           assertTrue(resource.isFieldNull("VarCharTest"));
!           assertTrue(resource.isFieldNull("IntTest"));
!           resource.addOrUpdate();
!           resource = new Test1();
!           resource.setDataContext(TestSystemInitializer.getTestContext());
!           resource.setField("TestKey", resourceId);
!           resource.retrieve();
!           assertTrue(resource.isFieldNull("VarCharTest"));
!           assertTrue(resource.isFieldNull("IntTest"));
!           resource.setField("VarCharTest", "Hi!");
!           resource.addOrUpdate();
!           resource.retrieve();
!           assertFalse(resource.isFieldNull("VarCharTest"));
!           assertTrue(resource.isFieldNull("IntTest"));
!           resource.setField("VarCharTest", (String)null);
!           resource.addOrUpdate();
!           resource.retrieve();
!           assertTrue(resource.isFieldNull("VarCharTest"));
!           assertTrue(resource.isFieldNull("IntTest"));
          } catch (Exception e) {
!           log.error(e);
!           fail("Exception occured:" + e.getMessage());
          }
!       }
  
  
--- 688,731 ----
          String resourceId = null;
          try {
!             log.info("Test null values");
!             Test1 resource = new Test1();
!             resource.setDataContext(TestSystemInitializer.getTestContext());
!             resource.setField("TestKey", 1);
!             resource.setField("CharTest", "FZI");
!             resource.setField("DateTimeTest",
!                     DateTime.getDateTimeForDB(resource.getDataContext()));
!             resource.add();
!             resourceId = resource.getField("TestKey");
!             resource = new Test1();
!             resource.setDataContext(TestSystemInitializer.getTestContext());
!             resource.setField("TestKey", resourceId);
!             resource.retrieve();
!             assertTrue(resource.isFieldNull("VarCharTest"));
!             assertTrue(resource.isFieldNull("IntTest"));
!             resource.retrieve();
!             assertTrue(resource.isFieldNull("VarCharTest"));
!             assertTrue(resource.isFieldNull("IntTest"));
!             resource.addOrUpdate();
!             resource = new Test1();
!             resource.setDataContext(TestSystemInitializer.getTestContext());
!             resource.setField("TestKey", resourceId);
!             resource.retrieve();
!             assertTrue(resource.isFieldNull("VarCharTest"));
!             assertTrue(resource.isFieldNull("IntTest"));
!             resource.setField("VarCharTest", "Hi!");
!             resource.addOrUpdate();
!             resource.retrieve();
!             assertFalse(resource.isFieldNull("VarCharTest"));
!             assertTrue(resource.isFieldNull("IntTest"));
!             resource.setField("VarCharTest", (String) null);
!             resource.addOrUpdate();
!             resource.retrieve();
!             assertTrue(resource.isFieldNull("VarCharTest"));
!             assertTrue(resource.isFieldNull("IntTest"));
          } catch (Exception e) {
!             log.error(e);
!             fail("Exception occured:" + e.getMessage());
          }
!     }
  
  
***************
*** 861,881 ****
              //Added 2/18/04  - breaking >'date value'
              oneTest.clear();
!             oneTest.setField("DateTest", ">" + "'"
!                              + DateTime.getDateForDB(new java.util.Date(), TestSystemInitializer.getTestContext()) + "'");
              oneTest.find();
  
              oneTest.clear();
!             oneTest.setField("DateTest", "<" + "'"
!                              + DateTime.getDateForDB(new java.util.Date(), TestSystemInitializer.getTestContext()) + "'");
              oneTest.find();
  
              oneTest.clear();
!             oneTest.setField("DateTest", "> " + "'"
!                              + DateTime.getDateForDB(new java.util.Date(), TestSystemInitializer.getTestContext()) + "'");
              oneTest.find();
  
              oneTest.clear();
!             oneTest.setField("DateTest", "<= " + "'"
!                              + DateTime.getDateForDB(new java.util.Date(), TestSystemInitializer.getTestContext()) + "'");
              oneTest.find();
  
--- 858,882 ----
              //Added 2/18/04  - breaking >'date value'
              oneTest.clear();
!             oneTest.setField("DateTest",
!                     ">" + "'"
!                     + DateTime.getDateForDB(new java.util.Date(), TestSystemInitializer.getTestContext()) + "'");
              oneTest.find();
  
              oneTest.clear();
!             oneTest.setField("DateTest",
!                     "<" + "'"
!                     + DateTime.getDateForDB(new java.util.Date(), TestSystemInitializer.getTestContext()) + "'");
              oneTest.find();
  
              oneTest.clear();
!             oneTest.setField("DateTest",
!                     "> " + "'"
!                     + DateTime.getDateForDB(new java.util.Date(), TestSystemInitializer.getTestContext()) + "'");
              oneTest.find();
  
              oneTest.clear();
!             oneTest.setField("DateTest",
!                     "<= " + "'"
!                     + DateTime.getDateForDB(new java.util.Date(), TestSystemInitializer.getTestContext()) + "'");
              oneTest.find();
  
***************
*** 933,937 ****
  
  
- 
          } catch (DBException ex) {
              ex.printStackTrace();
--- 934,937 ----
***************
*** 1079,1082 ****
--- 1079,1119 ----
       */
      public void testLargeText() {
+         try {
+             Test1 setter = null;
+ 
+             for (int i = 1; i < 5; i++) {
+                 String teststr = StringUtil.repeatString("0123456789", 4000 * i);
+                 setter = new Test1();
+                 setter.setDataContext(TestSystemInitializer.getTestContext());
+                 setter.setField("TestKey", 1);
+                 log.warn("Set CLOB field to " + teststr.length() + " chars.");
+                 boolean found = setter.find();
+ 
+                 setter.setField("ClobTest", teststr);
+                 if (found)
+                     setter.update();
+                 else
+                     setter.add();
+ 
+                 Test1 getter = new Test1();
+                 getter.setDataContext(TestSystemInitializer.getTestContext());
+                 getter.setField("TestKey", 1);
+                 getter.retrieve();
+ 
+ //                    assertTrue("Clob is empty" ,  getter.getField("ClobTest").length() > 0);
+                 assertEquals(getter.getField("ClobTest").length(), teststr.length());
+ 
+             }
+ 
+             setter.clear();
+             setter.setField("TestKey", 1);
+             setter.delete();
+         } catch (DBException e) {
+             log.error("DBException!", e);
+             fail("Exception occured:" + e.getMessage());
+         }
+     }
+ 
+     public void testResourceTransaction() {
          String resourceId = null;
          DBConnectionPool myPool = null;
***************
*** 1087,1111 ****
                          DBConnectionPool.getInstance(TestSystemInitializer.getTestContext());
                  myConnection = myPool.getConnection();
! 
! 
!                 for (int i = 1; i < 4; i++) {
!                     String teststr = StringUtil.repeatString("0123456789", 4000 * i);
!                     Test1 setter = new Test1(myConnection);
!                     setter.setField("TestKey", 1);
!                     log.warn("Set CLOB field to " + teststr.length() + " chars.");
!                     setter.setField("ClobTest", teststr);
!                     if ( setter.find() ) setter.update();
!                     else setter.add();
! 
!                     Test1 getter = new Test1(myConnection);
!                     getter.setField("TestKey", 1);
!                     getter.retrieve();
! 
!                     assertTrue("Clob is empty" ,  getter.getField("ClobTest").length() > 0);
!                     assertEquals(getter.getField("ClobTest"), setter.getField("ClobTest"));
! 
!                     getter.delete();
!                 }
! 
              } catch (DBException e) {
                  log.error("DBException!", e);
--- 1124,1140 ----
                          DBConnectionPool.getInstance(TestSystemInitializer.getTestContext());
                  myConnection = myPool.getConnection();
!                 myConnection.setAutoCommit(false);
!                 log.info("Add a resource");
!                 Test1 resource = new Test1(myConnection);
!                 resource.setField("TestKey", 1);
!                 resource.add();
!                 myConnection.commit();
!                 log.info("Try to delete and after that add the resource");
!                 resource = new Test1(myConnection);
!                 resource.deleteAll();
!                 resource.clear();
!                 resource.setField("TestKey", 2);
!                 resource.add();
!                 myConnection.commit();
              } catch (DBException e) {
                  log.error("DBException!", e);
***************
*** 1134,1186 ****
          }
      }
- 
-     public void testResourceTransaction() {
-         String resourceId = null;
-         DBConnectionPool myPool = null;
-         DBConnection myConnection = null;
-         try {
-           try {
-             myPool =
-                     DBConnectionPool.getInstance(TestSystemInitializer.getTestContext());
-             myConnection = myPool.getConnection();
-             myConnection.setAutoCommit(false);
-             log.info("Add a resource");
-             Test1 resource = new Test1(myConnection);
-             resource.setField("TestKey",1);
-             resource.add();
-             myConnection.commit();
-             log.info("Try to delete and after that add the resource");
-             resource = new Test1(myConnection);
-             resource.deleteAll();
-             resource.clear();
-             resource.setField("TestKey",2);
-             resource.add();
-             myConnection.commit();
-           } catch (DBException e) {
-             log.error("DBException!", e);
-             if (myConnection != null)
-               myConnection.rollback();
-             fail("Exception occured:" + e.getMessage());
-           } finally {
-             if (myPool != null) {
-               myPool.release(myConnection);
-             }
-           }
-         } catch (DBException e) {
-           log.error("DBException!", e);
-           fail("Exception occured:" + e.getMessage());
-         }
- 
- 
-         try {
-           log.info("Delete resource:" + resourceId);
-           Test1 resource = new Test1();
-           resource.setDataContext(TestSystemInitializer.getTestContext());
-           resource.deleteAll();
-         } catch (Exception e) {
-           log.error(e);
-           fail("Exception occured:" + e.getMessage());
-         }
-       }
  
  
--- 1163,1166 ----



More information about the cvs mailing list