Connector/MXJ commit: r33 - in trunk/connector-mxj: . src/com/mysql/management src/com/mysql/management/util

[eherman]

Modified:
   trunk/connector-mxj/CHANGES
   trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java
   trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
   trunk/connector-mxj/src/com/mysql/management/util/Files.java
Log:
socket is now "mysql.sock" in datadir ... test robustness.

Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES	2006-04-18 20:24:18 UTC (rev 32)
+++ trunk/connector-mxj/CHANGES	2006-04-18 20:31:23 UTC (rev 33)
@@ -1,7 +1,10 @@
 # Changelog
 # $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
 
-2006-04-18 - ServerLauncherSocketFactory.shutdown now works across JVMs.
[phone] - Made tests more robust be deleting the /tmp/test-c.mxj directory
+             before running tests.
+           - socket is now "mysql.sock" in datadir
+           - ServerLauncherSocketFactory.shutdown now works across JVMs.
            - ServerLauncherSocketFactory.shutdown API change: now takes File
              parameter (basedir) instead of port.
            - altered to be "basedir" rather than "port" oriented.

Modified: trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java	2006-04-18 20:24:18 UTC (rev 32)
+++ trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java	2006-04-18 20:31:23 UTC (rev 33)
@@ -17,6 +17,8 @@
  */
 package com.mysql.management;
 
+import com.mysql.management.util.Files;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -26,6 +28,7 @@
  */
 public class AllTestsSuite {
     public static Test suite() {
+        new Files().cleanTestDir();
         TestSuite suite = new TestSuite();
 
         suite.addTest(com.mysql.management.util.AllTestsSuite.suite());

Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResource.java	2006-04-18 20:24:18 UTC (rev 32)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResource.java	2006-04-18 20:31:23 UTC (rev 33)
@@ -457,8 +457,7 @@
             return;
         }
 
-        File socket = new File(baseDir, "mysql.sock");
-        mysqldArgs.put(MysqldResourceI.SOCKET, socket.toString());
+        mysqldArgs.put(MysqldResourceI.SOCKET, "mysql.sock");
     }
 
     File dataDir(Map mysqldArgs) {

Modified: trunk/connector-mxj/src/com/mysql/management/util/Files.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/Files.java	2006-04-18 20:24:18 UTC (rev 32)
+++ trunk/connector-mxj/src/com/mysql/management/util/Files.java	2006-04-18 20:31:23 UTC (rev 33)
@@ -122,4 +122,8 @@
         }
         return new File(fileName.toString());
     }
-}
\ No newline at end of file
+
+    public boolean cleanTestDir() {
+        return deleteTree(testDir());
+    }
+}