December 2010 - jbosstools-commits

JBoss Tools SVN: r27498 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-15 05:21:59 -0500 (Wed, 15 Dec 2010) New Revision: 27498 Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java Log: [JBIDE-7594] * corrected scheduling rules to have correct blocking across the scheduling class hierarchy * created #createSecurePasswordStore to be able to fake store in tests * created tests for all scheduling rules Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java 2010-12-15 10:16:53 UTC (rev 27497) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java 2010-12-15 10:21:59 UTC (rev 27498) @@ -98,6 +98,13 @@ assertTrue(cloudInstancesRule.isConflicting(cloudRule)); } + @Test + public void cloudImagesRule2CloudImagesRule() throws DeltaCloudException { + CloudElementSchedulingRule cloudImagesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES); + assertTrue(cloudImagesRule.isConflicting(cloudImagesRule)); + } + private static class DeltaCloudFake extends DeltaCloud { public DeltaCloudFake() throws DeltaCloudException {

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27497 - in trunk/deltacloud/tests/org.jboss.tools.deltacloud.test: src/org/jboss/tools/internal/deltacloud/test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-15 05:16:53 -0500 (Wed, 15 Dec 2010) New Revision: 27497 Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/CloudSchedulingRulesTest.launch trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java Removed: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java Log: renamed SchedulingRulesTest to CloudSchedulingRulesTest Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/CloudSchedulingRulesTest.launch =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/CloudSchedulingRulesTest.launch (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/CloudSchedulingRulesTest.launch 2010-12-15 10:16:53 UTC (rev 27497) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/SchedulingRulesTest"/> +<booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.integration,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.usage,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding,org.jboss.tools.gwt.core,org.eclipse.epp.usagedata.ui,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.internal.deltacloud.test.core.job.CloudSchedulingRulesTest"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.deltacloud.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.sdk.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.compare@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.resources@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.servlet@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jface@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.e! clipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.console@default:default,org.eclipse.debug.ui@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.swt@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.osgi@-1:tru! e,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk! .core.re factoring@default:default,org.eclipse.core.jobs@default:default,com.ibm.icu@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.validation@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.search@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui.workbench.texteditor@defa! ult:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.editors@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.forms@default:default,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security@default:default,javax.xml@default:default,org.eclipse.help@default:default,org.apache.xml.serializer@default:default,org.apache.xerces@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.variables@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ant.core@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.runtime.compatibility.re! gistry@default:false,org.eclipse.core.databinding.observable@d! efault:d efault,org.eclipse.team.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.compare.core@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/> +<booleanAttribute key="show_selected_only" value="false"/> +<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/CloudSchedulingRulesTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch 2010-12-15 10:13:35 UTC (rev 27496) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch 2010-12-15 10:16:53 UTC (rev 27497) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="automaticValidate" value="false"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/SchedulingRulesTest"/> -<booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.integration,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.usage,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding,org.jboss.tools.gwt.core,org.eclipse.epp.usagedata.ui,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> -<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.internal.deltacloud.test.core.job.SchedulingRulesTest"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.deltacloud.test"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.sdk.ide"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.compare@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.resources@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.servlet@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jface@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.e! clipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.console@default:default,org.eclipse.debug.ui@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.swt@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.osgi@-1:tru! e,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk! .core.re factoring@default:default,org.eclipse.core.jobs@default:default,com.ibm.icu@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.validation@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.search@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui.workbench.texteditor@defa! ult:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.editors@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.forms@default:default,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security@default:default,javax.xml@default:default,org.eclipse.help@default:default,org.apache.xml.serializer@default:default,org.apache.xerces@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.variables@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ant.core@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.runtime.compatibility.re! gistry@default:false,org.eclipse.core.databinding.observable@d! efault:d efault,org.eclipse.team.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.compare.core@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> -<booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="true"/> -<booleanAttribute key="useProduct" value="false"/> -</launchConfiguration> Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2010-12-15 10:13:35 UTC (rev 27496) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2010-12-15 10:16:53 UTC (rev 27497) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.internal.deltacloud.test; -import org.jboss.tools.internal.deltacloud.test.core.job.SchedulingRulesTest; +import org.jboss.tools.internal.deltacloud.test.core.job.CloudSchedulingRulesTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -19,7 +19,7 @@ */ @RunWith(Suite.class) @Suite.SuiteClasses({ - SchedulingRulesTest.class + CloudSchedulingRulesTest.class }) public class DeltaCloudTestSuite { Copied: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java (from rev 27492, trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java) =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java 2010-12-15 10:16:53 UTC (rev 27497) @@ -0,0 +1,142 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.internal.deltacloud.test.core.job; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudException; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.deltacloud.core.SecurePasswordStore; +import org.jboss.tools.deltacloud.core.client.Instance; +import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob; +import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT; +import org.jboss.tools.deltacloud.core.job.CloudElementSchedulingRule; +import org.jboss.tools.deltacloud.core.job.CloudSchedulingRule; +import org.jboss.tools.deltacloud.core.job.InstanceSchedulingRule; +import org.junit.Before; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class CloudSchedulingRulesTest { + + private DeltaCloudFake cloudFake; + private Instance instanceFake; + private DeltaCloudInstance deltaCloudInstanceFake; + + @Before + public void setUp() throws DeltaCloudException { + this.cloudFake = new DeltaCloudFake(); + this.instanceFake = new Instance(); + this.deltaCloudInstanceFake = new DeltaCloudInstance(cloudFake, instanceFake); + } + + @Test + public void instanceRule2InstanceRule() throws DeltaCloudException { + InstanceSchedulingRule instanceRule = + new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); + assertTrue(instanceRule.isConflicting(instanceRule)); + } + + @Test + public void instanceRule2CloudElementInstanceRule() throws DeltaCloudException { + InstanceSchedulingRule instanceRule = new InstanceSchedulingRule( + cloudFake, AbstractCloudElementJob.CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); + CloudElementSchedulingRule cloudRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); + assertTrue(instanceRule.isConflicting(cloudRule)); + } + + @Test + public void instanceRule2CloudElementImageRule() throws DeltaCloudException { + InstanceSchedulingRule instanceRule = + new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); + CloudElementSchedulingRule cloudRule = new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES); + assertFalse(instanceRule.isConflicting(cloudRule)); + } + + @Test + public void instanceRule2CloudRule() throws DeltaCloudException { + InstanceSchedulingRule instanceRule = + new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); + CloudSchedulingRule cloudRule = new CloudSchedulingRule(cloudFake); + assertTrue(instanceRule.isConflicting(cloudRule)); + } + + @Test + public void cloudInstancesRule2CloudInstancesRule() throws DeltaCloudException { + CloudElementSchedulingRule cloudInstancesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); + assertTrue(cloudInstancesRule.isConflicting(cloudInstancesRule)); + } + + @Test + public void cloudInstancesRule2CloudImageRule() throws DeltaCloudException { + CloudElementSchedulingRule cloudInstancesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); + CloudElementSchedulingRule cloudImagesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES); + assertFalse(cloudInstancesRule.isConflicting(cloudImagesRule)); + } + + @Test + public void cloudInstancesRule2CloudRule() throws DeltaCloudException { + CloudElementSchedulingRule cloudInstancesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); + CloudSchedulingRule cloudRule = new CloudSchedulingRule(cloudFake); + assertTrue(cloudInstancesRule.isConflicting(cloudRule)); + } + + private static class DeltaCloudFake extends DeltaCloud { + + public DeltaCloudFake() throws DeltaCloudException { + super("mock", "http://dummy.org", "dummyUser", "dummyPassword"); + } + + @Override + protected SecurePasswordStore createSecurePasswordStore(String name, String username, String password) { + return new SecurePasswordStoreFake("dummyPassword"); + } + } + + private static class SecurePasswordStoreFake extends SecurePasswordStore { + + private String password; + + public SecurePasswordStoreFake(String password) { + super(null, password); + this.password = password; + } + + @Override + public String getPassword() throws DeltaCloudException { + return password; + } + + @Override + public void setPassword(String password) throws DeltaCloudException { + this.password = password; + } + + @Override + public void update(IStorageKey key, String password) throws DeltaCloudException { + setPassword(password); + } + + @Override + public void remove() throws DeltaCloudException { + } + + } +} Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java 2010-12-15 10:13:35 UTC (rev 27496) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java 2010-12-15 10:16:53 UTC (rev 27497) @@ -1,142 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.internal.deltacloud.test.core.job; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.jboss.tools.deltacloud.core.DeltaCloud; -import org.jboss.tools.deltacloud.core.DeltaCloudException; -import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.core.SecurePasswordStore; -import org.jboss.tools.deltacloud.core.client.Instance; -import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob; -import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT; -import org.jboss.tools.deltacloud.core.job.CloudElementSchedulingRule; -import org.jboss.tools.deltacloud.core.job.CloudSchedulingRule; -import org.jboss.tools.deltacloud.core.job.InstanceSchedulingRule; -import org.junit.Before; -import org.junit.Test; - -/** - * @author André Dietisheim - */ -public class SchedulingRulesTest { - - private DeltaCloudFake cloudFake; - private Instance instanceFake; - private DeltaCloudInstance deltaCloudInstanceFake; - - @Before - public void setUp() throws DeltaCloudException { - this.cloudFake = new DeltaCloudFake(); - this.instanceFake = new Instance(); - this.deltaCloudInstanceFake = new DeltaCloudInstance(cloudFake, instanceFake); - } - - @Test - public void instanceRule2InstanceRule() throws DeltaCloudException { - InstanceSchedulingRule instanceRule = - new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); - assertTrue(instanceRule.isConflicting(instanceRule)); - } - - @Test - public void instanceRule2CloudElementInstanceRule() throws DeltaCloudException { - InstanceSchedulingRule instanceRule = new InstanceSchedulingRule( - cloudFake, AbstractCloudElementJob.CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); - CloudElementSchedulingRule cloudRule = - new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); - assertTrue(instanceRule.isConflicting(cloudRule)); - } - - @Test - public void instanceRule2CloudElementImageRule() throws DeltaCloudException { - InstanceSchedulingRule instanceRule = - new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); - CloudElementSchedulingRule cloudRule = new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES); - assertFalse(instanceRule.isConflicting(cloudRule)); - } - - @Test - public void instanceRule2CloudRule() throws DeltaCloudException { - InstanceSchedulingRule instanceRule = - new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); - CloudSchedulingRule cloudRule = new CloudSchedulingRule(cloudFake); - assertTrue(instanceRule.isConflicting(cloudRule)); - } - - @Test - public void cloudInstancesRule2CloudInstancesRule() throws DeltaCloudException { - CloudElementSchedulingRule cloudInstancesRule = - new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); - assertTrue(cloudInstancesRule.isConflicting(cloudInstancesRule)); - } - - @Test - public void cloudInstancesRule2CloudImageRule() throws DeltaCloudException { - CloudElementSchedulingRule cloudInstancesRule = - new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); - CloudElementSchedulingRule cloudImagesRule = - new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES); - assertFalse(cloudInstancesRule.isConflicting(cloudImagesRule)); - } - - @Test - public void cloudInstancesRule2CloudRule() throws DeltaCloudException { - CloudElementSchedulingRule cloudInstancesRule = - new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); - CloudSchedulingRule cloudRule = new CloudSchedulingRule(cloudFake); - assertTrue(cloudInstancesRule.isConflicting(cloudRule)); - } - - private static class DeltaCloudFake extends DeltaCloud { - - public DeltaCloudFake() throws DeltaCloudException { - super("mock", "http://dummy.org", "dummyUser", "dummyPassword"); - } - - @Override - protected SecurePasswordStore createSecurePasswordStore(String name, String username, String password) { - return new SecurePasswordStoreFake("dummyPassword"); - } - } - - private static class SecurePasswordStoreFake extends SecurePasswordStore { - - private String password; - - public SecurePasswordStoreFake(String password) { - super(null, password); - this.password = password; - } - - @Override - public String getPassword() throws DeltaCloudException { - return password; - } - - @Override - public void setPassword(String password) throws DeltaCloudException { - this.password = password; - } - - @Override - public void update(IStorageKey key, String password) throws DeltaCloudException { - setPassword(password); - } - - @Override - public void remove() throws DeltaCloudException { - } - - } -}

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27496 - in trunk/hibernatetools: features/org.hibernate.eclipse.sdk.feature and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2010-12-15 05:13:35 -0500 (Wed, 15 Dec 2010) New Revision: 27496 Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml trunk/hibernatetools/features/org.hibernate.eclipse.feature/pom.xml trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/pom.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse.help/pom.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/pom.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/pom.xml Log: https://issues.jboss.org/browse/JBIDE-7906 Change features/plugins version to 3.4.0 Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2010-12-15 10:13:35 UTC (rev 27496) @@ -2,7 +2,7 @@ <feature id="org.hibernate.eclipse.feature" label="%featureName" - version="3.3.0.qualifier" + version="3.4.0.qualifier" provider-name="%providerName" plugin="org.hibernate.eclipse"> @@ -111,7 +111,7 @@ install-size="0" version="0.0.0"/> -<plugin + <plugin id="org.jboss.tools.hibernate.xml" download-size="0" install-size="0" Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/pom.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/pom.xml 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/pom.xml 2010-12-15 10:13:35 UTC (rev 27496) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.hibernatetools.features</groupId> <artifactId>org.hibernate.eclipse.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> Modified: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml 2010-12-15 10:13:35 UTC (rev 27496) @@ -1,31 +1,31 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.hibernate.eclipse.sdk.feature" - label="%featureName" - version="3.3.0.qualifier" - provider-name="%providerName" - plugin="org.hibernate.eclipse"> - - <description url="http://tools.hibernate.org"> - %description - </description> - - <license>Red Hat, Inc. licenses these features and plugins to you under +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.hibernate.eclipse.sdk.feature" + label="%featureName" + version="3.4.0.qualifier" + provider-name="%providerName" + plugin="org.hibernate.eclipse"> + + <description url="http://tools.hibernate.org"> + %description + </description> + + <license> + Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, the GNU Lesser General Public License, and/or certain other open source licenses. For precise licensing details, consult the corresponding source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, -Raleigh NC 27606 USA. -</license> - - - <includes - id="org.hibernate.eclipse.feature" - version="0.0.0"/> - - <includes - id="org.hibernate.eclipse.source.feature" - version="0.0.0"/> - -</feature> +Raleigh NC 27606 USA. + </license> + + <includes + id="org.hibernate.eclipse.feature" + version="0.0.0"/> + + <includes + id="org.hibernate.eclipse.source.feature" + version="0.0.0"/> + +</feature> Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 2010-12-15 10:13:35 UTC (rev 27496) @@ -2,7 +2,7 @@ <feature id="org.hibernate.eclipse.test.feature" label="Hibernate Tests" - version="3.3.0.qualifier" + version="3.4.0.qualifier" provider-name="JBoss by Red Hat"> <description url="http://www.example.com/description"> Modified: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/pom.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/pom.xml 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/pom.xml 2010-12-15 10:13:35 UTC (rev 27496) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.hibernatetools.plugins</groupId> <artifactId>org.hibernate.eclipse.test.feature</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF 2010-12-15 10:13:35 UTC (rev 27496) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.help; singleton:=true -Bundle-Version: 3.3.0.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-ClassPath: help.jar Bundle-Activator: org.hibernate.eclipse.help.HelpPlugin Bundle-Vendor: %Bundle-Vendor.0 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/pom.xml =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/pom.xml 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/pom.xml 2010-12-15 10:13:35 UTC (rev 27496) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.hibernatetools.plugins</groupId> <artifactId>org.hibernate.eclipse.help</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF 2010-12-15 10:13:35 UTC (rev 27496) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.hibernate.eclipse.jdt.apt.ui;singleton:=true -Bundle-Version: 3.3.0.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Activator: org.hibernate.eclipse.jdt.apt.ui.Activator Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/pom.xml =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/pom.xml 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/pom.xml 2010-12-15 10:13:35 UTC (rev 27496) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.hibernatetools.plugins</groupId> <artifactId>org.hibernate.eclipse.jdt.apt.ui</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/META-INF/MANIFEST.MF 2010-12-15 10:13:35 UTC (rev 27496) @@ -25,5 +25,5 @@ org.eclipse.core.runtime, org.jboss.tools.common, org.jboss.tools.common.model -Bundle-Version: 3.3.0.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/pom.xml =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/pom.xml 2010-12-15 10:07:40 UTC (rev 27495) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/pom.xml 2010-12-15 10:13:35 UTC (rev 27496) @@ -8,6 +8,6 @@ </parent> <groupId>org.jboss.tools.hibernatetools.plugins</groupId> <artifactId>org.jboss.tools.hibernate.xml</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27495 - in trunk/deltacloud/tests/org.jboss.tools.deltacloud.test: src/org/jboss/tools/internal/deltacloud/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-15 05:07:40 -0500 (Wed, 15 Dec 2010) New Revision: 27495 Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/DeltaCloudTestSuite.launch trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java Log: [JBIDE-7594] * corrected scheduling rules to have correct blocking across the scheduling class hierarchy * created #createSecurePasswordStore to be able to fake store in tests * created tests for all scheduling rules Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/DeltaCloudTestSuite.launch =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/DeltaCloudTestSuite.launch (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/DeltaCloudTestSuite.launch 2010-12-15 10:07:40 UTC (rev 27495) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.integration,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.usage,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding,org.jboss.tools.gwt.core,org.eclipse.epp.usagedata.ui,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.internal.deltacloud.test.DeltaCloudTestSuite"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.deltacloud.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.sdk.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.compare@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.resources@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.servlet@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jface@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.e! clipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.console@default:default,org.eclipse.debug.ui@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.swt@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.osgi@-1:tru! e,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk! .core.re factoring@default:default,org.eclipse.core.jobs@default:default,com.ibm.icu@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.validation@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.search@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui.workbench.texteditor@defa! ult:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.editors@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.forms@default:default,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security@default:default,javax.xml@default:default,org.eclipse.help@default:default,org.apache.xml.serializer@default:default,org.apache.xerces@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.variables@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ant.core@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.runtime.compatibility.re! gistry@default:false,org.eclipse.core.databinding.observable@d! efault:d efault,org.eclipse.team.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.compare.core@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/DeltaCloudTestSuite.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2010-12-15 10:07:40 UTC (rev 27495) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.internal.deltacloud.test; + +import org.jboss.tools.internal.deltacloud.test.core.job.SchedulingRulesTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * @author Andre Dietisheim + */ +(a)RunWith(Suite.class) +(a)Suite.SuiteClasses({ + SchedulingRulesTest.class +}) +public class DeltaCloudTestSuite { + +} Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27494 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-15 05:04:05 -0500 (Wed, 15 Dec 2010) New Revision: 27494 Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java Log: [JBIDE-7594] * corrected scheduling rules to have correct blocking across the scheduling class hierarchy * created #createSecurePasswordStore to be able to fake store in tests * created tests for all scheduling rules Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java 2010-12-15 10:01:11 UTC (rev 27493) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java 2010-12-15 10:04:05 UTC (rev 27494) @@ -173,7 +173,8 @@ private Instance createInstance() throws IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException { - Constructor<Instance> constructor = (Constructor<Instance>) Instance.class.getDeclaredConstructor(null); + Constructor<Instance> constructor = + (Constructor<Instance>) Instance.class.getDeclaredConstructor((Class<?>) null); constructor.setAccessible(true); return constructor.newInstance(); }

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27493 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-15 05:01:11 -0500 (Wed, 15 Dec 2010) New Revision: 27493 Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ProfileMockIntegrationTest.launch Log: [JBIDE-7594] * corrected scheduling rules to have correct blocking across the scheduling class hierarchy * created #createSecurePasswordStore to be able to fake store in tests * created tests for all scheduling rules Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ProfileMockIntegrationTest.launch =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ProfileMockIntegrationTest.launch 2010-12-15 09:55:06 UTC (rev 27492) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ProfileMockIntegrationTest.launch 2010-12-15 10:01:11 UTC (rev 27493) @@ -12,14 +12,14 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.usage,org.jboss.tools.usage.test,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests,org.jruby.jruby"/> +<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.jboss.tools.common,org.jboss.tools.deltacloud.docs,org.jboss.tools.usage,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding,org.eclipse.epp.usagedata.ui,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java"/> +<listEntry value="/org.jboss.tools.deltacloud.test"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> +<listEntry value="4"/> </listAttribute> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> @@ -37,8 +37,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.debug.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.commands@default:default,org.eclipse.emf.common@default:default,org.eclipse.jface.text@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.databinding@default:default,org.hamcrest.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui.editors@default:default,org.eclipse.search@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.data! binding.observable@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.compare@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.workbench@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.apache.xml.serializer@default:default,org.eclipse.core.databinding.property@default:default,javax.servlet@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jface@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.navigator.resources@default:defau! lt,com.instantiations.designer.jdt.fragment@default:false,org.! eclipse. compare.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.apache.xml.resolver@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ant.core@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.ecore.change@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.resources@default:default,javax.xml@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.wst.xml.core@default:def! ault,org.eclipse.wst.common.emf@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.debug.core@default:default,org.eclipse.text@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.views@default:default,org.eclipse.swt@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ecf.identity@default:default,org.eclipse.jem.util@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.app@default:default,org.eclipse.wst.common.emfworkbench.integ! ration@default:default,org.apache.xerces@default:default,org.e! clipse.w st.sse.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.help@default:default,org.eclipse.ui.console@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.runtime.compatibility.registry@default:false"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.deltacloud.core@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.compare@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.resources@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.servlet@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jface@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.e! clipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.console@default:default,org.eclipse.debug.ui@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.swt@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.osgi@-1:tru! e,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk! .core.re factoring@default:default,org.eclipse.core.jobs@default:default,com.ibm.icu@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.validation@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.search@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui.workbench.texteditor@defa! ult:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.editors@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.forms@default:default,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security@default:default,javax.xml@default:default,org.eclipse.help@default:default,org.apache.xml.serializer@default:default,org.apache.xerces@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.variables@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ant.core@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.runtime.compatibility.re! gistry@default:false,org.eclipse.core.databinding.observable@d! efault:d efault,org.eclipse.team.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.compare.core@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.gwt.ui@default:default,org.jboss.tools.deltacloud.core@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch 2010-12-15 10:01:11 UTC (rev 27493) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/SchedulingRulesTest"/> +<booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.integration,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.usage,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding,org.jboss.tools.gwt.core,org.eclipse.epp.usagedata.ui,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.internal.deltacloud.test.core.job.SchedulingRulesTest"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.deltacloud.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.sdk.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.compare@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.resources@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.servlet@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jface@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.e! clipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.console@default:default,org.eclipse.debug.ui@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.swt@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.osgi@-1:tru! e,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk! .core.re factoring@default:default,org.eclipse.core.jobs@default:default,com.ibm.icu@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.validation@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.search@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.preferences@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ui.workbench.texteditor@defa! ult:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.editors@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.forms@default:default,org.hamcrest.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security@default:default,javax.xml@default:default,org.eclipse.help@default:default,org.apache.xml.serializer@default:default,org.apache.xerces@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.variables@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ant.core@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.runtime.compatibility.re! gistry@default:false,org.eclipse.core.databinding.observable@d! efault:d efault,org.eclipse.team.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.compare.core@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/> +<booleanAttribute key="show_selected_only" value="false"/> +<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/SchedulingRulesTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27492 - in trunk/deltacloud: plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-15 04:55:06 -0500 (Wed, 15 Dec 2010) New Revision: 27492 Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/CloudElementSchedulingRule.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/CloudSchedulingRule.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/InstanceSchedulingRule.java trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog Log: [JBIDE-7594] * corrected scheduling rules to have correct blocking across the scheduling class hierarchy * created #createSecurePasswordStore to be able to fake store in tests * created tests for all scheduling rules Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-12-15 08:34:42 UTC (rev 27491) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-12-15 09:55:06 UTC (rev 27492) @@ -1,3 +1,12 @@ +2010-12-15 André Dietisheim <adietish(a)redhat.com> + + * src/org/jboss/tools/deltacloud/core/job/InstanceSchedulingRule.java (isConflicting): + * src/org/jboss/tools/deltacloud/core/job/CloudSchedulingRule.java (isConflicting): + * src/org/jboss/tools/deltacloud/core/job/CloudElementSchedulingRule.java (isConflicting): + [JBIDE-7594] corrected scheduling rules to have correct blocking across the scheduling class hierarchy + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (createSecurePasswordStore): + [JBIDE-7594] created #createSecurePasswordStore to be able to fake store in tests + 2010-12-14 André Dietisheim <adietish(a)redhat.com> * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java (updateInstance): Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-15 08:34:42 UTC (rev 27491) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-15 09:55:06 UTC (rev 27492) @@ -92,7 +92,7 @@ this.name = name; this.username = username; this.type = type; - this.passwordStore = new SecurePasswordStore(new DeltaCloudPasswordStorageKey(name, username), password); + this.passwordStore = createSecurePasswordStore(name, username, password); this.client = createClient(name, url, username, passwordStore.getPassword()); imageFilter = createImageFilter(imageFilterRules); instanceFilter = createInstanceFilter(instanceFilterRules); @@ -148,7 +148,11 @@ || (thisObject == null && thatObject == null); } - private InternalDeltaCloudClient createClient(String name, String url, String username, String password) + protected SecurePasswordStore createSecurePasswordStore(String name2, String username2, String password) { + return new SecurePasswordStore(new DeltaCloudPasswordStorageKey(name, username), password); + } + + protected InternalDeltaCloudClient createClient(String name, String url, String username, String password) throws DeltaCloudException { try { return new DeltaCloudClientImpl(url, username, password); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-12-15 08:34:42 UTC (rev 27491) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-12-15 09:55:06 UTC (rev 27492) @@ -58,7 +58,7 @@ @XmlElement(name = "private_addresses") private AddressList privateAddresses; - private Instance() { + public Instance() { } @SuppressWarnings("unused") Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/CloudElementSchedulingRule.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/CloudElementSchedulingRule.java 2010-12-15 08:34:42 UTC (rev 27491) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/CloudElementSchedulingRule.java 2010-12-15 09:55:06 UTC (rev 27492) @@ -31,20 +31,27 @@ @Override public boolean isConflicting(ISchedulingRule rule) { - return super.isConflicting(rule) - && isOnSameElement(rule); + if (super.isConflicting(rule)) { + if (isCloudElementSchedulingRule(rule)) { + return isOnSameElement((CloudElementSchedulingRule) rule); + } + return true; + } + return false; } private boolean isOnSameElement(ISchedulingRule rule) { - if (CloudElementSchedulingRule.class.isAssignableFrom(rule.getClass())) { - return ((CloudElementSchedulingRule) rule).getCloudElement().equals(element); + if (isCloudElementSchedulingRule(rule)) { + return element.equals(((CloudElementSchedulingRule) rule).getCloudElement()); } else { - // this rules conflicts with a cloud rule which is not an element - // rule - return true; + return false; } } + private boolean isCloudElementSchedulingRule(ISchedulingRule rule) { + return CloudElementSchedulingRule.class.isAssignableFrom(rule.getClass()); + } + private CLOUDELEMENT getCloudElement() { return element; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/CloudSchedulingRule.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/CloudSchedulingRule.java 2010-12-15 08:34:42 UTC (rev 27491) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/CloudSchedulingRule.java 2010-12-15 09:55:06 UTC (rev 27492) @@ -54,9 +54,11 @@ return cloud; } + @Override public String toString() { return new StringBuilder() - .append("[InstanceSchedulingRule ") + .append("[CloudSchedulingRule ") + .append("@").append(System.identityHashCode(this)).append(" ") .append("cloud :\"") .append(getCloud().getName()) .append("\"") Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/InstanceSchedulingRule.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/InstanceSchedulingRule.java 2010-12-15 08:34:42 UTC (rev 27491) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/InstanceSchedulingRule.java 2010-12-15 09:55:06 UTC (rev 27492) @@ -32,23 +32,28 @@ @Override public boolean isConflicting(ISchedulingRule rule) { - return super.isConflicting(rule) - && isOnSameInstance(rule); - } - - private boolean isOnSameInstance(ISchedulingRule rule) { - if (InstanceSchedulingRule.class.isAssignableFrom(rule.getClass())) { - return instance.equals(((InstanceSchedulingRule) rule).getInstance()); - } else { - // this rules conflicts with a cloud element rule which is not an instance rule + if (super.isConflicting(rule)) { + if (isInstanceSchedulingRule(rule)) { + return isOnSameInstance((InstanceSchedulingRule) rule); + } return true; } + return false; } - + + private boolean isOnSameInstance(InstanceSchedulingRule rule) { + return instance.equals(((InstanceSchedulingRule) rule).getInstance()); + } + + private boolean isInstanceSchedulingRule(ISchedulingRule rule) { + return InstanceSchedulingRule.class.isAssignableFrom(rule.getClass()); + } + protected DeltaCloudInstance getInstance() { return instance; } + @Override public String toString() { return new StringBuilder() .append("[InstanceSchedulingRule ") Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog 2010-12-15 08:34:42 UTC (rev 27491) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog 2010-12-15 09:55:06 UTC (rev 27492) @@ -1,3 +1,8 @@ +2010-12-15 André Dietisheim <adietish(a)redhat.com> + + * src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java: + [JBIDE-7594] created tests for all scheduling rules + 2010-11-19 André Dietisheim <adietish(a)redhat.com> * src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceMockIntegrationTest.java: Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java 2010-12-15 09:55:06 UTC (rev 27492) @@ -0,0 +1,142 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.internal.deltacloud.test.core.job; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudException; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.deltacloud.core.SecurePasswordStore; +import org.jboss.tools.deltacloud.core.client.Instance; +import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob; +import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT; +import org.jboss.tools.deltacloud.core.job.CloudElementSchedulingRule; +import org.jboss.tools.deltacloud.core.job.CloudSchedulingRule; +import org.jboss.tools.deltacloud.core.job.InstanceSchedulingRule; +import org.junit.Before; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class SchedulingRulesTest { + + private DeltaCloudFake cloudFake; + private Instance instanceFake; + private DeltaCloudInstance deltaCloudInstanceFake; + + @Before + public void setUp() throws DeltaCloudException { + this.cloudFake = new DeltaCloudFake(); + this.instanceFake = new Instance(); + this.deltaCloudInstanceFake = new DeltaCloudInstance(cloudFake, instanceFake); + } + + @Test + public void instanceRule2InstanceRule() throws DeltaCloudException { + InstanceSchedulingRule instanceRule = + new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); + assertTrue(instanceRule.isConflicting(instanceRule)); + } + + @Test + public void instanceRule2CloudElementInstanceRule() throws DeltaCloudException { + InstanceSchedulingRule instanceRule = new InstanceSchedulingRule( + cloudFake, AbstractCloudElementJob.CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); + CloudElementSchedulingRule cloudRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); + assertTrue(instanceRule.isConflicting(cloudRule)); + } + + @Test + public void instanceRule2CloudElementImageRule() throws DeltaCloudException { + InstanceSchedulingRule instanceRule = + new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); + CloudElementSchedulingRule cloudRule = new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES); + assertFalse(instanceRule.isConflicting(cloudRule)); + } + + @Test + public void instanceRule2CloudRule() throws DeltaCloudException { + InstanceSchedulingRule instanceRule = + new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake); + CloudSchedulingRule cloudRule = new CloudSchedulingRule(cloudFake); + assertTrue(instanceRule.isConflicting(cloudRule)); + } + + @Test + public void cloudInstancesRule2CloudInstancesRule() throws DeltaCloudException { + CloudElementSchedulingRule cloudInstancesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); + assertTrue(cloudInstancesRule.isConflicting(cloudInstancesRule)); + } + + @Test + public void cloudInstancesRule2CloudImageRule() throws DeltaCloudException { + CloudElementSchedulingRule cloudInstancesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); + CloudElementSchedulingRule cloudImagesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES); + assertFalse(cloudInstancesRule.isConflicting(cloudImagesRule)); + } + + @Test + public void cloudInstancesRule2CloudRule() throws DeltaCloudException { + CloudElementSchedulingRule cloudInstancesRule = + new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES); + CloudSchedulingRule cloudRule = new CloudSchedulingRule(cloudFake); + assertTrue(cloudInstancesRule.isConflicting(cloudRule)); + } + + private static class DeltaCloudFake extends DeltaCloud { + + public DeltaCloudFake() throws DeltaCloudException { + super("mock", "http://dummy.org", "dummyUser", "dummyPassword"); + } + + @Override + protected SecurePasswordStore createSecurePasswordStore(String name, String username, String password) { + return new SecurePasswordStoreFake("dummyPassword"); + } + } + + private static class SecurePasswordStoreFake extends SecurePasswordStore { + + private String password; + + public SecurePasswordStoreFake(String password) { + super(null, password); + this.password = password; + } + + @Override + public String getPassword() throws DeltaCloudException { + return password; + } + + @Override + public void setPassword(String password) throws DeltaCloudException { + this.password = password; + } + + @Override + public void update(IStorageKey key, String password) throws DeltaCloudException { + setPassword(password); + } + + @Override + public void remove() throws DeltaCloudException { + } + + } +} Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27491 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-15 03:34:42 -0500 (Wed, 15 Dec 2010) New Revision: 27491 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudPasswordStorageKey.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/SecurePasswordStore.java Log: cleanup Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudPasswordStorageKey.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudPasswordStorageKey.java 2010-12-15 03:27:56 UTC (rev 27490) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudPasswordStorageKey.java 2010-12-15 08:34:42 UTC (rev 27491) @@ -14,7 +14,7 @@ import org.jboss.tools.deltacloud.core.SecurePasswordStore.IStorageKey; /** - * Implements a key to be used to store keywords with. + * Implements a key to be used to store values in the preferences store. * * @author Andre Dietisheim * Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/SecurePasswordStore.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/SecurePasswordStore.java 2010-12-15 03:27:56 UTC (rev 27490) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/SecurePasswordStore.java 2010-12-15 08:34:42 UTC (rev 27491) @@ -16,14 +16,11 @@ /** * @author Andre Dietisheim - * - * TODO: remove DeltaCloudException */ public class SecurePasswordStore { public static interface IStorageKey { public String getKey(); - public boolean equals(IStorageKey key); } @@ -47,6 +44,7 @@ try { return this.password = getFromPreferences(storageKey); } catch (StorageException e) { + // TODO: internationalize strings throw new DeltaCloudException("Could get password", e); } } @@ -58,12 +56,12 @@ public void update(IStorageKey key, String password) throws DeltaCloudException { if (!storageKey.equals(key) - || hasPasswordChanged(password)) { + || isPasswordChanged(password)) { storeInPreferences(this.password = password, this.storageKey = key); } } - private boolean hasPasswordChanged(String password) { + private boolean isPasswordChanged(String password) { if (this.password == null && password == null) { return false; } else { @@ -76,6 +74,7 @@ public void remove() throws DeltaCloudException { ISecurePreferences node = getNode(storageKey); if (node == null) { + // TODO: internationalize strings throw new DeltaCloudException("Could not remove password"); } node.clear();

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27490 - trunk/documentation/guides/JBDS_Release_Notes/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2010-12-14 22:27:56 -0500 (Tue, 14 Dec 2010) New Revision: 27490 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated with new fixed issues Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-12-15 02:04:30 UTC (rev 27489) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-12-15 03:27:56 UTC (rev 27490) @@ -20,7 +20,7 @@ </para> </formalpara> <formalpara> - <title>Contexts and Dependency Injection (CDI)</title> + <title>Contexts and Dependency Injection (CDI)</title> <para> <itemizedlist> <listitem> @@ -78,6 +78,16 @@ Previously, <productname>CDI Tools</productname> did not recognize these custom decorators and interceptors, which caused issues including injection points in classes not annotated using <property>@Decorator</property> being flagged as a definition error and problems with the <productname>OpenOn</productname> feature. <productname>CDI Tools</productname> now correctly recognizes these custom decorators/interceptors. </para> </listitem> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-7672">JBIDE-7672</ulink>: The quick fix for session bean and EJB non-static methods has been updated. This update ensures that when the method is annotated with <property>@Disposes</property> or <property>@Observes</property> respectively, the quick fix changes the method to correctly be, a business method. + </para> + </listitem> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-7669">JBIDE-7669</ulink>: The quick fix for <property>@Produces</property> annotation has been updated to suggest the addition of <property>@LocalBean</property> annotation when used in a session bean class. When specified, the <property>@LocalBean</property> annotation ensures the current class and subsequent methods are private instead of public (unless a method is specifically annotated otherwise). + </para> + </listitem> <listitem> <para> <ulink url="http://jira.jboss.com/jira/browse/JBIDE-7025">JBIDE-7025</ulink>: OpenOn support has been added for the <filename>beans.xml</filename> editor. OpenOn support allows you to easily navigate around your project without the use of the <guilabel>Package Explorer</guilabel> or <guilabel>Project Explorer</guilabel>. This is achieved by using the class and method names in your code as links to those code segments.

