[Batchserver-cvs] batchserver/test/org/jmonks/batch/framework FrameworkTestSuite.java, 1.2, 1.3

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

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

Modified Files:
	FrameworkTestSuite.java 
Log Message:
no message

Index: FrameworkTestSuite.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/test/org/jmonks/batch/framework/FrameworkTestSuite.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FrameworkTestSuite.java	19 Sep 2006 00:09:38 -0000	1.2
--- FrameworkTestSuite.java	20 Sep 2006 00:18:04 -0000	1.3
***************
*** 8,11 ****
--- 8,14 ----
  package org.jmonks.batch.framework;
  
+ import java.sql.Connection;
+ import java.util.HashMap;
+ import java.util.Map;
  import junit.framework.*;
  import org.jmonks.batch.framework.controller.basic.VerifyAllConfigPropsBasicJobControllerTest;
***************
*** 24,27 ****
--- 27,31 ----
  import org.jmonks.batch.framework.config.PoolJobControllerConfigTest;
  import org.jmonks.batch.framework.repository.db4o.Db4oRepositoryTest;
+ import org.jmonks.batch.framework.util.JdbcConnectionHelper;
  import org.jmonks.batch.framework.util.JdbcConnectionHelperTest;
  
***************
*** 54,58 ****
      {
          TestSuite mainSuite = new TestSuite();
! 
          mainSuite.addTest(ErrorCodeTest.suite());        
          mainSuite.addTest(JobStatisticsTest.suite());
--- 58,62 ----
      {
          TestSuite mainSuite = new TestSuite();
!         boolean isMySqlDBStarted=FrameworkTestSuite.isMySqlDBStarted();
          mainSuite.addTest(ErrorCodeTest.suite());        
          mainSuite.addTest(JobStatisticsTest.suite());
***************
*** 60,64 ****
          mainSuite.addTest(LoggingManagerTest.suite());        
          mainSuite.addTest(FrameworkUtilTest.suite());
!         mainSuite.addTest(JdbcConnectionHelperTest.suite());
          mainSuite.addTest(FrameworkConfigTest.suite());
          mainSuite.addTest(ConfigurationExceptionTest.suite());
--- 64,69 ----
          mainSuite.addTest(LoggingManagerTest.suite());        
          mainSuite.addTest(FrameworkUtilTest.suite());
!         if(isMySqlDBStarted)
!             mainSuite.addTest(JdbcConnectionHelperTest.suite());
          mainSuite.addTest(FrameworkConfigTest.suite());
          mainSuite.addTest(ConfigurationExceptionTest.suite());
***************
*** 69,74 ****
          mainSuite.addTest(PoolJobControllerConfigTest.suite());
          mainSuite.addTest(Db4oRepositoryTest.suite());
!         mainSuite.addTest(MySQLJdbcRepositoryTest.suite());
!         mainSuite.addTest(OracleJdbcRepositoryTest.suite());
          mainSuite.addTest(MainTest.suite());
          mainSuite.addTest(VerifyAllConfigPropsBasicJobControllerTest.suite());
--- 74,81 ----
          mainSuite.addTest(PoolJobControllerConfigTest.suite());
          mainSuite.addTest(Db4oRepositoryTest.suite());
!         if(isMySqlDBStarted)
!             mainSuite.addTest(MySQLJdbcRepositoryTest.suite());
!         if(FrameworkTestSuite.isOracleDBStarted())
!             mainSuite.addTest(OracleJdbcRepositoryTest.suite());
          mainSuite.addTest(MainTest.suite());
          mainSuite.addTest(VerifyAllConfigPropsBasicJobControllerTest.suite());
***************
*** 78,81 ****
--- 85,130 ----
          return mainSuite;
      }
+ 
+     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;
+     }
+     
+     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:@himeros:1521:BRTST05");
+             configMap.put(JdbcConnectionHelper.PROPERTY_DATABASE_USER_NAME, "w951h8m");
+             configMap.put(JdbcConnectionHelper.PROPERTY_DATABASE_PASSWORD, "prag18");
+             Connection connection=JdbcConnectionHelper.getConnection(configMap);
+             if(connection!=null)
+                 started=true;
+         }
+         catch(Throwable exception)
+         {
+             started=false;
+         }
+         return started;
+     }
      
  }