Author: vyemialyanchyk Date: 2008-01-21 12:10:31 -0500 (Mon, 21 Jan 2008) New Revision: 5848 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/QueryParametersTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-1422 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2008-01-21 17:07:48 UTC (rev 5847) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2008-01-21 17:10:31 UTC (rev 5848) @@ -28,7 +28,8 @@ TestConsoleConfigurationPreferences cfgprefs = new TestConsoleConfigurationPreferences(); consoleCfg = new ConsoleConfiguration(cfgprefs); - KnownConfigurations.getInstance().addConfiguration(consoleCfg, true); + KnownConfigurations.getInstance().setBroadcast(true); + KnownConfigurations.getInstance().addConfiguration(consoleCfg); } protected void tearDown() throws Exception { Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2008-01-21 17:07:48 UTC (rev 5847) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2008-01-21 17:10:31 UTC (rev 5848) @@ -37,11 +37,14 @@ fail("no sf should be closed!"); } - public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate) { + public void configurationRemoved(ConsoleConfiguration root) { if(!added.remove(root)) { fail("trying to remove a non existing console"); } } + + public void configurationRefreshAll() { + } } public void testKnownConfigurations() { @@ -130,21 +133,102 @@ } }; + + ConsoleConfigurationPreferences preferences2 = new ConsoleConfigurationPreferences() { + + String name = "new test"; + + public void setName(String name) { + this.name = name; + } + + public void readStateFrom(Element element) { + // TODO Auto-generated method stub + + } + + public void writeStateTo(Element node) { + // TODO Auto-generated method stub + + } + + public File getPropertyFile() { + // TODO Auto-generated method stub + return null; + } + + public File getConfigXMLFile() { + // TODO Auto-generated method stub + return null; + } + + public Properties getProperties() { + // TODO Auto-generated method stub + return null; + } + + public File[] getMappingFiles() { + // TODO Auto-generated method stub + return null; + } + + public URL[] getCustomClassPathURLS() { + // TODO Auto-generated method stub + return null; + } + + public String getName() { + return name; + } + + public boolean useAnnotations() { + // TODO Auto-generated method stub + return false; + } + + public String getEntityResolverName() { + // TODO Auto-generated method stub + return null; + } + + public ConfigurationMode getConfigurationMode() { + // TODO Auto-generated method stub + return null; + } + + public String getNamingStrategy() { + // TODO Auto-generated method stub + return null; + } + + public String getPersistenceUnitName() { + // TODO Auto-generated method stub + return null; + } + + }; + ConsoleConfiguration configuration = new ConsoleConfiguration(preferences); + ConsoleConfiguration configuration2 = new ConsoleConfiguration(preferences2); - knownConfigurations.addConfiguration(configuration, false); + KnownConfigurations.getInstance().setBroadcast(false); + knownConfigurations.addConfiguration(configuration); + knownConfigurations.addConfiguration(configuration2); configurations = knownConfigurations.getConfigurations(); - assertEquals(1,configurations.length); + assertEquals(2,configurations.length); assertEquals(listener.added.size(), 0); - knownConfigurations.addConfiguration(configuration, true); + KnownConfigurations.getInstance().setBroadcast(true); + knownConfigurations.addConfiguration(configuration); + knownConfigurations.addConfiguration(configuration2); configurations = knownConfigurations.getConfigurations(); - assertEquals(1,configurations.length); - assertEquals(listener.added.size(), 1); + assertEquals(2,configurations.length); + assertEquals(listener.added.size(), 2); - knownConfigurations.removeConfiguration(configuration,false); + knownConfigurations.removeConfiguration(configuration); + knownConfigurations.removeConfiguration(configuration2); configurations = knownConfigurations.getConfigurations(); assertEquals(0,configurations.length); Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/QueryParametersTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/QueryParametersTest.java 2008-01-21 17:07:48 UTC (rev 5847) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/QueryParametersTest.java 2008-01-21 17:10:31 UTC (rev 5848) @@ -20,7 +20,8 @@ TestConsoleConfigurationPreferences cfgprefs = new TestConsoleConfigurationPreferences(); consoleCfg = new ConsoleConfiguration(cfgprefs); - KnownConfigurations.getInstance().addConfiguration(consoleCfg, true); + KnownConfigurations.getInstance().setBroadcast(true); + KnownConfigurations.getInstance().addConfiguration(consoleCfg); } protected void tearDown() throws Exception {