Author: adietish Date: 2011-04-23 17:56:54 -0400 (Sat, 23 Apr 2011) New Revision: 30809 Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSerivceTest.java Removed: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTest.java Log: [JBIDE-8784] added service availability test, added server version property & constant Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java 2011-04-23 21:21:00 UTC (rev 30808) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagentServiceProxy.java 2011-04-23 21:56:54 UTC (rev 30809) @@ -3,16 +3,17 @@ import java.text.MessageFormat; import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; import org.osgi.util.tracker.ServiceTracker; public class JBoss7ManagentServiceProxy extends ServiceTracker<IJBoss7ManagementService, IJBoss7ManagementService> implements IJBoss7ManagementService { - private static final String FILTER_EXPRESSION = - "(&(objectClass=" + IJBoss7ManagementService.class.getCanonicalName() + ")(as.version={0}))"; //$NON-NLS-1$ //$NON-NLS-2$ - - public JBoss7ManagentServiceProxy(BundleContext context, String asVersion) { - super(context, MessageFormat.format(FILTER_EXPRESSION, asVersion), null); + public JBoss7ManagentServiceProxy(BundleContext context, String asVersion) throws InvalidSyntaxException { + super( + context, + context.createFilter(MessageFormat + .format("(&(objectClass={0})(as.version={1}))", IJBoss7ManagementService.class.getCanonicalName(), asVersion)), null); //$NON-NLS-1$ } public IJBoss7DeploymentManager getDeploymentManager() throws JBoss7ManangementException { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTest.java 2011-04-23 21:21:00 UTC (rev 30808) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTest.java 2011-04-23 21:56:54 UTC (rev 30809) @@ -26,7 +26,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Plugin; import org.jboss.ide.eclipse.as.core.util.FileUtil; -import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.osgi.framework.BundleContext; /** @@ -73,8 +72,10 @@ return plugin; } + public static BundleContext getContext() { + return plugin.getBundle().getBundleContext(); + } - // set some constants for wide-use public static final String TOMCAT_RUNTIME_55 = "org.eclipse.jst.server.tomcat.runtime.55"; public static final String JBOSS_AS_32_HOME = System.getProperty("jbosstools.test.jboss.home.3.2", "C:\\apps\\jboss\\jboss-3.2.8.SP1\\"); Copied: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSerivceTest.java (from rev 30808, trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java) =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSerivceTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSerivceTest.java 2011-04-23 21:56:54 UTC (rev 30809) @@ -0,0 +1,72 @@ +package org.jboss.ide.eclipse.as.test.server; + +import static org.junit.Assert.assertNotNull; + +import java.util.Dictionary; +import java.util.Hashtable; + +import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentManager; +import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7ManagementInterface; +import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7ManagementService; +import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagentServiceProxy; +import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangementException; +import org.jboss.ide.eclipse.as.test.ASTest; +import org.junit.Test; +import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; + +public class JBossManagentSerivceTest { + + @Test + public void canUseService() throws JBoss7ManangementException, InvalidSyntaxException { + BundleContext context = ASTest.getContext(); + JBoss7ManagentServiceProxy serviceProxy = new JBoss7ManagentServiceProxy(context, + IJBoss7ManagementService.AS_VERSION_700); + serviceProxy.open(); + IJBoss7DeploymentManager manager = serviceProxy.getDeploymentManager(); + assertNotNull(manager); + } + + @Test + public void canUseServiceEvenIfAlternativeIsRegistered() throws JBoss7ManangementException, InvalidSyntaxException { + BundleContext context = ASTest.getDefault().getBundle().getBundleContext(); + registerFakeASService("710"); + JBoss7ManagentServiceProxy serviceProxy = new JBoss7ManagentServiceProxy(context, + IJBoss7ManagementService.AS_VERSION_700); + serviceProxy.open(); + IJBoss7DeploymentManager manager = serviceProxy.getDeploymentManager(); + assertNotNull(manager); + } + + @Test(expected = UnsupportedOperationException.class) + public void canUseAlternative() throws JBoss7ManangementException, InvalidSyntaxException { + BundleContext context = ASTest.getDefault().getBundle().getBundleContext(); + registerFakeASService("710"); + JBoss7ManagentServiceProxy serviceProxy = + new JBoss7ManagentServiceProxy(context, "710"); + serviceProxy.open(); + IJBoss7DeploymentManager manager = serviceProxy.getDeploymentManager(); + assertNotNull(manager); + } + + private void registerFakeASService(String version) { + Dictionary<String, String> serviceProperties = new Hashtable<String, String>(); + serviceProperties.put(IJBoss7ManagementService.AS_VERSION_PROPERTY, version); + ASTest.getContext().registerService(IJBoss7ManagementService.class, new JBoss71ManagementService(), + serviceProperties); + } + + private static class JBoss71ManagementService implements IJBoss7ManagementService { + + @Override + public IJBoss7DeploymentManager getDeploymentManager() throws JBoss7ManangementException { + throw new UnsupportedOperationException(); + } + + @Override + public IJBoss7ManagementInterface getManagementInterface() throws JBoss7ManangementException { + throw new UnsupportedOperationException(); + } + + } +} Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSerivceTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java 2011-04-23 21:21:00 UTC (rev 30808) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagentSeriveTest.java 2011-04-23 21:56:54 UTC (rev 30809) @@ -1,24 +0,0 @@ -package org.jboss.ide.eclipse.as.test.server; - -import static org.junit.Assert.assertNotNull; - -import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7DeploymentManager; -import org.jboss.ide.eclipse.as.core.server.internal.v7.IJBoss7ManagementService; -import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagentServiceProxy; -import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManangementException; -import org.jboss.ide.eclipse.as.test.ASTest; -import org.junit.Test; -import org.osgi.framework.BundleContext; - -public class JBossManagentSeriveTest { - - @Test - public void canUseService() throws JBoss7ManangementException { - BundleContext context = ASTest.getDefault().getBundle().getBundleContext(); - JBoss7ManagentServiceProxy serviceProxy = new JBoss7ManagentServiceProxy(context, IJBoss7ManagementService.AS_VERSION_700); - serviceProxy.open(); - IJBoss7DeploymentManager manager = serviceProxy.getDeploymentManager(); - assertNotNull(manager); - } - -}