JBoss Tools SVN: r31972 - branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui.
by jbosstools-commits@lists.jboss.org
Author: bbrodt
Date: 2011-06-09 13:12:14 -0400 (Thu, 09 Jun 2011)
New Revision: 31972
Modified:
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELTabbedPropertySheetPage.java
Log:
https://issues.jboss.org/browse/JBIDE-8829
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELTabbedPropertySheetPage.java
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELTabbedPropertySheetPage.java 2011-06-09 17:09:27 UTC (rev 31971)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELTabbedPropertySheetPage.java 2011-06-09 17:12:14 UTC (rev 31972)
@@ -15,6 +15,7 @@
import java.util.Iterator;
import java.util.Set;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.EditPart;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.text.ITextSelection;
@@ -115,12 +116,64 @@
if (o instanceof EditPart) {
o = ((EditPart)o).getModel();
}
+ // https://issues.jboss.org/browse/JBIDE-8829
+ if (editor.getMultipageEditor().getActiveEditor() == editor.getMultipageEditor().getTextEditor()) {
+ // the selection came from the Source view of this multipage editor so we have to
+ // be careful here: if a selection does not have a corresponding property sheet page
+ // (e.g. a <copy>, <from>. <to>, etc.) then traverse the selection's ancestors to find
+ // an element which DOES have a property sheet page associated with it.
+ while (o!=null && o instanceof EObject && !hasPropertySheetPage(o)) {
+ o = ((EObject)o).eContainer();
+ }
+ }
newSet.add(o);
}
}
return new StructuredSelection(newSet.toArray(new Object[newSet.size()]));
}
+ /**
+ * Check if the model object has a property sheet page.
+ * @param o
+ * @return true if the model object has an associated property sheet page
+ * @see https://issues.jboss.org/browse/JBIDE-8829
+ */
+ private boolean hasPropertySheetPage(Object o) {
+ return
+ o instanceof org.eclipse.bpel.model.Activity ||
+ o instanceof org.eclipse.bpel.model.Assign ||
+ o instanceof org.eclipse.bpel.model.Catch ||
+ o instanceof org.eclipse.bpel.model.CatchAll ||
+ o instanceof org.eclipse.bpel.model.CompensateScope ||
+ o instanceof org.eclipse.bpel.model.CorrelationSet ||
+ o instanceof org.eclipse.bpel.model.Else ||
+ o instanceof org.eclipse.bpel.model.ElseIf ||
+ o instanceof org.eclipse.bpel.model.Empty ||
+ o instanceof org.eclipse.bpel.model.ForEach ||
+ o instanceof org.eclipse.bpel.model.If ||
+ o instanceof org.eclipse.bpel.model.Invoke ||
+ o instanceof org.eclipse.bpel.model.Link ||
+ o instanceof org.eclipse.bpel.model.MessageExchange ||
+ o instanceof org.eclipse.bpel.model.MessageExchanges ||
+ o instanceof org.eclipse.bpel.model.OnAlarm ||
+ o instanceof org.eclipse.bpel.model.OnEvent ||
+ o instanceof org.eclipse.bpel.model.OnMessage ||
+ o instanceof org.eclipse.bpel.model.PartnerLink ||
+ o instanceof org.eclipse.bpel.model.PartnerLinks ||
+ o instanceof org.eclipse.bpel.model.Pick ||
+ o instanceof org.eclipse.bpel.model.Process ||
+ o instanceof org.eclipse.bpel.model.Receive ||
+ o instanceof org.eclipse.bpel.model.RepeatUntil ||
+ o instanceof org.eclipse.bpel.model.Reply ||
+ o instanceof org.eclipse.bpel.model.Scope ||
+ o instanceof org.eclipse.bpel.model.Throw ||
+ o instanceof org.eclipse.bpel.model.Validate ||
+ o instanceof org.eclipse.bpel.model.Variable ||
+ o instanceof org.eclipse.bpel.model.Variables ||
+ o instanceof org.eclipse.bpel.model.Wait ||
+ o instanceof org.eclipse.bpel.model.While;
+ }
+
protected TabbedPropertyRegistry getRegistry() {
if (registry == null) {
// TODO: hack - use reflection to get the field - it should be API in the super class
14 years, 10 months
JBoss Tools SVN: r31971 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-09 13:09:27 -0400 (Thu, 09 Jun 2011)
New Revision: 31971
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/
Log:
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test
___________________________________________________________________
Added: svn:ignore
+ target
14 years, 10 months
JBoss Tools SVN: r31970 - in branches/jbosstools-3.2.x/xulrunner/features: org.mozilla.xulrunner.feature and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-09 13:07:39 -0400 (Thu, 09 Jun 2011)
New Revision: 31970
Modified:
branches/jbosstools-3.2.x/xulrunner/features/org.mozilla.xpcom.feature/feature.xml
branches/jbosstools-3.2.x/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
Log:
fix copyrights
Modified: branches/jbosstools-3.2.x/xulrunner/features/org.mozilla.xpcom.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/xulrunner/features/org.mozilla.xpcom.feature/feature.xml 2011-06-09 16:45:57 UTC (rev 31969)
+++ branches/jbosstools-3.2.x/xulrunner/features/org.mozilla.xpcom.feature/feature.xml 2011-06-09 17:07:39 UTC (rev 31970)
@@ -9,8 +9,7 @@
XPCOM Feature
</description>
- <copyright>
- (c) 2010 JBoss by Red Hat
+ <copyright>Copyright (c) 2010-2011 Red Hat, Inc.
</copyright>
<license>
Modified: branches/jbosstools-3.2.x/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-06-09 16:45:57 UTC (rev 31969)
+++ branches/jbosstools-3.2.x/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-06-09 17:07:39 UTC (rev 31970)
@@ -12,8 +12,7 @@
XulRunner Feature
</description>
- <copyright>
- (c) 2010 JBoss by Red Hat
+ <copyright>Copyright (c) 2010-2011 Red Hat, Inc.
</copyright>
<license>
14 years, 10 months
JBoss Tools SVN: r31969 - trunk/deltacloud/tests.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-09 12:45:57 -0400 (Thu, 09 Jun 2011)
New Revision: 31969
Modified:
trunk/deltacloud/tests/pom.xml
Log:
[JBIDE-9105] removed org.jboss.tools.deltacloud.client and replaced by a jarred version of org.apache.deltacloud java client (it's the same code, but it's now hosted in the deltacloud project
Modified: trunk/deltacloud/tests/pom.xml
===================================================================
--- trunk/deltacloud/tests/pom.xml 2011-06-09 16:43:34 UTC (rev 31968)
+++ trunk/deltacloud/tests/pom.xml 2011-06-09 16:45:57 UTC (rev 31969)
@@ -13,6 +13,7 @@
<name>deltacloud.tests</name>
<packaging>pom</packaging>
<modules>
+ <module>org.jboss.tools.deltacloud.test</module>
</modules>
</project>
14 years, 10 months
JBoss Tools SVN: r31968 - in trunk: xulrunner/features/org.mozilla.xpcom.feature and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-09 12:43:34 -0400 (Thu, 09 Jun 2011)
New Revision: 31968
Modified:
trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml
trunk/xulrunner/features/org.mozilla.xpcom.feature/feature.xml
trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBDS-1636
Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml
===================================================================
--- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-06-09 16:39:35 UTC (rev 31967)
+++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-06-09 16:43:34 UTC (rev 31968)
@@ -6,7 +6,7 @@
</description>
<copyright>
- Copyright (c) 2011 JBoss by Red Hat and Exadel, Inc.
+ Copyright (c) 2011 Red Hat, Inc. and Exadel, Inc.
Distributed under license by JBoss by Red Hat. All rights reserved.
This program is made available under the terms of the
Eclipse Public License v1.0 which accompanies this distribution,
@@ -16,7 +16,7 @@
</copyright>
<license>
- JBoss by Red Hat licenses these features and plugins to you under
+ 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
Modified: trunk/xulrunner/features/org.mozilla.xpcom.feature/feature.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xpcom.feature/feature.xml 2011-06-09 16:39:35 UTC (rev 31967)
+++ trunk/xulrunner/features/org.mozilla.xpcom.feature/feature.xml 2011-06-09 16:43:34 UTC (rev 31968)
@@ -10,7 +10,7 @@
</description>
<copyright>
- (c) 2011 JBoss by Red Hat
+ Copyright (c) 2010-2011 Red Hat, Inc.
</copyright>
<license>
Modified: trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-06-09 16:39:35 UTC (rev 31967)
+++ trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2011-06-09 16:43:34 UTC (rev 31968)
@@ -13,7 +13,7 @@
</description>
<copyright>
- (c) 2011 JBoss by Red Hat
+ Copyright (c) 2010-2011 Red Hat, Inc.
</copyright>
<license>
14 years, 10 months
JBoss Tools SVN: r31967 - in trunk/deltacloud/tests: org.jboss.tools.deltacloud.test and 16 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-09 12:39:35 -0400 (Thu, 09 Jun 2011)
New Revision: 31967
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.classpath
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.project
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/net.sf.jautodoc.prefs
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/org.eclipse.jdt.core.prefs
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/org.eclipse.jdt.ui.prefs
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/build.properties
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudIntegrationTestSuite.java
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/context/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudMockIntegrationTest.java
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/CloudSchedulingRulesTest.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/DeltaCloudFake.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerFake.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/StringsPreferenceValueTest.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/utils/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/utils/URIUtilsTest.java
Log:
[JBIDE-9105] removed org.jboss.tools.deltacloud.client and replaced by a jarred version of org.apache.deltacloud java client (it's the same code, but it's now hosted in the deltacloud project
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.classpath
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.classpath (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.classpath 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.project
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.project (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.project 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.deltacloud.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/net.sf.jautodoc.prefs
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/net.sf.jautodoc.prefs (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/net.sf.jautodoc.prefs 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,6 @@
+#Fri Oct 15 09:34:41 CEST 2010
+add_header=true
+eclipse.preferences.version=1
+header_text=/*******************************************************************************\n * Copyright (c) 2010 Red Hat, Inc.\n * Distributed under license by Red Hat, Inc. All rights reserved.\n * This program is made available under the terms of the\n * Eclipse Public License v1.0 which accompanies this distribution,\n * and is available at http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * Red Hat, Inc. - initial API and implementation\n ******************************************************************************/
+project_specific_settings=true
+replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/org.eclipse.jdt.core.prefs 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,276 @@
+#Fri Oct 15 09:34:40 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/org.eclipse.jdt.ui.prefs (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/.settings/org.eclipse.jdt.ui.prefs 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,4 @@
+#Fri Oct 15 09:34:40 CEST 2010
+eclipse.preferences.version=1
+formatter_profile=_Eclipse [built-in] extended
+formatter_settings_version=11
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,32 @@
+2011-03-12 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ [JBIDE-8562] extracted client tests to their own plugin
+
+2011-01-11 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/internal/deltacloud/test/core/client/ImageDomUnmarshallingTest.java:
+ [JBIDE-7935] created tests for image unmarshalling
+ * src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceDomUnmarshallingTest.java:
+ [JBIDE-7935] created tests for instance unmarshalling
+
+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:
+ * src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java:
+ [JBIDE-7678] renamed State to InstanceState, added property isRunning, testing for ShowInRemoteSystemExplorerHandler
+
+2010-10-21 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/internal/deltacloud/test/DeltaCloudMockClientIntegrationTest.java
+ [JBIDE-7371] (reports404OnUnknownResource): added test for reporting 404 on bad requests
+
+2010-10-20 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/internal/deltacloud/test/DeltaCloudClientTest.java:
+ * src/org/jboss/tools/internal/deltacloud/test/fakes/ServerFake.java:
+ [JBIDE-7371] tests for server type implemented
\ No newline at end of file
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/META-INF/MANIFEST.MF 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: org.jboss.tools.deltacloud.test
+Bundle-Version: 1.0.1.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+ org.jboss.tools.common;bundle-version="[3.2.0,4.0.0)",
+ org.jboss.tools.deltacloud.core;bundle-version="[0.2.0,1.0.0)",
+ org.jboss.tools.deltacloud.ui;bundle-version="0.1.0",
+ org.junit;bundle-version="[4.8.0,5.0.0)"
+Bundle-ClassPath: .
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/build.properties
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/build.properties (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/build.properties 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ ChangeLog
+src.includes = ChangeLog,\
+ pom.xml
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.deltacloud</groupId>
+ <artifactId>tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.deltacloud.tests</groupId>
+ <artifactId>org.jboss.tools.deltacloud.test</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+ <properties>
+ <emma.filter />
+ <emma.instrument.bundles />
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <excludes>
+ <exclude>**/IntegrationTestSuite*.class</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudIntegrationTestSuite.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudIntegrationTestSuite.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudIntegrationTestSuite.java 2011-06-09 16:39:35 UTC (rev 31967)
@@ -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.DeltaCloudMockIntegrationTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Andre Dietisheim
+ */
+(a)RunWith(Suite.class)
+(a)Suite.SuiteClasses({
+ DeltaCloudMockIntegrationTest.class
+})
+public class DeltaCloudIntegrationTestSuite {
+
+}
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 2011-06-09 16:39:35 UTC (rev 31967)
@@ -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.CloudSchedulingRulesTest;
+import org.jboss.tools.internal.deltacloud.test.ui.preferences.StringsPreferenceValueTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Andre Dietisheim
+ */
+(a)RunWith(Suite.class)
+(a)Suite.SuiteClasses({
+ CloudSchedulingRulesTest.class,
+ StringsPreferenceValueTest.class})
+public class DeltaCloudTestSuite {
+}
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/context/MockIntegrationTestContext.java 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * 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.context;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.apache.deltacloud.client.DeltaCloudClient;
+import org.apache.deltacloud.client.DeltaCloudClientException;
+import org.apache.deltacloud.client.DeltaCloudClientImpl;
+import org.apache.deltacloud.client.Image;
+import org.apache.deltacloud.client.Instance;
+import org.apache.deltacloud.client.StateAware.State;
+
+/**
+ * A class that holds the integration test context
+ *
+ * @author Andre Dietisheim
+ *
+ */
+public class MockIntegrationTestContext {
+
+ public static final String DELTACLOUD_URL = "http://localhost:3001";
+ public static final String SERVERFAKE_URL = "http://localhost:3002";
+ public static final String DELTACLOUD_USER = "mockuser";
+ public static final String DELTACLOUD_PASSWORD = "mockpassword";
+
+ private DeltaCloudClient client;
+ private Instance testInstance;
+
+ private ExecutorService executor = Executors.newSingleThreadExecutor();
+
+ public void setUp() throws IOException, DeltaCloudClientException {
+ ensureDeltaCloudIsRunning();
+ this.client = new DeltaCloudClientImpl(DELTACLOUD_URL, DELTACLOUD_USER, DELTACLOUD_PASSWORD);
+ Image image = getFirstImage(client);
+ this.testInstance = createTestInstance(image);
+ }
+
+ private Instance createTestInstance(Image image) throws DeltaCloudClientException {
+ assertNotNull(image);
+ Instance instance = client.createInstance(image.getId());
+ return instance;
+ }
+
+ public void ensureDeltaCloudIsRunning() throws IOException {
+ try {
+ URLConnection connection = new URL(DELTACLOUD_URL).openConnection();
+ connection.connect();
+ } catch (ConnectException e) {
+ fail("Local DeltaCloud instance is not running. Please start a DeltaCloud instance before running these tests.");
+ }
+ }
+
+ public DeltaCloudClient getClient() {
+ return client;
+ }
+
+ public Instance getTestInstance() {
+ return testInstance;
+ }
+
+ public Image getFirstImage(DeltaCloudClient client) throws DeltaCloudClientException {
+ List<Image> images = client.listImages();
+ assertTrue(images.size() >= 1);
+ Image image = images.get(0);
+ return image;
+ }
+
+ public Instance getInstanceById(String id, DeltaCloudClient client) throws DeltaCloudClientException {
+ for (Instance availableInstance : client.listInstances()) {
+ if (id.equals(availableInstance.getId())) {
+ return availableInstance;
+ }
+ }
+ return null;
+ }
+
+ public void tearDown() {
+ quietlyDestroyInstance(testInstance);
+ executor.shutdownNow();
+ }
+
+ public void quietlyDestroyInstance(Instance instance) {
+ if (instance != null) {
+ try {
+ if (instance.getState() == Instance.State.RUNNING) {
+ instance.stop(client);
+ }
+ instance.destroy(client);
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
+
+ /**
+ * Waits for an instance to get the given state for a given timeout.
+ *
+ * @param instanceId
+ * the id of the instance to watch
+ * @param state
+ * the state to wait for
+ * @param timeout
+ * the timeout to wait for
+ * @return <code>true</code>, if the state was reached while waiting for
+ * timeout, <code>false</code> otherwise
+ * @throws ExecutionException
+ * @throws InterruptedException
+ */
+ public boolean waitForInstanceState(final String instanceId, final State state, final long timeout)
+ throws InterruptedException, ExecutionException {
+ final long startTime = System.currentTimeMillis();
+ Callable<Boolean> waitingCallable = new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() throws Exception {
+ try {
+ while (System.currentTimeMillis() < startTime + timeout) {
+ if (client.listInstances(instanceId).getState() == state) {
+ return true;
+ }
+ Thread.sleep(200);
+ }
+ return false;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+ };
+ return executor.submit(waitingCallable).get();
+ }
+}
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudMockIntegrationTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudMockIntegrationTest.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/DeltaCloudMockIntegrationTest.java 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * 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;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.apache.deltacloud.client.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
+import org.jboss.tools.internal.deltacloud.test.context.MockIntegrationTestContext;
+import org.jboss.tools.internal.deltacloud.test.fakes.DeltaCloudFake;
+import org.jboss.tools.internal.deltacloud.test.fakes.ServerFake;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * An integration test that test the connection test method in DeltaCloud
+ *
+ * @author Andre Dietisheim
+ *
+ * @see DeltaCloud#testCredentials()
+ *
+ */
+public class DeltaCloudMockIntegrationTest {
+
+ private MockIntegrationTestContext testSetup;
+
+ @Before
+ public void setUp() throws IOException, DeltaCloudClientException {
+ this.testSetup = new MockIntegrationTestContext();
+ testSetup.setUp();
+ }
+
+ @After
+ public void tearDown() {
+ testSetup.tearDown();
+ }
+
+ @Test
+ public void testConnectionReportsFalseOnAuthFailure() throws MalformedURLException, DeltaCloudClientException,
+ DeltaCloudException {
+ ServerFake serverFake = setupServerFake("HTTP/1.1 401 Unauthorized\n\n\n");
+ try {
+ DeltaCloud deltaCloud = new DeltaCloudFake(
+ "http://localhost:" + ServerFake.DEFAULT_PORT,
+ "badUser",
+ "badPassword");
+ assertFalse(deltaCloud.testCredentials());
+ } finally {
+ serverFake.stop();
+ }
+ }
+
+ @Test(expected = DeltaCloudException.class)
+ public void testConnectionThrowsOnInternalServerError() throws MalformedURLException, DeltaCloudClientException, DeltaCloudException {
+ ServerFake serverFake = setupServerFake("HTTP/1.1 501 Some Error\ndummy dummy dummy\n\n");
+ try {
+ DeltaCloud deltaCloud =
+ new DeltaCloudFake("http://localhost:" + ServerFake.DEFAULT_PORT, "badUser", "badPassword");
+ deltaCloud.testCredentials();
+ } finally {
+ serverFake.stop();
+ }
+ }
+
+ private ServerFake setupServerFake(String response) throws MalformedURLException {
+ ServerFake serverFake = new ServerFake(response);
+ serverFake.start();
+ return serverFake;
+ }
+}
Added: 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 (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/job/CloudSchedulingRulesTest.java 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * 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.apache.deltacloud.client.Instance;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+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.jboss.tools.internal.deltacloud.test.fakes.DeltaCloudFake;
+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(instanceFake, cloudFake);
+ }
+
+ @Test
+ public void instanceRule2InstanceRule() throws DeltaCloudException {
+ InstanceSchedulingRule instanceRule =
+ new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake);
+ assertTrue(instanceRule.isConflicting(instanceRule));
+ }
+
+ @Test
+ public void instanceRule2CloudElementInstancesRule() throws DeltaCloudException {
+ InstanceSchedulingRule instanceRule = new InstanceSchedulingRule(
+ cloudFake, AbstractCloudElementJob.CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake);
+ CloudElementSchedulingRule cloudRule =
+ new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES);
+ assertTrue(instanceRule.isConflicting(cloudRule));
+ assertTrue(cloudRule.isConflicting(instanceRule));
+ }
+
+ @Test
+ public void instanceRule2CloudElementImagesRule() throws DeltaCloudException {
+ InstanceSchedulingRule instanceRule =
+ new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake);
+ CloudElementSchedulingRule cloudRule = new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES);
+ assertFalse(instanceRule.isConflicting(cloudRule));
+ assertFalse(cloudRule.isConflicting(instanceRule));
+ }
+
+ @Test
+ public void instanceRule2CloudRule() throws DeltaCloudException {
+ InstanceSchedulingRule instanceRule =
+ new InstanceSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES, deltaCloudInstanceFake);
+ CloudSchedulingRule cloudRule = new CloudSchedulingRule(cloudFake);
+ assertTrue(instanceRule.isConflicting(cloudRule));
+ assertTrue(cloudRule.isConflicting(instanceRule));
+ }
+
+ @Test
+ public void cloudElementInstancesRule2CloudInstancesRule() throws DeltaCloudException {
+ CloudElementSchedulingRule cloudInstancesRule =
+ new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES);
+ assertTrue(cloudInstancesRule.isConflicting(cloudInstancesRule));
+ }
+
+ @Test
+ public void cloudElementInstancesRule2CloudImageRule() throws DeltaCloudException {
+ CloudElementSchedulingRule cloudInstancesRule =
+ new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES);
+ CloudElementSchedulingRule cloudImagesRule =
+ new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES);
+ assertFalse(cloudInstancesRule.isConflicting(cloudImagesRule));
+ assertFalse(cloudImagesRule.isConflicting(cloudInstancesRule));
+ }
+
+ @Test
+ public void cloudElementInstancesRule2CloudRule() throws DeltaCloudException {
+ CloudElementSchedulingRule cloudInstancesRule =
+ new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.INSTANCES);
+ CloudSchedulingRule cloudRule = new CloudSchedulingRule(cloudFake);
+ assertTrue(cloudInstancesRule.isConflicting(cloudRule));
+ assertTrue(cloudRule.isConflicting(cloudInstancesRule));
+ }
+
+ @Test
+ public void cloudElementImagesRule2CloudImagesRule() throws DeltaCloudException {
+ CloudElementSchedulingRule cloudImagesRule =
+ new CloudElementSchedulingRule(cloudFake, CLOUDELEMENT.IMAGES);
+ assertTrue(cloudImagesRule.isConflicting(cloudImagesRule));
+ }
+}
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/DeltaCloudFake.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/DeltaCloudFake.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/DeltaCloudFake.java 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * 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.fakes;
+
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
+import org.jboss.tools.deltacloud.core.SecurePasswordStore;
+
+/**
+ * @author André Dietisheim
+ */
+public class DeltaCloudFake extends DeltaCloud {
+
+ public DeltaCloudFake() throws DeltaCloudException {
+ this("http://dummy.org", "aUser", "aPassword");
+ }
+
+ public DeltaCloudFake(String url, String username, String password) throws DeltaCloudException {
+ super("fake", url, username, password);
+ }
+
+ @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 {
+ }
+ }
+}
\ No newline at end of file
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerFake.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerFake.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerFake.java 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * 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.fakes;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @author André Dietisheim
+ */
+public class ServerFake {
+
+ public static final int DEFAULT_PORT = 3003;
+ private ExecutorService executor;
+ private int port;
+ private String response;
+ private ServerFakeSocket serverSocket;
+
+ public ServerFake(String response) {
+ this(DEFAULT_PORT, response);
+ }
+
+ public ServerFake(int port, String response) {
+ this.port = port;
+ this.response = response;
+ }
+
+ public void start() {
+ executor = Executors.newFixedThreadPool(1);
+ this.serverSocket = new ServerFakeSocket(port, response);
+ executor.submit(serverSocket);
+ }
+
+ public void stop() {
+ executor.shutdownNow();
+ serverSocket.shutdown();
+ }
+
+ private class ServerFakeSocket implements Runnable {
+ private String response;
+ private ServerSocket serverSocket;
+
+ private ServerFakeSocket(int port, String response) {
+
+ this.response = response;
+
+ try {
+ this.serverSocket = new ServerSocket(port);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void shutdown() {
+ try {
+ this.serverSocket.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void run() {
+ Socket socket;
+ try {
+ socket = serverSocket.accept();
+ OutputStream outputStream = socket.getOutputStream();
+ outputStream.write(response.getBytes());
+ outputStream.flush();
+ outputStream.close();
+ socket.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
\ No newline at end of file
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/StringsPreferenceValueTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/StringsPreferenceValueTest.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/preferences/StringsPreferenceValueTest.java 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * 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.ui.preferences;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jboss.tools.deltacloud.ui.preferences.StringsPreferenceValue;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class StringsPreferenceValueTest {
+
+ private static final char DELIMITER = ',';
+
+ private static class StringsPreferenceValueFake extends StringsPreferenceValue {
+
+ private String values = "";
+
+ public StringsPreferenceValueFake(char delimiter) {
+ super(delimiter, null, null);
+ }
+
+
+ @Override
+ protected void doStore(String value) {
+ this.values = value;
+ }
+
+ @Override
+ protected String doGet(String currentValue) {
+ if (currentValue == null || currentValue.equals("")) {
+ return values;
+ } else {
+ return currentValue;
+ }
+ }
+
+ }
+
+ private StringsPreferenceValue stringValues;
+
+ @Before
+ public void setUp() {
+ this.stringValues = new StringsPreferenceValueFake(DELIMITER);
+ }
+
+ @Test
+ public void canAddValues() {
+ stringValues.add("11");
+ stringValues.add("22");
+ assertEquals(2, stringValues.get().length);
+ stringValues.add("33");
+ assertEquals(3, stringValues.get().length);
+ }
+
+ @Test
+ public void identicalValueAreNotAdded() {
+ String value = "11";
+ stringValues.add(value);
+ stringValues.add(value);
+ assertEquals(1, stringValues.get().length);
+ }
+
+ @Test
+ public void canAddDelimiterValue() {
+ stringValues.add("11");
+ assertEquals(1, stringValues.get().length);
+ stringValues.add(DELIMITER + "");
+ assertEquals(2, stringValues.get().length);
+ }
+
+ @Test
+ public void delimiterValueIsReturnedCorrectly() {
+ stringValues.add("11");
+ assertEquals(1, stringValues.get().length);
+ String delimiterValue = DELIMITER + "";
+ stringValues.add(delimiterValue);
+ String[] values = stringValues.get();
+ assertEquals(2, values.length);
+ values[1] = delimiterValue;
+ }
+
+}
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/utils/URIUtilsTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/utils/URIUtilsTest.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/ui/utils/URIUtilsTest.java 2011-06-09 16:39:35 UTC (rev 31967)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * 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.ui.utils;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.jboss.tools.internal.deltacloud.ui.utils.URIUtils;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ *
+ */
+public class URIUtilsTest {
+
+ @Test
+ public void uriWithPortDoesNotStartWithScheme() {
+ assertFalse(URIUtils.startsWithScheme("localhost:3001"));
+ }
+
+ @Test
+ public void uriWithoutPortDoesNotStartWithScheme() {
+ assertFalse(URIUtils.startsWithScheme("localhost"));
+ }
+
+ @Test
+ public void uriWithPortStartsWithScheme() {
+ assertTrue(URIUtils.startsWithScheme("http://localhost:3001"));
+ }
+
+ @Test
+ public void uriWithoutPortStartsWithScheme() {
+ assertTrue(URIUtils.startsWithScheme("http://localhost"));
+ }
+}
14 years, 10 months
JBoss Tools SVN: r31966 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2011-06-09 12:39:29 -0400 (Thu, 09 Jun 2011)
New Revision: 31966
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
JBIDE-8801 Seam Facet Install Delegate should not copy resources and libraries from Seam Runtime in case of installing it to an existing project.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2011-06-09 16:00:51 UTC (rev 31965)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2011-06-09 16:39:29 UTC (rev 31966)
@@ -938,9 +938,6 @@
model.setProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, names.get(0));
}
}
- if(model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING)==null) {
- model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, true);
- }
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2011-06-09 16:00:51 UTC (rev 31965)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2011-06-09 16:39:29 UTC (rev 31966)
@@ -131,6 +131,8 @@
return Boolean.TRUE;
} else if (CONFIGURE_WAR_PROJECT.equals(propertyName)) {
return Boolean.TRUE;
+ } else if (SEAM_RUNTIME_LIBRARIES_COPYING.equals(propertyName)) {
+ return Boolean.TRUE;
}
return super.getDefaultProperty(propertyName);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2011-06-09 16:00:51 UTC (rev 31965)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2011-06-09 16:39:29 UTC (rev 31966)
@@ -311,7 +311,7 @@
SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS,
this.jBossAsDeployAsEditor.getValueAsString());
- model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, !isNewProjectWizard());
+ model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, isNewProjectWizard());
}
/*
14 years, 10 months
JBoss Tools SVN: r31965 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test: smoke and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-06-09 12:00:51 -0400 (Thu, 09 Jun 2011)
New Revision: 31965
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
Log:
Added testing of Open Ons functionality within VPE.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-06-09 15:44:50 UTC (rev 31964)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-06-09 16:00:51 UTC (rev 31965)
@@ -14,6 +14,7 @@
import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2RenameParticipantTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.AddRemoveJSFCapabilitiesTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.CreateNewJSFProjectTest;
+import org.jboss.tools.jsf.ui.bot.test.smoke.OpenOnTest;
import org.jboss.tools.jsf.ui.bot.test.templates.SetTemplateForUnknownTagTest;
import org.jboss.tools.jsf.ui.bot.test.templates.UnknownTemplateTest;
@@ -38,6 +39,7 @@
suite.addTestSuite(JSF2MoveParticipantTest.class);
suite.addTestSuite(JSF2RenameParticipantTest.class);
suite.addTestSuite(JSF2AttributeRenameTest.class);
+ suite.addTestSuite(OpenOnTest.class);
return suite;
}
}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2011-06-09 16:00:51 UTC (rev 31965)
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.ui.bot.test.smoke;
+
+import org.apache.log4j.Logger;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.helper.OpenOnHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.test.JBTSWTBotTestCase;
+/**
+ * Test open on functionality of JSF components within jsp page
+ * @author Vladimir Pakan
+ *
+ */
+public class OpenOnTest extends JSFAutoTestCase{
+ private static Logger log = Logger.getLogger(JBTSWTBotTestCase.class);
+ public void testOpenOn() throws Throwable{
+ try{
+ bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.CLOSE_ALL).click();
+ log.info("All Editors closed");
+ } catch (WidgetNotFoundException wnfe){
+ log.info("No Editors to close");
+ } catch (TimeoutException te){
+ log.info("No Editors to close");
+ }
+
+ openPage();
+ checkOpenOn();
+
+ }
+ /**
+ * Check Open On functionality for jsp page
+ */
+ private void checkOpenOn() {
+ // Check open on for #{Message.header} EL
+ String expectedOpenedFileName = "Messages.properties";
+ SWTBotEditor openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, TEST_PAGE, "value=\"#{Message.header}\"", 10,
+ 0, 0, expectedOpenedFileName);
+ SWTBotTable propTable = openedEditor.bot().table();
+ String selectedTableRowLabel = propTable.selection().get(0, 0);
+ String firstTableRowLabel = propTable.cell(0,0);
+ assertTrue("First table row in properties table has to be selected but is not.",
+ selectedTableRowLabel.equals(firstTableRowLabel));
+ openedEditor.close();
+ // Check open on for #{Message.prompt_message} EL
+ String expectedTableRowLabel = "prompt_message";
+ openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, TEST_PAGE, "value=\"#{Message." + expectedTableRowLabel + "}\"", 10,
+ 0, 0, expectedOpenedFileName);
+ selectedTableRowLabel = openedEditor.bot().table().selection().get(0, 0);
+ assertTrue("Selected table row has to have value " + expectedTableRowLabel + " but has " + selectedTableRowLabel,
+ selectedTableRowLabel.equalsIgnoreCase(expectedTableRowLabel));
+ openedEditor.close();
+ // Check open on for "#{user.name} EL when text 'user' is selected
+ expectedOpenedFileName = "User.java";
+ openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, TEST_PAGE, "value=\"#{user.name}\"", 10,
+ 0, 0, expectedOpenedFileName);
+ String selectedTextInSourceEditor = openedEditor.toTextEditor().getSelection();
+ String expectedSelectedTextInSourceEditor = "User";
+ assertTrue("Selected text in Source editor has to be " + expectedSelectedTextInSourceEditor +
+ " but is " + selectedTextInSourceEditor,
+ selectedTextInSourceEditor.equalsIgnoreCase(expectedSelectedTextInSourceEditor));
+ openedEditor.close();
+ // Check open on for "#{user.name} EL when text 'name' is selected
+ expectedOpenedFileName = "User.java";
+ openedEditor = OpenOnHelper.checkOpenOnFileIsOpened(
+ SWTTestExt.bot, TEST_PAGE, "value=\"#{user.name}\"", 15,
+ 0, 0, expectedOpenedFileName);
+ selectedTextInSourceEditor = openedEditor.toTextEditor().getSelection();
+ expectedSelectedTextInSourceEditor = "getName";
+ assertTrue("Selected text in Source editor has to be " + expectedSelectedTextInSourceEditor +
+ " but is " + selectedTextInSourceEditor,
+ selectedTextInSourceEditor.equalsIgnoreCase(expectedSelectedTextInSourceEditor));
+ openedEditor.close();
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
JBoss Tools SVN: r31964 - trunk/deltacloud/tests.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-06-09 11:44:50 -0400 (Thu, 09 Jun 2011)
New Revision: 31964
Modified:
trunk/deltacloud/tests/pom.xml
Log:
fix for continuous build errors delta cloud tests are gone
Modified: trunk/deltacloud/tests/pom.xml
===================================================================
--- trunk/deltacloud/tests/pom.xml 2011-06-09 14:52:58 UTC (rev 31963)
+++ trunk/deltacloud/tests/pom.xml 2011-06-09 15:44:50 UTC (rev 31964)
@@ -13,7 +13,6 @@
<name>deltacloud.tests</name>
<packaging>pom</packaging>
<modules>
- <module>org.jboss.tools.deltacloud.test</module>
</modules>
</project>
14 years, 10 months
JBoss Tools SVN: r31963 - trunk/deltacloud/tests.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-09 10:52:58 -0400 (Thu, 09 Jun 2011)
New Revision: 31963
Removed:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.client.test/
Log:
[JBIDE-9105] removed org.jboss.tools.deltacloud.client and replaced by a jarred version of org.apache.deltacloud java client (it's the same code, but it's now hosted in the deltacloud project
14 years, 10 months