Connector/MXJ commit: r32 - in branches/5-0-1-nortel/connector-mxj: . src/com/mysql/management src/com/mysql/management/jmx src/com/mysql/management/u...

[eherman]

Modified:
   branches/5-0-1-nortel/connector-mxj/CHANGES
   branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/MysqldResource.java
   branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/jmx/AllTestsSuite.java
   branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/util/Files.java
Log:
socket is now "mysql.sock" in datadir ... test robustness.

Modified: branches/5-0-1-nortel/connector-mxj/CHANGES
===================================================================
--- branches/5-0-1-nortel/connector-mxj/CHANGES	2006-04-18 14:07:46 UTC (rev 31)
+++ branches/5-0-1-nortel/connector-mxj/CHANGES	2006-04-18 20:24:18 UTC (rev 32)
@@ -1,6 +1,10 @@
 # Changelog
 # $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
 
[phone] - Made tests more robust be deleting the /tmp/test-c.mxj directory
+             before running tests.
+             socket is now "mysql.sock" in datadir
+
 2006-03-27 - ServerLauncherSocketFactory.shutdown(port) no longer throws, only 
              reports to System.err
 

Modified: branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/MysqldResource.java
===================================================================
--- branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/MysqldResource.java	2006-04-18 14:07:46 UTC (rev 31)
+++ branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/MysqldResource.java	2006-04-18 20:24:18 UTC (rev 32)
@@ -455,8 +455,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: branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/jmx/AllTestsSuite.java
===================================================================
--- branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/jmx/AllTestsSuite.java	2006-04-18 14:07:46 UTC (rev 31)
+++ branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/jmx/AllTestsSuite.java	2006-04-18 20:24:18 UTC (rev 32)
@@ -3,8 +3,11 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import com.mysql.management.util.Files;
+
 public class AllTestsSuite {
     public static Test suite() {
+        new Files().cleanTestDir();
         TestSuite suite = new TestSuite();
         suite.addTestSuite(ConnectorMXJPropertiesTransformTest.class);
         suite.addTestSuite(MysqldDynamicMBeanTest.class);

Modified: branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/util/Files.java
===================================================================
--- branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/util/Files.java	2006-04-18 14:07:46 UTC (rev 31)
+++ branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/util/Files.java	2006-04-18 20:24:18 UTC (rev 32)
@@ -47,7 +47,7 @@
         this.separatorChar = separatorChar;
         this.streams = streams;
     }
-
+    
     public File testDir() {
         return new File(tmp(), "test-c.mxj");
     }
@@ -122,4 +122,8 @@
         }
         return new File(fileName.toString());
     }
+
+    public boolean cleanTestDir() {
+        return deleteTree(testDir());
+    }
 }
\ No newline at end of file