14 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r27489 - trunk/documentation/guides/JBDS_Release_Notes/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2010-12-14 21:04:30 -0500 (Tue, 14 Dec 2010) New Revision: 27489 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated with fixes for tags Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml =================================================================== --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-12-15 01:54:01 UTC (rev 27488) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-12-15 02:04:30 UTC (rev 27489) @@ -27,6 +27,7 @@ <para> <ulink url="http://jira.jboss.com/jira/browse/JBIDE-7842">JBIDE-7842</ulink>: A new wizard has been added for the <filename>beans.xml</filename> file. This new wizard uses the <guilabel>New File</guilabel> wizard as a foundation, setting the <guilabel>File Name</guilabel> input field set to <filename>beans.xml</filename> and the <guilabel>Parent Folder</guilabel> to the projects <filename>beans.xml</filename> default location (if determinable). </para> + </listitem> <listitem> <para> <ulink url="https://jira.jboss.org/browse/JBIDE-7823">JBIDE-7823</ulink>: A new option has been added to the <guilabel>Dynamic Web Project</guilabel> wizard which enables support for <productname>CDI</productname>. The new option can be accessed using the following steps: @@ -60,7 +61,7 @@ <para> <ulink url="http://jira.jboss.com/jira/browse/JBIDE-7803">JBIDE-7803</ulink>: After creating a project for the Web Tools Platform (WTP), a user would have to manually create the <filename>beans.xml</filename> file that will located at <filename>WEB-INF/beans.xml</filename> for WAR files and <filename>META-INF/beans.xml</filename> for EJB files. The CDI facet has now been updated to ensure that an empty <filename>beans.xml</filename> file is generated in the correct locations during the creation of a WTP project when the <guilabel>Generate beans.xml</guilabel> box is checked. This update helps to ensure the necessary CDI file exists for the WTP project. </para> - <listitem> + </listitem> <listitem> <para> <ulink url="https://jira.jboss.org/browse/JBIDE-7721">JBIDE-7721</ulink>: It is possible to declare custom decorators and interceptors without using the @Decorator and @Interceptor annotations, like so: @@ -228,14 +229,13 @@ and press <guibutton>Next</guibutton>. The interceptor wizard declares an interceptor for an existing web bean, and implements <property>@Interceptor</property> annotation. </para> </listitem> - </listitem> <listitem> <para> <ulink url="https://jira.jboss.org/browse/JBIDE-2708">JBIDE-2708</ulink>: The <productname>CDI Validator</productname> now implements all the definitions, non-portable behaviors and deployment problems mentioned in <ulink url="http://docs.jboss.org/cdi/spec/1.0/html/index.html">JSR-299</ulink> with the exception of those that can not be tracked at design time. You can view the complete list of implemented rules in the <ulink url="https://anonsvn.jboss.org/repos/jbosstools/trunk/cdi/plugins/org.jboss.to...">errorList.txt</ulink> file. </para> <para> The severity levels for optional CDI Validation rules can be set 2 ways: - <orderedlist> + <itemizedlist> <listitem> <para> Globally for all projects by selecting <menuchoice> @@ -256,7 +256,7 @@ </menuchoice> </para> </listitem> - </orderedlist> + </itemizedlist> </para> </listitem> <listitem>

14 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2010