batchserver-cvs

[Suresh <sur...@us...>]

Update of /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/repository/jdbc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4002/repository/jdbc

Modified Files:
	MySQLJdbcRepositoryTest.java OracleJdbcRepositoryTest.java 
Log Message:
no message

Index: OracleJdbcRepositoryTest.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/repository/jdbc/OracleJdbcRepositoryTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OracleJdbcRepositoryTest.java	15 Sep 2006 20:27:14 -0000	1.1
--- OracleJdbcRepositoryTest.java	20 Sep 2006 02:44:05 -0000	1.2
***************
*** 51,58 ****
      {
          TestSuite suite = new TestSuite();
!         suite.addTest(new OracleJdbcRepositoryTest("testInit"));
!         suite.addTest(new OracleJdbcRepositoryTest("testJobDataTransfer"));
!         suite.addTest(new OracleJdbcRepositoryTest("testLogStatistics"));
!         suite.addTest(new OracleJdbcRepositoryTest("testJobMgmtMntrInfo"));
          return suite;
      }
--- 51,61 ----
      {
          TestSuite suite = new TestSuite();
!         if(OracleJdbcRepositoryTest.isOracleDBStarted())
!         {
!             suite.addTest(new OracleJdbcRepositoryTest("testInit"));
!             suite.addTest(new OracleJdbcRepositoryTest("testJobDataTransfer"));
!             suite.addTest(new OracleJdbcRepositoryTest("testLogStatistics"));
!             suite.addTest(new OracleJdbcRepositoryTest("testJobMgmtMntrInfo"));
!         }
          return suite;
      }
***************
*** 308,310 ****
--- 311,335 ----
          
      }    
+     
+     private static boolean isOracleDBStarted()
+     {
+         boolean started=false;
+         try
+         {
+             Map configMap=new HashMap();
+             configMap.put(JdbcConnectionHelper.PROPERTY_JDBC_DRIVER_CLASS_NAME, "oracle.jdbc.driver.OracleDriver");
+             configMap.put(JdbcConnectionHelper.PROPERTY_JDBC_URL, "jdbc:oracle:thin:@hostname:1521:myinstance");
+             configMap.put(JdbcConnectionHelper.PROPERTY_DATABASE_USER_NAME, "scott");
+             configMap.put(JdbcConnectionHelper.PROPERTY_DATABASE_PASSWORD, "tiger");
+             Connection connection=JdbcConnectionHelper.getConnection(configMap);
+             if(connection!=null)
+                 started=true;
+         }
+         catch(Throwable exception)
+         {
+             started=false;
+         }
+         return started;
+     }
+     
  }

Index: MySQLJdbcRepositoryTest.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/repository/jdbc/MySQLJdbcRepositoryTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MySQLJdbcRepositoryTest.java	15 Sep 2006 20:27:14 -0000	1.1
--- MySQLJdbcRepositoryTest.java	20 Sep 2006 02:44:05 -0000	1.2
***************
*** 49,56 ****
      {
          TestSuite suite = new TestSuite();
!         suite.addTest(new MySQLJdbcRepositoryTest("testInit"));
!         suite.addTest(new MySQLJdbcRepositoryTest("testJobDataTransfer"));
!         suite.addTest(new MySQLJdbcRepositoryTest("testLogStatistics"));
!         suite.addTest(new MySQLJdbcRepositoryTest("testJobMgmtMntrInfo"));
          return suite;
      }
--- 49,59 ----
      {
          TestSuite suite = new TestSuite();
!         if(MySQLJdbcRepositoryTest.isMySqlDBStarted())
!         {
!             suite.addTest(new MySQLJdbcRepositoryTest("testInit"));
!             suite.addTest(new MySQLJdbcRepositoryTest("testJobDataTransfer"));
!             suite.addTest(new MySQLJdbcRepositoryTest("testLogStatistics"));
!             suite.addTest(new MySQLJdbcRepositoryTest("testJobMgmtMntrInfo"));
!         }
          return suite;
      }
***************
*** 302,304 ****
--- 305,329 ----
          
      }    
+     
+     private static boolean isMySqlDBStarted()
+     {
+         boolean started=false;
+         try
+         {
+             Map configMap=new HashMap();
+             configMap.put(JdbcConnectionHelper.PROPERTY_JDBC_DRIVER_CLASS_NAME, "com.mysql.jdbc.Driver");
+             configMap.put(JdbcConnectionHelper.PROPERTY_JDBC_URL, "jdbc:mysql://localhost:3306/batchserver");
+             configMap.put(JdbcConnectionHelper.PROPERTY_DATABASE_USER_NAME, "root");
+             configMap.put(JdbcConnectionHelper.PROPERTY_DATABASE_PASSWORD, "ramesh");
+             Connection connection=JdbcConnectionHelper.getConnection(configMap);
+             if(connection!=null)
+                 started=true;
+         }
+         catch(Throwable exception)
+         {
+             started=false;
+         }
+         return started;
+     }
+     
  }