JBoss Tools SVN: r31852 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-06-06 18:26:03 -0400 (Mon, 06 Jun 2011)
New Revision: 31852
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/FirstBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Hamina_Broken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Hamina_Broken.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9078
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-06-06 22:04:33 UTC (rev 31851)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-06-06 22:26:03 UTC (rev 31852)
@@ -58,6 +58,8 @@
public static final String SPACE = " "; //$NON-NLS-1$
public static final String AT = "@"; //$NON-NLS-1$
public static final String IMPLEMENTS = "implements"; //$NON-NLS-1$
+ public static final String EXTENDS = "extends"; //$NON-NLS-1$
+ public static final String OPEN_BRACE = "{"; //$NON-NLS-1$
static final HashSet<String> primitives = new HashSet<String>();
static{
@@ -423,10 +425,20 @@
int namePosition = text.indexOf(workingType.getElementName());
if(namePosition >= 0){
int implementsPosition = text.indexOf(IMPLEMENTS,namePosition);
- if(implementsPosition < 0)
- buffer.replace(workingType.getSourceRange().getOffset()+namePosition+workingType.getElementName().length(),0,SPACE+IMPLEMENTS+SPACE+shortName);
- else
+ if(implementsPosition > 0){
buffer.replace(workingType.getSourceRange().getOffset()+implementsPosition+IMPLEMENTS.length(),0,SPACE+shortName+COMMA);
+ }else{
+ int extedsPosition = text.indexOf(EXTENDS,namePosition);
+ if(extedsPosition > 0){
+ int bracePosition = text.indexOf(OPEN_BRACE, extedsPosition);
+ String str = IMPLEMENTS+SPACE+shortName+SPACE;
+ if(!text.substring(bracePosition-1,bracePosition).equals(SPACE))
+ str = SPACE+str;
+ buffer.replace(workingType.getSourceRange().getOffset()+bracePosition,0,str);
+ }else{
+ buffer.replace(workingType.getSourceRange().getOffset()+namePosition+workingType.getElementName().length(),0,SPACE+IMPLEMENTS+SPACE+shortName);
+ }
+ }
}
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/FirstBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/FirstBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/FirstBean.java 2011-06-06 22:26:03 UTC (rev 31852)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+public class FirstBean {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/FirstBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Hamina_Broken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Hamina_Broken.java 2011-06-06 22:04:33 UTC (rev 31851)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Hamina_Broken.java 2011-06-06 22:26:03 UTC (rev 31852)
@@ -6,4 +6,5 @@
@SessionScoped
class Hamina_Broken
{
+ private static final long serialVersionUID = 1L;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Hamina_Broken.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Hamina_Broken.qfxresult 2011-06-06 22:04:33 UTC (rev 31851)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Hamina_Broken.qfxresult 2011-06-06 22:26:03 UTC (rev 31852)
@@ -7,4 +7,5 @@
@SessionScoped
class Hamina_Broken implements Serializable
{
+ private static final long serialVersionUID = 1L;
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java 2011-06-06 22:26:03 UTC (rev 31852)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.context.SessionScoped;
+
+@SessionScoped
+public class SecondBean extends FirstBean {
+private static final long serialVersionUID = 1L;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SecondBean.qfxresult 2011-06-06 22:26:03 UTC (rev 31852)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.context.SessionScoped;
+import java.io.Serializable;
+
+@SessionScoped
+public class SecondBean extends FirstBean implements Serializable {
+private static final long serialVersionUID = 1L;
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-06-06 22:04:33 UTC (rev 31851)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-06-06 22:26:03 UTC (rev 31852)
@@ -27,6 +27,7 @@
import org.jboss.tools.cdi.core.test.tck.validation.ValidationTest;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager;
import org.jboss.tools.cdi.ui.marker.AddLocalBeanMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.AddSerializableInterfaceMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllDisposerDuplicantMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllInjectedConstructorsMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeFieldStaticMarkerResolution;
@@ -180,7 +181,7 @@
String fileContent = FileUtil.readStream(file);
String resultContent = FileUtil.readStream(resultFile);
- assertEquals("Wrong result of resolution", resultContent, fileContent);
+ assertEquals("Wrong result of resolution", resultContent.trim(), fileContent.trim());
}
}
@@ -359,5 +360,33 @@
CDIValidationErrorManager.MULTIPLE_INJECTION_CONSTRUCTORS_ID,
DeleteAllInjectedConstructorsMarkerResolution.class);
}
+
+ public void testAddSerializableInterfaceResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Hamina_Broken.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Hamina_Broken.qfxresult"
+ },
+ MARKER_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID,
+ AddSerializableInterfaceMarkerResolution.class);
+ }
+ public void testAddSerializableInterfaceResolution2() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SecondBean.java"
+ },
+// new String[]{
+// "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SecondBean.qfxresult"
+// },
+ MARKER_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID,
+ AddSerializableInterfaceMarkerResolution.class);
+ }
+
}
14 years, 10 months
JBoss Tools SVN: r31851 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-06 18:04:33 -0400 (Mon, 06 Jun 2011)
New Revision: 31851
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
Log:
JBIDE-9072
https://issues.jboss.org/browse/JBIDE-9072
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2011-06-06 22:03:51 UTC (rev 31850)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2011-06-06 22:04:33 UTC (rev 31851)
@@ -163,8 +163,8 @@
}
void buildInheritance() {
- inheritanceIsBuilt = true;
if(type == null) return;
+ Set<IParametedType> inheritedTypes = new HashSet<IParametedType>();
try {
if(!type.isInterface() && !type.isAnnotation()) {
String sc = type.getSuperclassTypeSignature();
@@ -218,6 +218,8 @@
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
+ this.inheritedTypes = inheritedTypes;
+ inheritanceIsBuilt = true;
}
public ParametedType getSuperType() {
@@ -288,23 +290,25 @@
public Set<IParametedType> getAllTypes() {
if(allInheritedTypes == null) {
- allInheritedTypes = new HashSet<IParametedType>();
- Set<String> processed = new HashSet<String>();
- buildAllTypes(processed, this);
+ allInheritedTypes = buildAllTypes(new HashSet<String>(), this, new HashSet<IParametedType>());
}
return allInheritedTypes;
}
- void buildAllTypes(Set<String> processed, ParametedType p) {
+ Set<IParametedType> buildAllTypes(Set<String> processed, ParametedType p, Set<IParametedType> types) {
IType t = p.getType();
- if(t == null) return;
- if(processed.contains(p.getArrayPrefix() + t.getFullyQualifiedName())) return;
- processed.add(p.getArrayPrefix() + t.getFullyQualifiedName());
- allInheritedTypes.add(p);
- Set<IParametedType> ts = p.getInheritedTypes();
- if(ts != null) for (IParametedType pp: ts) {
- buildAllTypes(processed, (ParametedType)pp);
+ if(t != null) {
+ String key = p.getArrayPrefix() + t.getFullyQualifiedName();
+ if(!processed.contains(key)) {
+ processed.add(key);
+ types.add(p);
+ Set<IParametedType> ts = p.getInheritedTypes();
+ if(ts != null) for (IParametedType pp: ts) {
+ buildAllTypes(processed, (ParametedType)pp, types);
+ }
+ }
}
+ return types;
}
public String toString() {
14 years, 10 months
JBoss Tools SVN: r31850 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: projects/TypeTest and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-06 18:03:51 -0400 (Mon, 06 Jun 2011)
New Revision: 31850
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.project
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/bin/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest1.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest2.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest3.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest4.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest5.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test1.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test2.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test3.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test4.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test5.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
JBIDE-9072
https://issues.jboss.org/browse/JBIDE-9072
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.classpath 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.project 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>TypeTest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.settings/org.eclipse.jdt.core.prefs 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,12 @@
+#Mon Jun 06 13:37:17 PDT 2011
+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.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest1.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public interface ITest1 extends ITest2 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest2.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public interface ITest2 extends ITest3 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest3.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public interface ITest3 extends ITest4 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest4.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest4.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest4.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public interface ITest4 extends ITest5 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest5.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest5.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest5.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public interface ITest5 extends ITest1 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/ITest5.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test1.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public class Test1 extends Test2 implements ITest1 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test2.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public class Test2 extends Test3 implements ITest2 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test3.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public class Test3 extends Test4 implements ITest3 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test4.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test4.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test4.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public class Test4 extends Test5 implements ITest4 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test5.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test5.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test5.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,5 @@
+package test;
+
+public class Test5 implements ITest5 {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/TypeTest/src/test/Test5.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-06-06 20:47:51 UTC (rev 31849)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -62,7 +62,7 @@
JavaModelManager.getIndexManager().disable();
TestSuite suiteAll = new TestSuite("CDI Core Tests");
-
+ suiteAll.addTestSuite(TypeTest.class);
TestSuite suite = new TestSuite("TCK Tests");
suite.addTestSuite(ResolutionByNameTest.class);
suite.addTestSuite(BeanDefinitionTest.class);
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java 2011-06-06 22:03:51 UTC (rev 31850)
@@ -0,0 +1,91 @@
+package org.jboss.tools.cdi.core.test;
+
+import java.util.ConcurrentModificationException;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.internal.core.impl.ParametedType;
+import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+import junit.framework.TestCase;
+
+public class TypeTest extends TestCase {
+ IProject project = null;
+
+ public TypeTest() {}
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesUtils.importProject(DependentProjectsTestSetup.PLUGIN_ID, "/projects/TypeTest");
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ }
+
+ public void testType() throws Exception {
+ ParametedTypeFactory factory = new ParametedTypeFactory();
+ IJavaProject jp = JavaCore.create(project);
+ IType type = jp.findType("test.Test1");
+ ParametedType t = (ParametedType)factory.newParametedType(type);
+ R[] rs = new R[3];
+ Thread[] ts = new Thread[rs.length];
+ for (int i = 0; i < ts.length; i++) {
+ rs[i] = new R(t);
+ ts[i] = new Thread(rs[i]);
+ }
+ for (int i = 0; i < ts.length; i++) {
+ ts[i].start();
+ }
+ for (int i = 0; i < ts.length; i++) {
+ ts[i].join();
+ }
+ for (int i = 0; i < ts.length; i++) {
+ if(rs[i].exception != null) {
+ fail("" + rs[i].exception);
+ }
+ assertEquals(11, rs[i].size);
+ }
+ }
+
+ class R implements Runnable {
+ ParametedType t;
+ int size;
+ ConcurrentModificationException exception;
+
+ public R(ParametedType t) {
+ this.t = t;
+ }
+
+ @Override
+ public void run() {
+ Set<IParametedType> types = t.getAllTypes();
+ size = types.size();
+ try {
+ for (IParametedType t1: types) {
+ try {
+ Thread.sleep(20);
+ } catch (InterruptedException e) {
+ }
+ }
+ } catch (ConcurrentModificationException e) {
+ exception = e;
+ }
+ }
+ }
+
+ public void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ project.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/TypeTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
JBoss Tools SVN: r31849 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-06-06 16:47:51 -0400 (Mon, 06 Jun 2011)
New Revision: 31849
Modified:
trunk/build/aggregate/site/site.xml
Log:
JBIDE-9026 Separate specific runtime detection plugins from base core
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-06-06 16:42:24 UTC (rev 31848)
+++ trunk/build/aggregate/site/site.xml 2011-06-06 20:47:51 UTC (rev 31849)
@@ -140,6 +140,7 @@
<category name="AllTools" />
</feature>
+ <!--
<feature url="features/org.jboss.tools.runtime.drools.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.drools.detector.feature" version="0.0.0">
<category name="AllTools" />
</feature>
@@ -147,6 +148,7 @@
<feature url="features/org.jboss.tools.runtime.jbpm.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.jbpm.feature" version="0.0.0">
<category name="AllTools" />
</feature>
+ -->
<feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0">
<category name="AllTools" />
14 years, 10 months
JBoss Tools SVN: r31848 - in trunk/common: tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-06-06 12:42:24 -0400 (Mon, 06 Jun 2011)
New Revision: 31848
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java
trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9077
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java 2011-06-06 14:20:58 UTC (rev 31847)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialog/ErrorDialog.java 2011-06-06 16:42:24 UTC (rev 31848)
@@ -191,7 +191,7 @@
super.cancelPressed();
}
- private void submit() {
+ protected void submit() {
String email = ReportPreference.E_MAIL_OPTION.getValue();
String other = ReportPreference.OTHER_OPTION.getValue();
String text = "" + getEnvironment() + "\n" + problemText; //$NON-NLS-1$//$NON-NLS-2$
Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java 2011-06-06 14:20:58 UTC (rev 31847)
+++ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/dialog/test/ErrorDialogTest.java 2011-06-06 16:42:24 UTC (rev 31848)
@@ -10,15 +10,14 @@
******************************************************************************/
package org.jboss.tools.common.model.ui.dialog.test;
+import junit.framework.TestCase;
+
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.common.model.ui.dialog.ErrorDialog;
-import org.jboss.tools.test.util.JobUtils;
-import junit.framework.TestCase;
-
/**
* @author eskimo
*
@@ -105,11 +104,14 @@
super(shell, title, exception);
}
+ @Override
public void buttonPressed(int id) {
- // TODO Auto-generated method stub
super.buttonPressed(id);
}
-
-
+
+ @Override
+ protected void submit() {
+ // Do nothing
+ }
}
-}
+}
\ No newline at end of file
14 years, 10 months
JBoss Tools SVN: r31847 - trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-06 10:20:58 -0400 (Mon, 06 Jun 2011)
New Revision: 31847
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
Log:
[JBIDE-9069] fixed asserts in SingleFileZippedDeploymentIntegrationTest#testSingleFolderZippedForAS7 and committed to TRUNK
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-06-06 14:12:23 UTC (rev 31846)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-06-06 14:20:58 UTC (rev 31847)
@@ -50,7 +50,8 @@
int changed = MockPublishMethod.getChanged().length;
int removed = MockPublishMethod.getRemoved().length;
assertEquals(2,changed);
- assertEquals(1,removed);
+ // always removing the prior deployment since we could be switching from exploded to war
+ assertEquals(2,removed);
MockPublishMethod.reset();
// make workspace change, repeat
@@ -61,7 +62,8 @@
changed = MockPublishMethod.getChanged().length;
removed = MockPublishMethod.getRemoved().length;
assertEquals(2,changed);
- assertEquals(1,removed);
+ // always removing the prior deployment since we could be switching from exploded to war
+ assertEquals(2,removed);
MockPublishMethod.reset();
server = ServerRuntimeUtils.removeModule(server, mods[0]);
@@ -70,7 +72,8 @@
changed = MockPublishMethod.getChanged().length;
removed = MockPublishMethod.getRemoved().length;
assertEquals(0,changed);
- assertEquals(1,removed);
+ // removing deployment + .deployed marker
+ assertEquals(2,removed);
MockPublishMethod.reset();
}
14 years, 10 months
JBoss Tools SVN: r31846 - trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-06 10:12:23 -0400 (Mon, 06 Jun 2011)
New Revision: 31846
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
Log:
[JBIDE-9054] renamed local variables rm and cm to removed and changed so that the code gets more readable/understandable
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-06-06 13:35:47 UTC (rev 31845)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-06-06 14:12:23 UTC (rev 31846)
@@ -47,10 +47,10 @@
assertEquals(mods.length, 1);
server = ServerRuntimeUtils.addModule(server, mods[0]);
ServerRuntimeUtils.publish(server);
- int ch = MockPublishMethod.getChanged().length;
- int rm = MockPublishMethod.getRemoved().length;
- assertEquals(2,ch);
- assertEquals(1,rm);
+ int changed = MockPublishMethod.getChanged().length;
+ int removed = MockPublishMethod.getRemoved().length;
+ assertEquals(2,changed);
+ assertEquals(1,removed);
MockPublishMethod.reset();
// make workspace change, repeat
@@ -58,19 +58,19 @@
ServerRuntimeUtils.publish(server);
JobUtils.waitForIdle();
- ch = MockPublishMethod.getChanged().length;
- rm = MockPublishMethod.getRemoved().length;
- assertEquals(2,ch);
- assertEquals(1,rm);
+ changed = MockPublishMethod.getChanged().length;
+ removed = MockPublishMethod.getRemoved().length;
+ assertEquals(2,changed);
+ assertEquals(1,removed);
MockPublishMethod.reset();
server = ServerRuntimeUtils.removeModule(server, mods[0]);
ServerRuntimeUtils.publish(server);
JobUtils.waitForIdle();
- ch = MockPublishMethod.getChanged().length;
- rm = MockPublishMethod.getRemoved().length;
- assertEquals(0,ch);
- assertEquals(1,rm);
+ changed = MockPublishMethod.getChanged().length;
+ removed = MockPublishMethod.getRemoved().length;
+ assertEquals(0,changed);
+ assertEquals(1,removed);
MockPublishMethod.reset();
}
14 years, 10 months
JBoss Tools SVN: r31845 - trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-06 09:35:47 -0400 (Mon, 06 Jun 2011)
New Revision: 31845
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
Log:
[JBIDE-8920] removed unnecessary warnings
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-06-06 12:07:34 UTC (rev 31844)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-06-06 13:35:47 UTC (rev 31845)
@@ -2,8 +2,8 @@
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.CoreException;
@@ -11,7 +11,6 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.archives.webtools.modules.WTPZippedPublisher;
import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
@@ -38,8 +37,6 @@
server = ServerRuntimeUtils.useMockPublishMethod(server);
server = ServerRuntimeUtils.setZipped(server, true);
MockPublishMethod.reset();
- ArrayList<IPath> o1 = MockPublishMethod.changed;
- ArrayList<IPath> o2 = MockPublishMethod.removed;
final String folderName = "test";
IFolder folder = project.getFolder(folderName);
@@ -77,9 +74,10 @@
MockPublishMethod.reset();
}
- private void dump(ArrayList<IPath> changed, ArrayList<IPath> removed) {
+ @SuppressWarnings("unused")
+ private void dump(List<IPath> changed, List<IPath> removed) {
System.out.println("dump");
- Iterator i = changed.iterator();
+ Iterator<IPath> i = changed.iterator();
while(i.hasNext()) {
System.out.println(" - changed " + i.next());
}
14 years, 10 months
JBoss Tools SVN: r31844 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-06 08:07:34 -0400 (Mon, 06 Jun 2011)
New Revision: 31844
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
Log:
[JBIDE-9069] fixed MockJSTPublisherTest#testForced7Logic
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-06-06 12:05:39 UTC (rev 31843)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-06-06 12:07:34 UTC (rev 31844)
@@ -4,6 +4,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.ServerUtil;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
@@ -22,38 +23,106 @@
MockPublishMethod.reset();
theTest(true);
}
-
- private void theTest(boolean as7) throws CoreException, IOException {
-
+
+ private void theTest(boolean isAs7) throws CoreException, IOException {
+
IModule mod = ServerUtil.getModule(project);
- IModule[] module = new IModule[] { mod };
- server = ServerRuntimeUtils.addModule(server,mod);
+ server = ServerRuntimeUtils.addModule(server, mod);
ServerRuntimeUtils.publish(server);
- // one additional for doDeploy
- assertEquals(as7 ? 3 : 2, MockPublishMethod.getChanged().length);
+ assertChanged(
+ isAs7,
+ new String[] { "newModule.ear", "newModule.ear/META-INF/application.xml" },
+ new String[] { "newModule.ear", "newModule.ear/META-INF/application.xml", "newModule.ear.dodeploy" });
+ assertRemoved(
+ isAs7,
+ new String[] { "newModule.ear" },
+ // jst publisher always removes the prior deployed artifact since we could have switched from zipped to exploded
+ new String[] { "newModule.ear", "newModule.ear.failed" });
MockPublishMethod.reset();
-
+
IFile textFile = project.getFile(CONTENT_TEXT_FILE);
IOUtil.setContents(textFile, 0);
assertEquals(0, MockPublishMethod.getChanged().length);
ServerRuntimeUtils.publish(server);
- assertEquals(as7 ? 3 : 2, MockPublishMethod.getChanged().length);
+ assertChanged(
+ isAs7,
+ new String[] { "newModule.ear", "newModule.ear/test.txt" },
+ new String[] { "newModule.ear", "newModule.ear/test.txt", "newModule.ear.dodeploy" });
+ assertRemoved(
+ isAs7,
+ new String[] {}, new String[] { "newModule.ear.failed" });
MockPublishMethod.reset();
IOUtil.setContents(textFile, 1);
ServerRuntimeUtils.publish(server);
- assertEquals(as7 ? 3 : 2, MockPublishMethod.getChanged().length);
+ assertChanged(
+ isAs7,
+ new String[] { "newModule.ear", "newModule.ear/test.txt" },
+ new String[] { "newModule.ear", "newModule.ear/test.txt", "newModule.ear.dodeploy" });
+ assertRemoved(
+ isAs7,
+ new String[] {},
+ new String[] { "newModule.ear.failed" });
MockPublishMethod.reset();
textFile.delete(true, null);
ServerRuntimeUtils.publish(server);
- assertEquals(1, MockPublishMethod.getRemoved().length);
+ assertRemoved(
+ isAs7,
+ new String[] { "newModule.ear/test.txt" },
+ new String[] { "newModule.ear.failed", "newModule.ear/test.txt" });
+ assertChanged(
+ isAs7,
+ new String[] {},
+ new String[] { "newModule.ear.dodeploy" });
MockPublishMethod.reset();
server = ServerRuntimeUtils.removeModule(server, mod);
assertEquals(0, MockPublishMethod.getRemoved().length);
-
- // Still just one delete, but should be the .deployed file
+
ServerRuntimeUtils.publish(server);
- assertEquals(1, MockPublishMethod.getRemoved().length);
+ assertRemoved(
+ isAs7,
+ new String[] { "newModule.ear" },
+ new String[] { "newModule.ear.deployed", "newModule.ear.failed" });
}
+
+ private void assertRemoved(boolean isAs7, String[] nonAs7, String[] as7) {
+ assertExpectedArtifacts(isAs7, nonAs7, as7, MockPublishMethod.getRemoved());
+ }
+ private void assertChanged(boolean isAs7, String[] nonAs7, String[] as7) {
+ assertExpectedArtifacts(isAs7, nonAs7, as7, MockPublishMethod.getChanged());
+ }
+
+ private void assertExpectedArtifacts(boolean isAs7, String[] nonAs7, String[] as7, IPath[] artifacts) {
+ if (isAs7) {
+ assertEquals(as7.length, artifacts.length);
+ } else {
+ assertEquals(nonAs7.length, artifacts.length);
+ }
+
+ if (isAs7) {
+ for (String expectedPath : as7) {
+ if (contains(expectedPath, artifacts)) {
+ continue;
+ }
+ fail(expectedPath + " was not among the changed/removed artifacts");
+ }
+ } else {
+ for (String expectedPath : nonAs7) {
+ if (contains(expectedPath, artifacts)) {
+ continue;
+ }
+ fail(expectedPath + " was not among the changed/removed artifacts");
+ }
+ }
+ }
+
+ private boolean contains(String expectedPath, IPath[] paths) {
+ for (IPath path : paths) {
+ if (expectedPath.equals(path.toString())) {
+ return true;
+ }
+ }
+ return false;
+ }
}
14 years, 10 months
JBoss Tools SVN: r31843 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-06 08:05:39 -0400 (Mon, 06 Jun 2011)
New Revision: 31843
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java
Log:
[JBIDE-9054] renamed #createProject() to #createEARProject() to better reflect its purpose
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-06-06 09:40:57 UTC (rev 31842)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-06-06 12:05:39 UTC (rev 31843)
@@ -30,7 +30,7 @@
final String TEXT_FILE = "test.txt";
final IPath CONTENT_TEXT_FILE = new Path(CONTENT_DIR).append(TEXT_FILE);
public void setUp() throws Exception {
- project = createProject();
+ project = createEARProject();
server = ServerRuntimeUtils.createMockDeployOnlyServer();
}
@@ -40,7 +40,7 @@
ProjectUtility.deleteAllProjects();
ASTest.clearStateLocation();
}
- protected IProject createProject() throws Exception {
+ protected IProject createEARProject() throws Exception {
IDataModel dm = ProjectCreationUtil.getEARDataModel(MODULE_NAME, CONTENT_DIR, null, null, JavaEEFacetConstants.EAR_5, false);
OperationTestCase.runAndVerify(dm);
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java 2011-06-06 09:40:57 UTC (rev 31842)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java 2011-06-06 12:05:39 UTC (rev 31843)
@@ -20,7 +20,7 @@
import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil;
public class JSTDeployBinaryChildModuleTest extends AbstractJSTDeploymentTester {
- protected IProject createProject() throws Exception {
+ protected IProject createEARProject() throws Exception {
IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, null, null, JavaEEFacetConstants.WEB_24, false);
OperationTestCase.runAndVerify(dm);
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-06-06 09:40:57 UTC (rev 31842)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-06-06 12:05:39 UTC (rev 31843)
@@ -20,7 +20,7 @@
public class JSTDeploymentWarUpdateXML extends AbstractJSTDeploymentTester {
- protected IProject createProject() throws Exception {
+ protected IProject createEARProject() throws Exception {
IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, CONTENT_DIR, null, JavaEEFacetConstants.WEB_25, true);
OperationTestCase.runAndVerify(dm);
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2011-06-06 09:40:57 UTC (rev 31842)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2011-06-06 12:05:39 UTC (rev 31843)
@@ -30,7 +30,7 @@
public class JSTZippedDeploymentTester extends AbstractJSTDeploymentTester {
public void setUp() throws Exception {
- project = createProject();
+ project = createEARProject();
server = ServerRuntimeUtils.createMockDeployOnlyServer();
setZipFlag();
}
@@ -42,7 +42,7 @@
server = wc.save(true, new NullProgressMonitor());
}
- protected IProject createProject() throws Exception {
+ protected IProject createEARProject() throws Exception {
IDataModel dm = ProjectCreationUtil.getEARDataModel(MODULE_NAME, CONTENT_DIR, null, null, JavaEEFacetConstants.EAR_5, false);
OperationTestCase.runAndVerify(dm);
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME);
14 years, 10 months