From: eherman Date: April 18 2006 2:07pm Subject: Connector/MXJ commit: r31 - in trunk/connector-mxj: . src src/com/mysql/management src/com/mysql/management/driverlaunched src/com/mysql/management/jmx src/com/mysql/management/jmx/jboss List-Archive: http://lists.mysql.com/commits/5088 Message-Id: <200604181407.k3IE7nDr012399@bk-internal.mysql.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modified: trunk/connector-mxj/CHANGES trunk/connector-mxj/src/ConnectorMXJUrlTestExample.java trunk/connector-mxj/src/com/mysql/management/MysqldResource.java trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java trunk/connector-mxj/src/com/mysql/management/MysqldResourceTestImpl.java trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactoryTest.java trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBeanTest.java trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBeanTest.java trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java Log: changed ServerLauncherSocketFactory.shutdown(int port) to .shutdown(File baseDir). Now works across JVMs Modified: trunk/connector-mxj/CHANGES =================================================================== --- trunk/connector-mxj/CHANGES 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/CHANGES 2006-04-18 14:07:46 UTC (rev 31) @@ -1,6 +1,11 @@ # Changelog # $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $ +2006-04-18 - 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. + 2006-03-27 - ServerLauncherSocketFactory.shutdown(port) no longer throws, only reports to System.err Modified: trunk/connector-mxj/src/ConnectorMXJUrlTestExample.java =================================================================== --- trunk/connector-mxj/src/ConnectorMXJUrlTestExample.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/ConnectorMXJUrlTestExample.java 2006-04-18 14:07:46 UTC (rev 31) @@ -37,7 +37,7 @@ e.printStackTrace(); } - ServerLauncherSocketFactory.shutdown(port); + ServerLauncherSocketFactory.shutdown(databaseDir); } } Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResource.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2006-04-18 14:07:46 UTC (rev 31) @@ -46,6 +46,8 @@ * @version $Id: MysqldResource.java,v 1.66 2005/12/05 16:39:54 eherman Exp $ */ public final class MysqldResource implements MysqldResourceI { + public static final String MYSQL_C_MXJ = "mysql-c.mxj"; + private String versionString; private Map options; @@ -172,7 +174,7 @@ final File validBaseDir(File dir) { if (dir == null || dir.equals(utils.files().nullFile())) { - dir = utils.files().tmp("mysql-c.mxj"); + dir = utils.files().tmp(MYSQL_C_MXJ); } if (!dir.exists()) { dir.mkdirs(); @@ -519,7 +521,7 @@ return shell; } - File getBaseDir() { + public File getBaseDir() { return baseDir; } Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java 2006-04-18 14:07:46 UTC (rev 31) @@ -17,6 +17,7 @@ */ package com.mysql.management; +import java.io.File; import java.util.Map; /** @@ -55,4 +56,6 @@ void setKillDelay(int millis); void addCompletionListenser(Runnable listener); + + File getBaseDir(); } \ No newline at end of file Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java 2006-04-18 14:07:46 UTC (rev 31) @@ -350,7 +350,7 @@ } public void testValidBaseDir() throws Exception { - File defaultBaseDir = fileUtil.tmp("mysql-c.mxj"); + File defaultBaseDir = fileUtil.tmp(MysqldResource.MYSQL_C_MXJ); assertEquals(defaultBaseDir, mysqldResource.validBaseDir(null)); assertEquals(defaultBaseDir, mysqldResource.validBaseDir(fileUtil .nullFile())); Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceTestImpl.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/MysqldResourceTestImpl.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceTestImpl.java 2006-04-18 14:07:46 UTC (rev 31) @@ -17,11 +17,13 @@ */ package com.mysql.management; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.mysql.management.util.Files; import com.mysql.management.util.ListToString; /** @@ -30,21 +32,27 @@ * Exp $ */ public class MysqldResourceTestImpl implements MysqldResourceI { + public File baseDir; + public Map runningFakeMysqlds; + private String running; private Map currentOptions; private List completionListensers; - public MysqldResourceTestImpl() { - this(new HashMap()); + public MysqldResourceTestImpl(File baseDir, Map runningFakeMysqlds) { + this(baseDir, new HashMap(), runningFakeMysqlds); } - public MysqldResourceTestImpl(Map options) { + public MysqldResourceTestImpl(File baseDir, Map options, + Map runningFakeMysqlds) { + this.baseDir = (baseDir == null) ? new Files().nullFile() : baseDir; this.running = null; this.currentOptions = options; this.completionListensers = new ArrayList(); + this.runningFakeMysqlds = runningFakeMysqlds; } public void start(String threadName, Map mysqldArgs) { @@ -55,9 +63,11 @@ } currentOptions.putAll(mysqldArgs); running = threadName; + runningFakeMysqlds.put(baseDir, this); } public void shutdown() { + runningFakeMysqlds.remove(baseDir); running = null; for (int i = 0; i < completionListensers.size(); i++) { Runnable listener = (Runnable) completionListensers.get(i); @@ -93,4 +103,8 @@ public boolean isReadyForConnections() { return isRunning(); } + + public File getBaseDir() { + return baseDir; + } } \ No newline at end of file Modified: trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java 2006-04-18 14:07:46 UTC (rev 31) @@ -17,8 +17,10 @@ */ package com.mysql.management.driverlaunched; +import java.io.File; import java.sql.SQLException; +import com.mysql.management.MysqldResource; import com.mysql.management.MysqldResourceI; import com.mysql.management.util.Files; import com.mysql.management.util.QuietTestCase; @@ -48,7 +50,8 @@ protected void tearDown() { super.tearDown(); try { - ServerLauncherSocketFactory.shutdown(port); + File defaultBaseDir = new Files().tmp(MysqldResource.MYSQL_C_MXJ); + ServerLauncherSocketFactory.shutdown(defaultBaseDir); } catch (MysqldResourceNotFoundException e) { warn(e); } finally { Modified: trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java 2006-04-18 14:07:46 UTC (rev 31) @@ -19,7 +19,6 @@ import java.io.File; import java.io.IOException; -import java.io.PrintStream; import java.net.Socket; import java.net.SocketException; import java.util.Enumeration; @@ -29,10 +28,9 @@ import com.mysql.jdbc.SocketFactory; import com.mysql.jdbc.StandardSocketFactory; +import com.mysql.management.MysqldResource; import com.mysql.management.MysqldResourceI; import com.mysql.management.util.Files; -import com.mysql.management.util.ListToString; -import com.mysql.management.util.Str; /** * This class is final simply as a hint to the compiler, it may be un-finalized @@ -44,12 +42,8 @@ public static final String SERVER_DOT = "server."; - private static Map startedMysqlds = new HashMap(); - private static int launchCount = 0; - private Map myMysqlds; - private MysqldFactory resourceFactory; private SocketFactory socketFactory; @@ -57,23 +51,16 @@ public ServerLauncherSocketFactory() { setResourceFactory(new MysqldFactory.Default()); setSocketFactory(new StandardSocketFactory()); - setMyMysqlds(startedMysqlds); } public Socket connect(String host, int portNumber, Properties props) throws SocketException, IOException { - synchronized (getStartedMysqlds()) { - ensureMysqlStarted(portNumber, props); - } + ensureMysqlStarted(portNumber, props); return getSocketFactory().connect(host, portNumber, props); } private void ensureMysqlStarted(int port, Properties props) { - final Integer mapKey = new Integer(port); - if (getStartedMysqlds().containsKey(new Integer(port))) { - return; - } Map serverOpts = new HashMap(); for (Enumeration enums = props.propertyNames(); enums.hasMoreElements();) { String key = enums.nextElement().toString(); @@ -85,26 +72,29 @@ serverOpts.put(MysqldResourceI.PORT, Integer.toString(port)); File baseDir = new Files().newFile(serverOpts .get(MysqldResourceI.BASEDIR)); + MysqldResourceI mysqld = resourceFactory.newMysqldResource(baseDir); + + if (mysqld.isRunning()) { + Object runningPort = mysqld.getServerOptions().get( + MysqldResourceI.PORT); + if (runningPort.equals(Integer.toString(port))) { + return; + } + String msg = "Mysqld at " + mysqld.getBaseDir() + + " is running on port " + runningPort + " not " + port; + throw new RuntimeException(msg); + + } + mysqld.setVersion((String) serverOpts .get(MysqldResourceI.MYSQLD_VERSION)); - mysqld.addCompletionListenser(new Runnable() { - public void run() { - remove(mapKey); - } - }); + launchCount++; String threadName = "driver_launched_mysqld_" + launchCount; mysqld.start(threadName, serverOpts); - getStartedMysqlds().put(mapKey, mysqld); } - private void remove(Integer port) { - synchronized (getStartedMysqlds()) { - getStartedMysqlds().remove(port); - } - } - public Socket afterHandshake() throws SocketException, IOException { return getSocketFactory().afterHandshake(); } @@ -129,43 +119,10 @@ return socketFactory; } - void setMyMysqlds(Map mysqldMap) { - this.myMysqlds = mysqldMap; - } - - Map getStartedMysqlds() { - return myMysqlds; - } - // ------------------------------------------------------------- - public static boolean shutdown(int port) { - return shutdown(System.err, port); + public synchronized static boolean shutdown(File baseDir) { + MysqldResource mysqld = new MysqldResource(baseDir); + mysqld.shutdown(); + return mysqld.isRunning(); } - - public static boolean shutdown(PrintStream err, int port) { - Integer mapKey = new Integer(port); - synchronized (startedMysqlds) { - Object obj = startedMysqlds.get(mapKey); - if (obj == null) { - notFoundMsg(err, mapKey); - return false; - } - MysqldResourceI mysqld = (MysqldResourceI) obj; - startedMysqlds.remove(mapKey); - mysqld.shutdown(); - return !mysqld.isRunning(); - } - } - - private static void notFoundMsg(PrintStream err, Integer mapKey) { - synchronized (err) { - err.print("["); - err.print(new Str() - .shortClassName(ServerLauncherSocketFactory.class)); - err.print("] "); - err.print("mysqld for port " + mapKey + " not found in "); - err.print(new ListToString().toString(startedMysqlds.keySet())); - err.println(); - } - } } Modified: trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactoryTest.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactoryTest.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactoryTest.java 2006-04-18 14:07:46 UTC (rev 31) @@ -19,9 +19,8 @@ import java.io.File; import java.net.Socket; -import java.util.ArrayList; +import java.sql.SQLException; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Properties; @@ -29,20 +28,21 @@ import com.mysql.jdbc.SocketFactory; import com.mysql.jdbc.StandardSocketFactory; +import com.mysql.management.MysqldResource; import com.mysql.management.MysqldResourceI; import com.mysql.management.MysqldResourceTestImpl; +import com.mysql.management.util.Files; public class ServerLauncherSocketFactoryTest extends TestCase { static class FakeMysqldFactory implements MysqldFactory { - List resources = new ArrayList(); + Map fakeRunningMysqlds; - File baseDir; + public FakeMysqldFactory() { + this.fakeRunningMysqlds = new HashMap(); + } public MysqldResourceI newMysqldResource(File base) { - this.baseDir = base; - MysqldResourceI newMysqldResourceI = new MysqldResourceTestImpl(); - resources.add(newMysqldResourceI); - return newMysqldResourceI; + return new MysqldResourceTestImpl(base, fakeRunningMysqlds); } } @@ -72,6 +72,17 @@ } } + private String orig; + + protected void setUp() { + orig = System.getProperty(Files.USE_TEST_DIR, ""); + System.setProperty(Files.USE_TEST_DIR, Boolean.TRUE.toString()); + } + + protected void tearDown() { + System.setProperty(Files.USE_TEST_DIR, orig); + } + public void testDefaultConstruction() { ServerLauncherSocketFactory sf = new ServerLauncherSocketFactory(); assertEquals(StandardSocketFactory.class, sf.getSocketFactory() @@ -82,7 +93,6 @@ public void testComposition() throws Exception, Exception { ServerLauncherSocketFactory sf = new ServerLauncherSocketFactory(); - sf.setMyMysqlds(new HashMap()); FakeSocketFactory fake = new FakeSocketFactory(); sf.setSocketFactory(fake); sf.setResourceFactory(new FakeMysqldFactory()); @@ -111,68 +121,71 @@ } public void testMultipleConnectionsAndShutdownListener() throws Exception { - Map testMysqlds = new HashMap(); ServerLauncherSocketFactory sf = new ServerLauncherSocketFactory(); - sf.setMyMysqlds(testMysqlds); FakeMysqldFactory factory = new FakeMysqldFactory(); sf.setResourceFactory(factory); sf.setSocketFactory(new FakeSocketFactory()); - assertEquals(0, factory.resources.size()); + assertEquals(0, factory.fakeRunningMysqlds.size()); String host = "localhost"; int port = 3306; + File baseDir = new Files().tmp(MysqldResource.MYSQL_C_MXJ); + Properties props = new Properties(); props.setProperty("foo", "bar"); - props - .setProperty(ServerLauncherSocketFactory.SERVER_DOT + "baz", - "wiz"); + props.setProperty(ServerLauncherSocketFactory.SERVER_DOT + + MysqldResourceI.BASEDIR, baseDir.toString()); + props.setProperty(ServerLauncherSocketFactory.SERVER_DOT // + + "baz", "wiz"); - assertEquals(0, testMysqlds.size()); + assertEquals(0, factory.fakeRunningMysqlds.size()); sf.connect(host, port, props); - assertEquals(1, testMysqlds.size()); + assertEquals(1, factory.fakeRunningMysqlds.size()); - MysqldResourceI mysqldResource = (MysqldResourceI) factory.resources - .get(0); + MysqldResourceI mysqldResource = (MysqldResourceI) factory.fakeRunningMysqlds + .get(baseDir); Map serverParams = mysqldResource.getServerOptions(); assertEquals("wiz", serverParams.get("baz")); assertFalse("wiz", serverParams.containsKey("foo")); sf.connect(host, port, props); - assertEquals(1, testMysqlds.size()); + assertEquals(1, factory.fakeRunningMysqlds.size()); + props.setProperty(ServerLauncherSocketFactory.SERVER_DOT + + MysqldResourceI.BASEDIR, baseDir.toString() + "2"); sf.connect(host, port + 1, props); - assertEquals(2, testMysqlds.size()); + assertEquals(2, factory.fakeRunningMysqlds.size()); - Object mapKey = testMysqlds.keySet().iterator().next(); - MysqldResourceI mysqld = (MysqldResourceI) testMysqlds.get(mapKey); - mysqld.shutdown(); + mysqldResource.shutdown(); - assertEquals(1, testMysqlds.size()); + assertEquals(1, factory.fakeRunningMysqlds.size()); } public void testDefaultAnd3306() throws Exception { - Map testMysqlds = new HashMap(); ServerLauncherSocketFactory sf = new ServerLauncherSocketFactory(); - sf.setMyMysqlds(testMysqlds); FakeMysqldFactory factory = new FakeMysqldFactory(); + FakeSocketFactory fakeSf = new FakeSocketFactory(); sf.setResourceFactory(factory); - sf.setSocketFactory(new FakeSocketFactory()); + sf.setSocketFactory(fakeSf); Properties props = new Properties(); int port = 3306; - assertEquals(0, testMysqlds.size()); + assertEquals(0, factory.fakeRunningMysqlds.size()); sf.connect("localhost", port, props); - assertEquals(1, testMysqlds.size()); + assertEquals(1, factory.fakeRunningMysqlds.size()); sf.connect("127.0.0.1", port, props); - assertEquals(1, testMysqlds.size()); + assertEquals(1, factory.fakeRunningMysqlds.size()); + File baseDir = new Files().tmp("MysqlDir3307"); + props.setProperty(ServerLauncherSocketFactory.SERVER_DOT + + MysqldResourceI.BASEDIR, baseDir.toString() + "1"); sf.connect("localhost", port + 1, props); - assertEquals(2, testMysqlds.size()); + assertEquals(2, factory.fakeRunningMysqlds.size()); } } Modified: trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBeanTest.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBeanTest.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBeanTest.java 2006-04-18 14:07:46 UTC (rev 31) @@ -17,6 +17,8 @@ */ package com.mysql.management.jmx; +import java.util.HashMap; + import javax.management.Attribute; import junit.framework.TestCase; @@ -31,7 +33,7 @@ */ public class MysqldDynamicMBeanTest extends TestCase { public void testAutoStart() throws Exception { - MysqldResourceI mysqld = new MysqldResourceTestImpl(); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, new HashMap()); MysqldDynamicMBean myBean = new MysqldDynamicMBean(mysqld); assertFalse(mysqld.isRunning()); String autostart = SimpleMysqldDynamicMBean.AUTOSTART_ATTR; Modified: trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBeanTest.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBeanTest.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBeanTest.java 2006-04-18 14:07:46 UTC (rev 31) @@ -47,7 +47,8 @@ public void testGetMBeanInfo() throws Exception { Map options = new HashMap(); options.put("foo", "bar"); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); @@ -109,7 +110,8 @@ public void testGetAttribute() throws Exception { Map options = new HashMap(); options.put("foo", "bar"); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); assertEquals("bar", myBean.getAttribute("foo")); @@ -126,7 +128,8 @@ options.put("foo", "bar"); options.put("baz", "wiz"); options.put("datadir", "/bogus/dir"); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); AttributeList attributeList = myBean.getAttributes(new String[] { @@ -140,7 +143,8 @@ public void testGetAgentVersion() throws Exception { Map options = new HashMap(); options.put("foo", "bar"); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); String verAttName = myBean.versionAttributeName(); @@ -169,7 +173,8 @@ options.put("foo", "bar"); options.put("baz", "wiz"); options.put("datadir", "/bogus/dir"); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); @@ -186,7 +191,8 @@ public void testSetAttribute() throws Exception { Map options = new HashMap(); options.put("foo", "bar"); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); try { myBean.setAttribute(new Attribute("bogus", "werid")); @@ -197,7 +203,7 @@ } public void testAutoStart() throws Exception { - MysqldResourceI mysqld = new MysqldResourceTestImpl(); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); assertFalse(mysqld.isRunning()); String autostart = SimpleMysqldDynamicMBean.AUTOSTART_ATTR; @@ -208,7 +214,7 @@ } public void testInvoke() throws Exception { - MysqldResourceI mysqld = new MysqldResourceTestImpl(); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); assertEquals(false, mysqld.isRunning()); myBean.invoke(SimpleMysqldDynamicMBean.START_METHOD, null, null); @@ -230,7 +236,8 @@ options.put("baz", "wiz"); options.put("datadir", "/bogus/dir"); options.put("help", ""); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); myBean.setAttribute(new Attribute("foo", "changed")); assertTrue(myBean.attributesToOpionMap().containsKey("foo")); @@ -242,7 +249,8 @@ public void testFreezeAttributes() { Map options = new HashMap(); options.put("foo", "bar"); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); MBeanInfo info = myBean.getMBeanInfo(); @@ -258,7 +266,8 @@ public void testAttributesFrozenWhenRunning() throws ReflectionException { Map options = new HashMap(); options.put("foo", "bar"); - MysqldResourceI mysqld = new MysqldResourceTestImpl(options); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, options, + new HashMap()); SimpleMysqldDynamicMBean myBean = new SimpleMysqldDynamicMBean(mysqld); MBeanInfo info = myBean.getMBeanInfo(); Modified: trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java =================================================================== --- trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java 2006-04-13 23:22:27 UTC (rev 30) +++ trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java 2006-04-18 14:07:46 UTC (rev 31) @@ -49,7 +49,7 @@ } public void testNoAutoStart() throws Exception { - MysqldResourceI mysqld = new MysqldResourceTestImpl(); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, new HashMap()); JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(mysqld); assertFalse(mysqld.isRunning()); myBean.create(); @@ -57,7 +57,7 @@ } public void testAutoStart() throws Exception { - MysqldResourceI mysqld = new MysqldResourceTestImpl(); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, new HashMap()); JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(mysqld); assertFalse(mysqld.isRunning()); @@ -74,7 +74,8 @@ Map atts = new HashMap(); atts.put(SimpleMysqldDynamicMBean.AUTOSTART_ATTR, Boolean.TRUE .toString()); - MysqldResourceI mysqld = new MysqldResourceTestImpl(atts); + MysqldResourceI mysqld = new MysqldResourceTestImpl(null, atts, + new HashMap()); JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(mysqld); assertFalse(mysqld.isRunning());