[Smartfrog-checkins] SF.net SVN: smartfrog:[8369] trunk/core/components/database/test/org/ smartfrog/services/database/test/system/core/mysql/MysqlTest.java

[<st...@us...>]

Revision: 8369
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8369&view=rev
Author:   steve_l
Date:     2010-08-24 10:29:05 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
SFOS-1512  mysql tests failing on hudson

Modified Paths:
--------------
    trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlTest.java

Modified: trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlTest.java
===================================================================
--- trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlTest.java	2010-08-23 14:33:29 UTC (rev 8368)
+++ trunk/core/components/database/test/org/smartfrog/services/database/test/system/core/mysql/MysqlTest.java	2010-08-24 10:29:05 UTC (rev 8369)
@@ -19,8 +19,8 @@
 */
 package org.smartfrog.services.database.test.system.core.mysql;
 
+import org.smartfrog.services.assertions.events.TestCompletedEvent;
 import org.smartfrog.test.DeployingTestBase;
-import org.smartfrog.services.assertions.events.TestCompletedEvent;
 
 /** Mysql tests */
 public class MysqlTest extends DeployingTestBase {
@@ -36,7 +36,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        mysqlPresent=Boolean.getBoolean(MYSQL_PRESENT);
+        mysqlPresent = Boolean.getBoolean(MYSQL_PRESENT);
     }
 
 
@@ -47,7 +47,7 @@
     public void testInstallMysqlTest() throws Throwable {
         deployAndTerminateMysql("InstallMysqlTest");
     }
-    
+
     public void testConnectionOpenTest() throws Throwable {
         deployAndTerminateMysql("ConnectionOpenTest");
     }
@@ -78,11 +78,11 @@
      * @throws Throwable
      */
     public void testMissingDatabase() throws Throwable {
-        if(mysqlPresent) {
+        if (mysqlPresent) {
             TestCompletedEvent event = expectAbnormalTestRun(BASE, "MissingDatabaseTest", true, null);
             Throwable cause = event.getCause();
             //see SFOS-383
-            if(cause!=null && cause.getMessage().indexOf("Table 'mysql.proc' doesn't exist")>=0) {
+            if (cause != null && cause.getMessage().contains("Table 'mysql.proc' doesn't exist")) {
                 throw cause;
             }
         }
@@ -91,6 +91,7 @@
     /*
     *@skip: only works if you deploy mysql in grant-tables mode
     */
+
     public void NotestUserManipulation() throws Throwable {
         deployAndTerminateMysql("UserManipulationTest");
     }
@@ -101,9 +102,9 @@
 
     private void deployAndTerminateMysql(String template) throws Throwable {
         if (mysqlPresent) {
-            runTestsToCompletion(BASE,template);
+            runTestsToCompletion(BASE, template);
         } else {
-            getLog().info("Skipping test "+template+" as mysqld is not found on the path");
+            getLog().info("Skipping test " + template + " as mysqld is not found on the path");
         }
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.