Author: dazarov
Date: 2012-02-24 20:00:59 -0500 (Fri, 24 Feb 2012)
New Revision: 39134
Added:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithDialog.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithRefactoringProcessor.java
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/MarkerResolutionTestUtil.java
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithRefactoringProcessor.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
trunk/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
Log:
test failures in Seam
https://issues.jboss.org/browse/JBIDE-10956
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -28,6 +28,7 @@
import org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard;
import org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard;
import org.jboss.tools.common.model.ui.wizards.NewTypeWizardAdapter;
+import org.jboss.tools.common.refactoring.TestableResolutionWithDialog;
public class CreateCDIElementMarkerResolution implements IMarkerResolution2,
TestableResolutionWithDialog{
private static final String OBJECT = "java.lang.Object";
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -30,6 +30,7 @@
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard;
import org.jboss.tools.common.refactoring.MarkerResolutionUtils;
+import org.jboss.tools.common.refactoring.TestableResolutionWithRefactoringProcessor;
/**
* @author Daniel Azarov
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -31,6 +31,7 @@
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard;
import org.jboss.tools.common.refactoring.MarkerResolutionUtils;
+import org.jboss.tools.common.refactoring.TestableResolutionWithRefactoringProcessor;
/**
* @author Daniel Azarov
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -31,6 +31,7 @@
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard;
import org.jboss.tools.common.refactoring.MarkerResolutionUtils;
+import org.jboss.tools.common.refactoring.TestableResolutionWithRefactoringProcessor;
/**
* @author Daniel Azarov
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -36,6 +36,7 @@
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.refactoring.MarkerResolutionUtils;
+import org.jboss.tools.common.refactoring.TestableResolutionWithDialog;
import org.jboss.tools.common.ui.CommonUIPlugin;
/**
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -23,6 +23,7 @@
import org.jboss.tools.cdi.internal.core.refactoring.AddQualifiersToBeanProcessor;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard;
+import org.jboss.tools.common.refactoring.TestableResolutionWithDialog;
/**
* @author Daniel Azarov
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -22,6 +22,7 @@
import org.jboss.tools.cdi.internal.core.refactoring.AddQualifiersToBeanProcessor;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.wizard.SelectBeanWizard;
+import org.jboss.tools.common.refactoring.TestableResolutionWithDialog;
/**
* @author Daniel Azarov
Deleted:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.ui.marker;
-
-import org.eclipse.core.resources.IMarker;
-
-/**
- * @author Daniel Azarov
- */
-public interface TestableResolutionWithDialog {
- public void runForTest(IMarker marker);
-}
Deleted:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithRefactoringProcessor.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithRefactoringProcessor.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithRefactoringProcessor.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.ui.marker;
-
-import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
-
-/**
- * @author Daniel Azarov
- */
-public interface TestableResolutionWithRefactoringProcessor {
- public RefactoringProcessor getRefactoringProcessor();
-}
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 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -10,20 +10,7 @@
************************************************************************************/
package org.jboss.tools.cdi.ui.test.marker;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.ide.IDE;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager;
@@ -44,187 +31,16 @@
import org.jboss.tools.cdi.ui.marker.MakeFieldStaticMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeMethodBusinessMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeMethodPublicMarkerResolution;
-import org.jboss.tools.cdi.ui.marker.TestableResolutionWithDialog;
-import org.jboss.tools.cdi.ui.marker.TestableResolutionWithRefactoringProcessor;
-import org.jboss.tools.common.base.test.validation.TestUtil;
-import org.jboss.tools.common.ui.marker.AddSuppressWarningsMarkerResolution;
-import org.jboss.tools.common.ui.marker.ConfigureProblemSeverityMarkerResolution;
-import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.common.base.test.MarkerResolutionTestUtil;
/**
* @author Daniel Azarov
*
*/
public class CDIMarkerResolutionTest extends TCKTest {
-
- private void checkForConfigureProblemSeverity(IMarkerResolution[] resolutions){
- for(IMarkerResolution resolution : resolutions){
- if(resolution.getClass().equals(ConfigureProblemSeverityMarkerResolution.class))
- return;
- }
- fail("Configure Problem Severity marker resolution not found");
- }
- private void checkForAddSuppressWarnings(IFile file, IMarker marker, IMarkerResolution[]
resolutions){
- int severity = marker.getAttribute(IMarker.SEVERITY, 0);
- if(file.getFileExtension().equals("java") && severity ==
IMarker.SEVERITY_WARNING){
- for(IMarkerResolution resolution : resolutions){
- if(resolution.getClass().equals(AddSuppressWarningsMarkerResolution.class))
- return;
- }
- fail("Add @SuppressWarnings marker resolution not found");
- }
- }
-
- private void checkResolution(IProject project, String[] fileNames, String markerType,
String idName, int id, Class<? extends IMarkerResolution> resolutionClass) throws
CoreException {
- checkResolution(project, fileNames, new String[]{}, markerType, idName, id,
resolutionClass);
- }
-
- private void checkResolution(IProject project, String[] fileNames, String[] results,
String markerType, String idName, int id, Class<? extends IMarkerResolution>
resolutionClass) throws CoreException {
- IFile file = project.getFile(fileNames[0]);
-
- assertTrue("File - "+file.getFullPath()+" must be
exist",file.exists());
-
- copyFiles(project, fileNames);
- TestUtil.validate(file);
-
- try{
- file = project.getFile(fileNames[0]);
- IMarker[] markers = file.findMarkers(markerType, true, IResource.DEPTH_INFINITE);
-
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- Integer attribute = ((Integer) marker
- .getAttribute(CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME));
- if (attribute != null){
- int messageId = attribute.intValue();
- if(messageId == id){
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, marker, resolutions);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution.getClass().equals(resolutionClass)) {
-
- if(resolution instanceof TestableResolutionWithRefactoringProcessor){
- RefactoringProcessor processor =
((TestableResolutionWithRefactoringProcessor)resolution).getRefactoringProcessor();
-
- RefactoringStatus status = processor.checkInitialConditions(new
NullProgressMonitor());
-
-// RefactoringStatusEntry[] entries = status.getEntries();
-// for(RefactoringStatusEntry entry : entries){
-// System.out.println("Refactor status - "+entry.getMessage());
-// }
-
- assertNull("Rename processor returns fatal error",
status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- status = processor.checkFinalConditions(new NullProgressMonitor(), null);
-
-// entries = status.getEntries();
-// for(RefactoringStatusEntry entry : entries){
-// System.out.println("Refactor status - "+entry.getMessage());
-// }
-
- assertNull("Rename processor returns fatal error",
status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- CompositeChange rootChange = (CompositeChange)processor.createChange(new
NullProgressMonitor());
-
-// for(Change fileChange : rootChange.getChildren()){
-// if(fileChange instanceof JBDSFileChange){
-// ((JBDSFileChange)fileChange).setSaveMode(TextFileChange.FORCE_SAVE);
-// }
-// }
-
- rootChange.perform(new NullProgressMonitor());
- } else if(resolution instanceof TestableResolutionWithDialog){
- ((TestableResolutionWithDialog) resolution).runForTest(marker);
- } else {
- resolution.run(marker);
- }
-
- TestUtil.validate(file);
-
- file = project.getFile(fileNames[0]);
- IMarker[] newMarkers = file.findMarkers(markerType,
true, IResource.DEPTH_INFINITE);
-
- assertTrue("Marker resolution did not decrease number of problems. was:
"+markers.length+" now: "+newMarkers.length, newMarkers.length <
markers.length);
-
- checkResults(project, fileNames, results);
-
- return;
- }
- }
- fail("Marker resolution: "+resolutionClass+" not found");
- }
- }
- }
- fail("Problem marker with id: "+id+" not found");
- }finally{
- restoreFiles(project, fileNames);
- TestUtil.validate(file);
- }
- }
-
- private void copyFiles(IProject project, String[] fileNames) throws CoreException{
- for(String fileName : fileNames){
- IFile file = project.getFile(fileName);
- IFile copyFile = project.getFile(fileName+".copy");
-
- if(copyFile.exists())
- copyFile.delete(true, null);
-
- InputStream is = null;
- try{
- is = file.getContents();
- copyFile.create(is, true, null);
- } finally {
- if(is!=null) {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
- }
-
- private void restoreFiles(IProject project, String[] fileNames) throws CoreException {
- for(String fileName : fileNames){
- IFile file = project.getFile(fileName);
- IFile copyFile = project.getFile(fileName+".copy");
- InputStream is = null;
- try{
- is = copyFile.getContents();
- file.setContents(is, true, false, null);
- } finally {
- if(is!=null) {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- copyFile.delete(true, null);
- }
- }
-
- private void checkResults(IProject project, String[] fileNames, String[] results) throws
CoreException{
- for(int i = 0; i < results.length; i++){
- IFile file = project.getFile(fileNames[i]);
- IFile resultFile = project.getFile(results[i]);
-
- String fileContent = FileUtil.readStream(file);
- String resultContent = FileUtil.readStream(resultFile);
-
- assertEquals("Wrong result of resolution", resultContent, fileContent);
- }
- }
-
public void testMakeProducerFieldStaticResolution() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerOfSessionBeanBroken.java"
},
@@ -238,7 +54,7 @@
}
public void testMakeProducerMethodBusinessResolution() throws CoreException {
- checkResolution(
+ MarkerResolutionTestUtil.checkResolution(
tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer.java",
@@ -255,7 +71,7 @@
}
public void testAddLocalBeanResolution() throws CoreException {
- checkResolution(
+ MarkerResolutionTestUtil.checkResolution(
tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer.java"
@@ -270,7 +86,7 @@
}
public void testMakeProducerMethodPublicResolution() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerNoInterface.java"
},
@@ -284,7 +100,7 @@
}
public void testMakeObserverParamMethodBusinessResolution() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Terrier.java"
@@ -300,7 +116,7 @@
}
public void testAddLocalBeanResolution2() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java"
},
@@ -314,7 +130,7 @@
}
public void testMakeObserverParamMethodPublicResolution() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.java"
},
@@ -328,7 +144,7 @@
}
public void testMakeDisposerParamMethodBusinessResolution() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/LocalInt.java"
@@ -344,7 +160,7 @@
}
public void testAddLocalBeanResolution3() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java"
},
@@ -358,7 +174,7 @@
}
public void testMakeDisposerParamMethodPublicResolution() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.java"
},
@@ -372,7 +188,7 @@
}
public void testDeleteAllDisposerDuplicantsResolution() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TimestampLogger_Broken.java"
},
@@ -386,7 +202,7 @@
}
public void testDeleteAllInjectedConstructorsResolution() throws CoreException {
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Goose_Broken.java"
},
@@ -400,7 +216,7 @@
}
public void testAddSerializableInterfaceResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Hamina_Broken.java"
},
@@ -414,7 +230,7 @@
}
public void testAddSerializableInterfaceResolution2() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SecondBean.java"
},
@@ -428,7 +244,7 @@
}
public void testAddRetentionToQualifierResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier1.java"
},
@@ -442,7 +258,7 @@
}
public void testChangeRetentionToQualifierResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier2.java"
},
@@ -456,7 +272,7 @@
}
public void testAddRetentionToScopeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope1.java"
},
@@ -470,7 +286,7 @@
}
public void testChangeRetentionToScopeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope2.java"
},
@@ -484,7 +300,7 @@
}
public void testAddRetentionToStereotypeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype1.java"
},
@@ -498,7 +314,7 @@
}
public void testChangeRetentionToStereotypeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype2.java"
},
@@ -512,7 +328,7 @@
}
public void testAddTargetToStereotypeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype3.java"
},
@@ -523,7 +339,7 @@
}
public void testTargetRetentionToStereotypeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype4.java"
},
@@ -534,7 +350,7 @@
}
public void testAddTargetToQualifierResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier3.java"
},
@@ -545,7 +361,7 @@
}
public void testChangeTargetToQualifierResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier4.java"
},
@@ -556,7 +372,7 @@
}
public void testAddTargetToScopeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope3.java"
},
@@ -570,7 +386,7 @@
}
public void testChangeTargetToScopeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope4.java"
},
@@ -584,7 +400,7 @@
}
public void testAddNonbindingToAnnotationMemberOfQualifierResolution() throws
CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier5.java"
},
@@ -598,7 +414,7 @@
}
public void testAddNonbindingToArrayMemberOfQualifierResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier6.java"
},
@@ -612,7 +428,7 @@
}
public void testAddNonbindingToAnnotationMemberOfInterceptorResolution() throws
CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor1.java"
},
@@ -626,7 +442,7 @@
}
public void testAddNonbindingToArrayMemberOfInterceptorResolution() throws
CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor2.java"
},
@@ -640,7 +456,7 @@
}
public void testDeleteInjectFromProducerFieldResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInjectProducerField.java"
},
@@ -651,7 +467,7 @@
}
public void testDeleteInjectFromProducerMethodResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInjectProducerMethod.java"
},
@@ -662,7 +478,7 @@
}
public void testDeleteInjectFromObserverMethodResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInjectObserverMethod.java"
},
@@ -673,7 +489,7 @@
}
public void testDeleteInjectFromDisposerMethodResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInjectDisposerMethod.java"
},
@@ -684,7 +500,7 @@
}
public void testDeleteDisposesAnnotationFromParameterResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDisposerConstructor.java"
},
@@ -698,7 +514,7 @@
}
public void testDeleteObservesAnnotationFromParameterResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestObserverConstructor.java"
},
@@ -712,7 +528,7 @@
}
public void testDeleteDisposerFromInterceptorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor3.java"
},
@@ -726,7 +542,7 @@
}
public void testDeleteDisposerFromDecoratorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator.java"
},
@@ -740,7 +556,7 @@
}
public void testDeleteProducerFromInterceptorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor4.java"
},
@@ -754,7 +570,7 @@
}
public void testDeleteProducerFromDecoratorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator2.java"
},
@@ -768,7 +584,7 @@
}
public void testNonEmptyNamedInStereotypeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype5.java"
},
@@ -779,7 +595,7 @@
}
public void testNonEmptyNamedInStereotypeResolution2() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype5.java"
},
@@ -790,7 +606,7 @@
}
public void testNamedInInterceptorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor5.java"
},
@@ -804,7 +620,7 @@
}
public void testNamedStereotypedInterceptorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NamedStereotypedInterceptorBroken.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NamedStereotype.java"
@@ -816,7 +632,7 @@
}
public void testNamedInDecoratorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator3.java"
},
@@ -830,7 +646,7 @@
}
public void testNamedStereotypedDecoratorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NamedStereotypedDecoratorBroken.java",
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NamedStereotype.java"
@@ -842,7 +658,7 @@
}
public void testFullyQualifedNamedDecoratorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TD.java",
},
@@ -853,7 +669,7 @@
}
public void testTypedInStereotypeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype6.java"
},
@@ -867,7 +683,7 @@
}
public void testSpecializesInDecoratorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator4.java"
},
@@ -881,7 +697,7 @@
}
public void testSpecializesInInterceptorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor6.java"
},
@@ -895,7 +711,7 @@
}
public void testDisposerInProducerResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDisposerProducerMethod.java"
},
@@ -906,7 +722,7 @@
}
public void testObserverInProducerResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestObserverProducerMethod.java"
},
@@ -917,7 +733,7 @@
}
public void testDisposerInObserverResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/DisposerInObserver.java"
},
@@ -928,7 +744,7 @@
}
public void testObserverInDecoratorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ObserverInDecorator.java"
},
@@ -942,7 +758,7 @@
}
public void testObserverInInterceptorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/ObserverInInterceptor.java"
},
@@ -956,7 +772,7 @@
}
public void testSessionBeanAnnotatedDecoratorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.java"
},
@@ -970,7 +786,7 @@
}
public void testSessionBeanAnnotatedInterceptorBrokenResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.java"
},
@@ -984,7 +800,7 @@
}
public void testCreateBeanClassResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
//"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/beans.xml"
"WebContent/WEB-INF/beans.xml"
@@ -996,7 +812,7 @@
}
public void testCreateStereotypeResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
//"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/beans.xml"
"WebContent/WEB-INF/beans.xml"
@@ -1008,7 +824,7 @@
}
public void testCreateInterceptorResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
//"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/beans.xml"
"WebContent/WEB-INF/beans.xml"
@@ -1020,7 +836,7 @@
}
public void testAddNameResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NamedInjectionBroken.java"
},
@@ -1031,7 +847,7 @@
}
public void testDeleteAllOtherDisposerParametersResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MultipleDisposers.java"
},
@@ -1042,7 +858,7 @@
}
public void testDeleteAllOtherObserverParametersResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/MultipleObservers.java"
},
@@ -1053,7 +869,7 @@
}
public void testMakeFieldProtectedResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Leopard_Broken.java"
},
@@ -1064,7 +880,7 @@
}
public void testMakeBeanScopedDependentResolution() throws CoreException{
- checkResolution(tckProject,
+ MarkerResolutionTestUtil.checkResolution(tckProject,
new String[]{
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Leopard_Broken.java"
},
Copied:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithDialog.java
(from rev 39121,
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithDialog.java)
===================================================================
---
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithDialog.java
(rev 0)
+++
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithDialog.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.common.refactoring;
+
+import org.eclipse.core.resources.IMarker;
+
+/**
+ * @author Daniel Azarov
+ */
+public interface TestableResolutionWithDialog {
+ public void runForTest(IMarker marker);
+}
Property changes on:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithRefactoringProcessor.java
(from rev 39121,
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/TestableResolutionWithRefactoringProcessor.java)
===================================================================
---
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithRefactoringProcessor.java
(rev 0)
+++
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithRefactoringProcessor.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.common.refactoring;
+
+import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
+
+/**
+ * @author Daniel Azarov
+ */
+public interface TestableResolutionWithRefactoringProcessor {
+ public RefactoringProcessor getRefactoringProcessor();
+}
Property changes on:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/TestableResolutionWithRefactoringProcessor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF 2012-02-24
22:21:27 UTC (rev 39133)
+++ trunk/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF 2012-02-25
01:00:59 UTC (rev 39134)
@@ -34,7 +34,8 @@
org.eclipse.wst.common.frameworks;bundle-version="1.2.100",
org.eclipse.ltk.core.refactoring;bundle-version="3.5.0",
org.jboss.tools.common.model;bundle-version="3.3.0",
- org.eclipse.search;bundle-version="3.7.0"
+ org.eclipse.search;bundle-version="3.7.0",
+ org.jboss.tools.common.ui
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
Added:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/MarkerResolutionTestUtil.java
===================================================================
---
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/MarkerResolutionTestUtil.java
(rev 0)
+++
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/MarkerResolutionTestUtil.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -0,0 +1,194 @@
+package org.jboss.tools.common.base.test;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.ltk.core.refactoring.CompositeChange;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.ide.IDE;
+import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.common.refactoring.TestableResolutionWithDialog;
+import org.jboss.tools.common.refactoring.TestableResolutionWithRefactoringProcessor;
+import org.jboss.tools.common.ui.marker.AddSuppressWarningsMarkerResolution;
+import org.jboss.tools.common.ui.marker.ConfigureProblemSeverityMarkerResolution;
+import org.jboss.tools.common.util.FileUtil;
+
+public class MarkerResolutionTestUtil extends TestCase{
+
+ private static void checkForConfigureProblemSeverity(IMarkerResolution[] resolutions){
+ for(IMarkerResolution resolution : resolutions){
+ if(resolution.getClass().equals(ConfigureProblemSeverityMarkerResolution.class))
+ return;
+ }
+ fail("Configure Problem Severity marker resolution not found");
+ }
+
+ private static void checkForAddSuppressWarnings(IFile file, IMarker marker,
IMarkerResolution[] resolutions){
+ int severity = marker.getAttribute(IMarker.SEVERITY, 0);
+ if(file.getFileExtension().equals("java") && severity ==
IMarker.SEVERITY_WARNING){
+ for(IMarkerResolution resolution : resolutions){
+ if(resolution.getClass().equals(AddSuppressWarningsMarkerResolution.class))
+ return;
+ }
+ fail("Add @SuppressWarnings marker resolution not found");
+ }
+ }
+
+ public static void checkResolution(IProject project, String[] fileNames, String
markerType, String idName, int id, Class<? extends IMarkerResolution>
resolutionClass) throws CoreException {
+ checkResolution(project, fileNames, new String[]{}, markerType, idName, id,
resolutionClass);
+ }
+
+ public static void checkResolution(IProject project, String[] fileNames, String[]
results, String markerType, String idName, int id, Class<? extends
IMarkerResolution> resolutionClass) throws CoreException {
+ IFile file = project.getFile(fileNames[0]);
+
+ assertTrue("File - "+file.getFullPath()+" must be
exist",file.exists());
+
+ copyFiles(project, fileNames);
+ TestUtil.validate(file);
+
+ try{
+ file = project.getFile(fileNames[0]);
+ IMarker[] markers = file.findMarkers(markerType, true, IResource.DEPTH_INFINITE);
+
+ for (int i = 0; i < markers.length; i++) {
+ IMarker marker = markers[i];
+ Integer attribute = ((Integer) marker
+ .getAttribute(idName));
+ if (attribute != null){
+ int messageId = attribute.intValue();
+ if(messageId == id){
+ IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+ .getResolutions(marker);
+ checkForConfigureProblemSeverity(resolutions);
+ checkForAddSuppressWarnings(file, marker, resolutions);
+ for (int j = 0; j < resolutions.length; j++) {
+ IMarkerResolution resolution = resolutions[j];
+ if (resolution.getClass().equals(resolutionClass)) {
+
+ if(resolution instanceof TestableResolutionWithRefactoringProcessor){
+ RefactoringProcessor processor =
((TestableResolutionWithRefactoringProcessor)resolution).getRefactoringProcessor();
+
+ RefactoringStatus status = processor.checkInitialConditions(new
NullProgressMonitor());
+
+// RefactoringStatusEntry[] entries = status.getEntries();
+// for(RefactoringStatusEntry entry : entries){
+// System.out.println("Refactor status - "+entry.getMessage());
+// }
+
+ assertNull("Rename processor returns fatal error",
status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
+
+ status = processor.checkFinalConditions(new NullProgressMonitor(), null);
+
+// entries = status.getEntries();
+// for(RefactoringStatusEntry entry : entries){
+// System.out.println("Refactor status - "+entry.getMessage());
+// }
+
+ assertNull("Rename processor returns fatal error",
status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
+
+ CompositeChange rootChange = (CompositeChange)processor.createChange(new
NullProgressMonitor());
+
+// for(Change fileChange : rootChange.getChildren()){
+// if(fileChange instanceof JBDSFileChange){
+// ((JBDSFileChange)fileChange).setSaveMode(TextFileChange.FORCE_SAVE);
+// }
+// }
+
+ rootChange.perform(new NullProgressMonitor());
+ } else if(resolution instanceof TestableResolutionWithDialog){
+ ((TestableResolutionWithDialog) resolution).runForTest(marker);
+ } else {
+ resolution.run(marker);
+ }
+
+ TestUtil.validate(file);
+
+ file = project.getFile(fileNames[0]);
+ IMarker[] newMarkers = file.findMarkers(markerType,
true, IResource.DEPTH_INFINITE);
+
+ assertTrue("Marker resolution did not decrease number of problems. was:
"+markers.length+" now: "+newMarkers.length, newMarkers.length <
markers.length);
+
+ checkResults(project, fileNames, results);
+
+ return;
+ }
+ }
+ fail("Marker resolution: "+resolutionClass+" not found");
+ }
+ }
+ }
+ fail("Problem marker with id: "+id+" not found");
+ }finally{
+ restoreFiles(project, fileNames);
+ TestUtil.validate(file);
+ }
+ }
+
+ private static void copyFiles(IProject project, String[] fileNames) throws
CoreException{
+ for(String fileName : fileNames){
+ IFile file = project.getFile(fileName);
+ IFile copyFile = project.getFile(fileName+".copy");
+
+ if(copyFile.exists())
+ copyFile.delete(true, null);
+
+ InputStream is = null;
+ try{
+ is = file.getContents();
+ copyFile.create(is, true, null);
+ } finally {
+ if(is!=null) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+
+ private static void restoreFiles(IProject project, String[] fileNames) throws
CoreException {
+ for(String fileName : fileNames){
+ IFile file = project.getFile(fileName);
+ IFile copyFile = project.getFile(fileName+".copy");
+ InputStream is = null;
+ try{
+ is = copyFile.getContents();
+ file.setContents(is, true, false, null);
+ } finally {
+ if(is!=null) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ copyFile.delete(true, null);
+ }
+ }
+
+ private static void checkResults(IProject project, String[] fileNames, String[] results)
throws CoreException{
+ for(int i = 0; i < results.length; i++){
+ IFile file = project.getFile(fileNames[i]);
+ IFile resultFile = project.getFile(results[i]);
+
+ String fileContent = FileUtil.readStream(file);
+ String resultContent = FileUtil.readStream(resultFile);
+
+ assertEquals("Wrong result of resolution", resultContent, fileContent);
+ }
+ }
+
+}
Property changes on:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/MarkerResolutionTestUtil.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2012-02-24
22:21:27 UTC (rev 39133)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2012-02-25
01:00:59 UTC (rev 39134)
@@ -11,31 +11,21 @@
package org.jboss.tools.seam.ui.test.marker;
import java.io.IOException;
-import java.io.InputStream;
import junit.framework.TestCase;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.ide.IDE;
-import org.jboss.tools.common.ui.marker.AddSuppressWarningsMarkerResolution;
-import org.jboss.tools.common.ui.marker.ConfigureProblemSeverityMarkerResolution;
-import org.jboss.tools.jst.web.kb.PageContextFactory;
-import org.jboss.tools.seam.core.SeamCoreBuilder;
+import org.jboss.tools.common.base.test.MarkerResolutionTestUtil;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
+import org.jboss.tools.seam.internal.core.validation.SeamCoreValidator;
import org.jboss.tools.seam.ui.marker.AddAnnotatedMethodMarkerResolution;
import org.jboss.tools.seam.ui.marker.AddAnnotationMarkerResolution;
-import org.jboss.tools.seam.ui.marker.AddSetterMarkerResolution;
import org.jboss.tools.seam.ui.marker.ChangeScopeMarkerResolution;
import org.jboss.tools.seam.ui.marker.DeleteAnnotationMarkerResolution;
import org.jboss.tools.seam.ui.marker.RenameAnnotationMarkerResolution;
@@ -46,30 +36,9 @@
*
*/
public class SeamMarkerResolutionTest extends TestCase {
- public static final String MARKER_TYPE =
"org.eclipse.wst.validation.problemmarker";
- //public static final String TEXT_MARKER_TYPE =
"org.eclipse.wst.validation.textmarker";
private IProject project;
- private void checkForConfigureProblemSeverity(IMarkerResolution[] resolutions){
- for(IMarkerResolution resolution : resolutions){
- if(resolution.getClass().equals(ConfigureProblemSeverityMarkerResolution.class))
- return;
- }
- fail("Configure Problem Severity marker resolution not found");
- }
-
- private void checkForAddSuppressWarnings(IFile file, IMarker marker, IMarkerResolution[]
resolutions){
- int severity = marker.getAttribute(IMarker.SEVERITY, 0);
- if(file.getFileExtension().equals("java") && severity ==
IMarker.SEVERITY_WARNING){
- for(IMarkerResolution resolution : resolutions){
- if(resolution.getClass().equals(AddSuppressWarningsMarkerResolution.class))
- return;
- }
- fail("Add @SuppressWarnings marker resolution not found");
- }
- }
-
@Override
protected void setUp() throws Exception {
JobUtils.waitForIdle();
@@ -92,460 +61,230 @@
@Override
protected void tearDown() throws Exception {
}
-
+
public void testDuplicateRemoveAnnotationResolution() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateRemoveComponent.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean found = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("javax.ejb.Remove",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- found = true;
- break;
- }
- }
- if (found) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Remove annotation\" doesn't
exist.", found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateRemoveComponent.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.DUPLICATE_REMOVE_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
-
+
public void testDuplicateDestroyAnnotationResolution() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateDestroyComponent.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean found = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Destroy",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- found = true;
- break;
- }
- }
- if (found) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Destroy annotation\" doesn't
exist.", found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateDestroyComponent.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
public void testDuplicateDestroyAnnotationResolution2() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean found = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Destroy",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- found = true;
- break;
- }
- }
- if (found) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Destroy annotation\" doesn't
exist.", found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
-
+
public void testDuplicateCreateAnnotationResolution() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean found = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Create",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- found = true;
- break;
- }
- }
- if (found) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Create annotation\" doesn't
exist.", found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.DUPLICATE_CREATE_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
public void testDuplicateUnwrapAnnotationResolution() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateUnwrapComponent.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean found = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Unwrap",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- found = true;
- break;
- }
- }
- if (found) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Unwrap annotation\" doesn't
exist.", found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateUnwrapComponent.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.DUPLICATE_UNWRAP_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
-
+
public void testOnlyComponentClassCanHaveCreateMethodResolution() throws CoreException
{
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean dFound = false;
- boolean cFound = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Create",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- dFound = true;
- }
- if (resolution instanceof AddAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Name",
((AddAnnotationMarkerResolution)resolution).getQualifiedName());
- cFound = true;
- }
- }
- if (dFound && cFound) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Create annotation\" doesn't
exist.", dFound);
- assertTrue("The quickfix \"Add @Name annotation\" doesn't
exist.", cFound);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
-
+
+ public void testOnlyComponentClassCanHaveCreateMethodResolution2() throws CoreException
{
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithCreateMethod.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID,
+ AddAnnotationMarkerResolution.class);
+ }
+
public void testOnlyComponentClassCanHaveUnwrapMethodResolution() throws CoreException
{
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean dFound = false;
- boolean cFound = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Unwrap",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- dFound = true;
- }
- if (resolution instanceof AddAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Name",
((AddAnnotationMarkerResolution)resolution).getQualifiedName());
- cFound = true;
- }
- }
- if (dFound && cFound) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Unwrap annotation\" doesn't
exist.", dFound);
- assertTrue("The quickfix \"Add @Name annotation\" doesn't
exist.", cFound);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
-
+
+ public void testOnlyComponentClassCanHaveUnwrapMethodResolution2() throws CoreException
{
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithUnwrapMethod.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID,
+ AddAnnotationMarkerResolution.class);
+ }
+
public void testOnlyComponentClassCanHaveObserverMethodResolution() throws CoreException
{
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean dFound = false;
- boolean cFound = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Observer",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- dFound = true;
- }
- if (resolution instanceof AddAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Name",
((AddAnnotationMarkerResolution)resolution).getQualifiedName());
- cFound = true;
- }
- }
- if (dFound && cFound) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Observer annotation\" doesn't
exist.", dFound);
- assertTrue("The quickfix \"Add @Name annotation\" doesn't
exist.", cFound);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
-
+
+ public void testOnlyComponentClassCanHaveObserverMethodResolution2() throws
CoreException {
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/NonComponentWithObserverMethod.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID,
+ AddAnnotationMarkerResolution.class);
+ }
+
public void testDuplicateComponentNameResolution() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/DuplicateComponent1.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean dFound = false;
- boolean cFound = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, marker, resolutions);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof DeleteAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Name",
((DeleteAnnotationMarkerResolution)resolution).getQualifiedName());
- dFound = true;
- }
- if (resolution instanceof RenameAnnotationMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Name",
((RenameAnnotationMarkerResolution)resolution).getQualifiedName());
- cFound = true;
- }
- }
- if (dFound && cFound) {
- break;
- }
- }
- assertTrue("The quickfix \"Delete @Name annotation\" doesn't
exist.", dFound);
- assertTrue("The quickfix \"Rename @Name annotation\" doesn't
exist.", cFound);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/DuplicateComponent1.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.NONUNIQUE_COMPONENT_NAME_MESSAGE_ID,
+ DeleteAnnotationMarkerResolution.class);
}
+ public void testDuplicateComponentNameResolution2() throws CoreException {
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/DuplicateComponent1.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.NONUNIQUE_COMPONENT_NAME_MESSAGE_ID,
+ RenameAnnotationMarkerResolution.class);
+ }
+
public void testAddRemoveMethodResolution() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithoutRemove.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean found = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, marker, resolutions);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof AddAnnotatedMethodMarkerResolution) {
- assertEquals("javax.ejb.Remove",
((AddAnnotatedMethodMarkerResolution)resolution).getQualifiedName());
- found = true;
- break;
- }
- }
- if (found) {
- break;
- }
- }
- assertTrue("The quickfix \"Add @Remove annotated method\" doesn't
exist.", found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithoutRemove.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE_ID,
+ AddAnnotatedMethodMarkerResolution.class);
}
public void testAddDestroyMethodResolution() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithoutDestroy.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- boolean found = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, marker, resolutions);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof AddAnnotatedMethodMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Destroy",
((AddAnnotatedMethodMarkerResolution)resolution).getQualifiedName());
- found = true;
- break;
- }
- }
- if (found) {
- break;
- }
- }
- assertTrue("The quickfix \"Add @Destroy annotated method\" doesn't
exist.", found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithoutDestroy.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY_ID,
+ AddAnnotatedMethodMarkerResolution.class);
}
public void testChangeScopeResolution() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithWrongScope.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- int found = 0;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, marker, resolutions);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof ChangeScopeMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Scope",
((ChangeScopeMarkerResolution)resolution).getQualifiedName());
- found++;
- }
- }
- }
- assertEquals("Not all quickfixes \"Change scope to...\" found.", 7,
found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithWrongScope.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.STATEFUL_COMPONENT_WRONG_SCOPE_ID,
+ ChangeScopeMarkerResolution.class);
}
-
+
public void testChangeScopeResolution2() throws CoreException {
- String TARGET_FILE_NAME =
"src/action/org/domain/SeamWebWarTestProject/entity/EntityComponentWithWrongScope.java";
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- int found = 0;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, marker, resolutions);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof ChangeScopeMarkerResolution) {
- assertEquals("org.jboss.seam.annotations.Scope",
((ChangeScopeMarkerResolution)resolution).getQualifiedName());
- found++;
- }
- }
- }
- assertEquals("Not all quickfixes \"Change scope to...\" found.", 8,
found);
+ MarkerResolutionTestUtil.checkResolution(project,
+ new String[]{
+ "src/action/org/domain/SeamWebWarTestProject/entity/EntityComponentWithWrongScope.java"
+ },
+ SeamCoreValidator.PROBLEM_TYPE,
+ SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME,
+ SeamCoreValidator.ENTITY_COMPONENT_WRONG_SCOPE_ID,
+ ChangeScopeMarkerResolution.class);
}
-
- public void fixMeTestAddSetterForProperty() throws CoreException {
- String TARGET_FILE_NAME = "WebContent/WEB-INF/components.xml";
- copyContentsFile(TARGET_FILE_NAME, "WebContent/WEB-INF/components.3");
-
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, SeamCoreBuilder.BUILDER_ID,
null, null);
-
- JobUtils.waitForIdle();
-
- IFile file = project.getFile(TARGET_FILE_NAME);
-
- assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
-
- IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
-
- assertTrue("Problem marker not found", markers.length > 0);
-
- boolean found = false;
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
- .getResolutions(marker);
- checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, marker, resolutions);
- for (int j = 0; j < resolutions.length; j++) {
- IMarkerResolution resolution = resolutions[j];
- if (resolution instanceof AddSetterMarkerResolution) {
- found = true;
- break;
- }
- }
- if (found) {
- break;
- }
- }
- assertTrue("The quickfix \"Add setter for 'abc' property in
'org.domain.SeamWebWarTestProject.session.StatefulComponentWithAbcField'
class\" doesn't exist.", found);
- }
-
- protected void copyContentsFile(String originalName, String newContentName) throws
CoreException{
- IFile originalFile = project.getFile(originalName);
- IFile newContentFile = project.getFile(newContentName);
-
- copyContentsFile(originalFile, newContentFile);
- }
+// public void fixMeTestAddSetterForProperty() throws CoreException {
+// String TARGET_FILE_NAME = "WebContent/WEB-INF/components.xml";
+// copyContentsFile(TARGET_FILE_NAME, "WebContent/WEB-INF/components.3");
+//
+// project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,
SeamCoreBuilder.BUILDER_ID, null, null);
+//
+// JobUtils.waitForIdle();
+//
+// IFile file = project.getFile(TARGET_FILE_NAME);
+//
+// assertTrue("File - "+TARGET_FILE_NAME+" must be
exists",file.exists());
+//
+// IMarker[] markers = file.findMarkers(SeamCoreValidator.PROBLEM_TYPE,
true, IResource.DEPTH_INFINITE);
+//
+// assertTrue("Problem marker not found", markers.length > 0);
+//
+// boolean found = false;
+// for (int i = 0; i < markers.length; i++) {
+// IMarker marker = markers[i];
+// IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
+// .getResolutions(marker);
+// //checkForConfigureProblemSeverity(resolutions);
+// //checkForAddSuppressWarnings(file, marker, resolutions);
+// for (int j = 0; j < resolutions.length; j++) {
+// IMarkerResolution resolution = resolutions[j];
+// if (resolution instanceof AddSetterMarkerResolution) {
+// found = true;
+// break;
+// }
+// }
+// if (found) {
+// break;
+// }
+// }
+// assertTrue("The quickfix \"Add setter for 'abc' property in
'org.domain.SeamWebWarTestProject.session.StatefulComponentWithAbcField'
class\" doesn't exist.", found);
+// }
- protected void copyContentsFile(IFile originalFile, IFile newContentFile) throws
CoreException{
- PageContextFactory.getInstance().cleanUp(originalFile);
- InputStream is = null;
- try{
- is = newContentFile.getContents();
- originalFile.setContents(is, true, false, null);
- } finally {
- if(is!=null) {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle();
- originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD,
"org.eclipse.jdt.internal.core.builder.JavaBuilder", null, null);
- JobUtils.waitForIdle();
- originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD,
SeamCoreBuilder.BUILDER_ID, null, null);
-// originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- JobUtils.waitForIdle();
- }
}