JBoss Tools SVN: r6060 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-01-31 06:51:03 -0500 (Thu, 31 Jan 2008)
New Revision: 6060
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeAddReferenceSupport.java
Log:
JBIDE-1711
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeAddReferenceSupport.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeAddReferenceSupport.java 2008-01-31 11:47:14 UTC (rev 6059)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/VpeAddReferenceSupport.java 2008-01-31 11:51:03 UTC (rev 6060)
@@ -99,7 +99,7 @@
}
public void action(String name) throws Exception {
- if(OK.equals(name)) {
+ if(OK.equals(name) || FINISH.equals(name)) {
execute();
setFinished(true);
getProperties().setProperty("okPressed", "true");
16 years, 11 months
JBoss Tools SVN: r6059 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-01-31 06:47:14 -0500 (Thu, 31 Jan 2008)
New Revision: 6059
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java
Log:
JBIDE-1711
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java 2008-01-31 10:20:17 UTC (rev 6058)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebSupport.java 2008-01-31 11:47:14 UTC (rev 6059)
@@ -17,7 +17,7 @@
public WebSupport() {}
public void action(String name) throws Exception {
- if(OK.equals(name)) {
+ if(OK.equals(name) || FINISH.equals(name)) {
setFinished(true);
} else if(CANCEL.equals(name)) {
setStepId(-1);
@@ -32,7 +32,7 @@
}
public boolean isActionEnabled(String name) {
- if(name.equals(OK)) {
+ if(OK.equals(name) || FINISH.equals(name)) {
return (getProperties().get("selectedObject") != null);
}
return true;
16 years, 11 months
JBoss Tools SVN: r6058 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-31 05:20:17 -0500 (Thu, 31 Jan 2008)
New Revision: 6058
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java
Log:
fix exception during the test
[java] java.lang.NullPointerException
[java] at org.jboss.tools.seam.internal.core.project.facet.SeamFacetPostInstallDelegate.execute(SeamFacetPostInstallDelegate.java:58)
[java] at org.eclipse.wst.common.project.facet.core.events.internal.LegacyEventHandlerAdapter.handleEvent(LegacyEventHandlerAdapter.java:69)
[java] at org.eclipse.wst.common.project.facet.core.events.internal.ListenerRegistry.notifyListeners(ListenerRegistry.java:76)
[java] at org.eclipse.wst.common.project.facet.core.internal.FacetedProject.notifyListeners(FacetedProject.java:1088)
[java] at org.eclipse.wst.common.project.facet.core.internal.FacetedProject.modifyInternal(FacetedProject.java:411)
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2008-01-31 08:50:51 UTC (rev 6057)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2008-01-31 10:20:17 UTC (rev 6058)
@@ -55,13 +55,14 @@
final IDataModel model = (IDataModel) config;
IServer server = (IServer) model.getProperty(JBOSS_AS_TARGET_SERVER);
- JBossServer jbs = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor());
- if (jbs != null) {
- String[] driverJars = (String[]) model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH);
- String configFolder = jbs.getConfigDirectory();
- AntCopyUtils.copyFiles(driverJars, new File(configFolder, "lib"), false);
- }
if (server != null) {
+ JBossServer jbs = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ if (jbs != null) {
+ String[] driverJars = (String[]) model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH);
+ String configFolder = jbs.getConfigDirectory();
+ AntCopyUtils.copyFiles(driverJars, new File(configFolder, "lib"), false);
+ }
+
RegistrationHelper.runRegisterInServerJob(project, server);
IPath filePath = new Path("resources").append(project.getName() + "-ds.xml");
16 years, 11 months
JBoss Tools SVN: r6057 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-01-31 03:50:51 -0500 (Thu, 31 Jan 2008)
New Revision: 6057
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/web.meta
Log:
JBIDE-1710
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/web.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/web.meta 2008-01-31 06:25:47 UTC (rev 6056)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/web.meta 2008-01-31 08:50:51 UTC (rev 6057)
@@ -666,6 +666,7 @@
<Constraint loader="List">
<value name="2.3"/>
<value name="2.4"/>
+ <value name="2.5"/>
</Constraint>
<Editor name="List"/>
</XModelAttribute>
16 years, 11 months
JBoss Tools SVN: r6056 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-31 01:25:47 -0500 (Thu, 31 Jan 2008)
New Revision: 6056
Added:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
Log:
fix test errors
Added: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-01-31 06:25:47 UTC (rev 6056)
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.test.util;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ProjectImportTestSetup extends TestSetup {
+
+ private String bundleName = "";
+ private String projectPath = "";
+ private String projectName = "";
+
+ /**
+ * @param test
+ */
+ public ProjectImportTestSetup(Test test,
+ String bundleName, String projectPath, String projectName) {
+ super(test);
+ this.bundleName = bundleName;
+ this.projectPath = projectPath;
+ this.projectName = projectName;
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ ResourcesUtils.importProject(bundleName, projectPath);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ ResourcesUtils.deleteProject(projectName);
+ }
+
+
+
+}
Property changes on: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 11 months
JBoss Tools SVN: r6055 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-31 01:25:43 -0500 (Thu, 31 Jan 2008)
New Revision: 6055
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
Log:
fix test errors
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2008-01-31 06:24:45 UTC (rev 6054)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2008-01-31 06:25:43 UTC (rev 6055)
@@ -482,7 +482,7 @@
@Override
protected void tearDown() throws Exception {
- EditorTestHelper.joinBackgroundActivities();
+ EditorTestHelper.joinJobs(1000, 10000, 500);
project.delete(true,true, null);
}
}
16 years, 11 months
JBoss Tools SVN: r6054 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/internal/core/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-31 01:24:45 -0500 (Thu, 31 Jan 2008)
New Revision: 6054
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamRuntimeValidation.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties
Log:
fix test errors
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-01-31 06:24:38 UTC (rev 6053)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-01-31 06:24:45 UTC (rev 6054)
@@ -60,7 +60,7 @@
</requires>
<requires
facet="jst.java"
- version="[5.0">
+ version="5.0">
</requires>
</and>
</constraint>
@@ -80,7 +80,7 @@
</requires>
<requires
facet="jst.java"
- version="[5.0">
+ version="5.0">
</requires>
</and>
</constraint>
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamRuntimeValidation.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamRuntimeValidation.java 2008-01-31 06:24:38 UTC (rev 6053)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamRuntimeValidation.java 2008-01-31 06:24:45 UTC (rev 6054)
@@ -25,7 +25,8 @@
* @author Viacheslav Kabanovich
*/
public class SeamRuntimeValidation {
- static final String TYPE = "org.jboss.tools.seam.core.seamProblem";
+
+ public static final String MARKER_TYPE = "org.jboss.tools.seam.core.seamProblem";
static final String ATTR_KIND = "kind";
static final String RUNTIME_KIND = "SeamRuntimeProblem";
@@ -52,7 +53,7 @@
}
private IMarker findErrorMarker(ISeamProject project) throws CoreException {
- IMarker[] ms = project.getProject().findMarkers(TYPE, true, IResource.DEPTH_ZERO);
+ IMarker[] ms = project.getProject().findMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);
if(ms == null) return null;
for (int i = 0; i < ms.length; i++) {
int s = ms[i].getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
@@ -85,7 +86,7 @@
}
private void doCreateMarker(ISeamProject project, String message) throws CoreException {
- IMarker marker = project.getProject().createMarker(TYPE);
+ IMarker marker = project.getProject().createMarker(MARKER_TYPE);
marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
marker.setAttribute(IMarker.MESSAGE, message);
marker.setAttribute(ATTR_KIND, RUNTIME_KIND);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java 2008-01-31 06:24:38 UTC (rev 6053)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java 2008-01-31 06:24:45 UTC (rev 6054)
@@ -32,6 +32,9 @@
*/
public abstract class SeamValidator implements ISeamValidator {
+ public static final String BASE_NAME
+ = "org.jboss.tools.seam.internal.core.validation.messages"; //$NON-NLS-1$
+
IStatus OK_STATUS = new Status(IStatus.OK,
"org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
@@ -54,7 +57,7 @@
}
protected String getBaseName() {
- return "org.jboss.tools.seam.internal.core.validation.messages"; //$NON-NLS-1$
+ return BASE_NAME;
}
protected void addError(String messageId, String preferenceKey,
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties 2008-01-31 06:24:38 UTC (rev 6053)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties 2008-01-31 06:24:45 UTC (rev 6054)
@@ -9,7 +9,7 @@
#* Red Hat, Inc. - initial API and implementation
#******************************************************************************/
#Components
-NONUNIQUE_COMPONENT_NAME_MESSAGE=Duplicate component name: {0}
+NONUNIQUE_COMPONENT_NAME_MESSAGE=Duplicate component name: "{0}"
STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE=Stateful component "{0}" must have a method marked @Remove
STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY=Stateful component "{0}" must have a method marked @Destroy
STATEFUL_COMPONENT_WRONG_SCOPE=Stateful component "{0}" should not have org.jboss.seam.ScopeType.PAGE, nor org.jboss.seam.ScopeType.STATELESS
@@ -34,15 +34,15 @@
#Bijections
MULTIPLE_DATA_BINDER=@DataModelSelection and @DataModelSelectionIndex without name of the DataModel requires the only one @DataModel in the component
-UNKNOWN_DATA_MODEL=Unknown @DataModel/@Out name: {0}
+UNKNOWN_DATA_MODEL=Unknown @DataModel/@Out name: "{0}"
#Context variables
-DUPLICATE_VARIABLE_NAME=Duplicate variable name: {0}
-UNKNOWN_VARIABLE_NAME=Unknown context variable name: {0}
+DUPLICATE_VARIABLE_NAME=Duplicate variable name: "{0}"
+UNKNOWN_VARIABLE_NAME=Unknown context variable name: "{0}"
#Seam Expression language
-UNKNOWN_EL_VARIABLE_NAME={0} cannot be resolved
-UNKNOWN_EL_VARIABLE_PROPERTY_NAME={0} cannot be resolved
+UNKNOWN_EL_VARIABLE_NAME="{0}" cannot be resolved
+UNKNOWN_EL_VARIABLE_PROPERTY_NAME="{0}" cannot be resolved
UNPAIRED_GETTER_OR_SETTER=Property "{0}" has only {1}. {2} is missing.
#Messages for Progress Monitor
16 years, 11 months
JBoss Tools SVN: r6053 - in trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools: tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-31 01:24:38 -0500 (Thu, 31 Jan 2008)
New Revision: 6053
Added:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/EditorTestHelper.java
Log:
fix test errors
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/EditorTestHelper.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/EditorTestHelper.java 2008-01-31 06:24:33 UTC (rev 6052)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/xpl/EditorTestHelper.java 2008-01-31 06:24:38 UTC (rev 6053)
@@ -186,6 +186,7 @@
}
};
boolean quiet= helper.waitForCondition(getActiveDisplay(), maxTime > 0 ? maxTime : Long.MAX_VALUE, intervalTime);
+ runEventQueue(minTime);
Logger.global.exiting("EditorTestHelper", "joinJobs", new Boolean(quiet)); //$NON-NLS-1$ //$NON-NLS-2$
return quiet;
}
Added: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2008-01-31 06:24:38 UTC (rev 6053)
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.tests;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * @author eskimo
+ *
+ */
+public class AbstractResourceMarkerTest extends TestCase {
+
+ /**
+ *
+ */
+ public AbstractResourceMarkerTest() {
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ *
+ */
+ public AbstractResourceMarkerTest(String name) {
+ super(name);
+ }
+
+ protected int findMarkerfLine(IFile file, String type, String pattern)
+ throws CoreException {
+ int number = -1;
+ IMarker[] markers = new IMarker[0];
+
+ markers = file.findMarkers(type, false, IResource.DEPTH_INFINITE);
+
+ for (int i = 0; i < markers.length; i++) {
+ String message = markers[i].getAttribute(IMarker.MESSAGE, "");
+ if (message.matches(pattern)) {
+ number = markers[i].getAttribute(IMarker.LINE_NUMBER, -1);
+ }
+ }
+
+ return number;
+ }
+
+ protected void assertMarkerIsCreated(IFile file, MarkerData markerData) throws CoreException {
+ assertMarkerIsCreated(file, markerData.type, markerData.pattern, markerData.line);
+ }
+
+ protected void assertMarkerIsCreated(IFile file, String type, String pattern, int expectedLine)
+ throws CoreException {
+
+ int line = findMarkerfLine(
+ file, type, pattern);
+
+ assertTrue("Marker matches the '" + pattern + "' pattern wasn't found",
+ line != -1);
+
+ assertEquals("Marker matches the '" + pattern + "' pattern was found at wrong line",
+ expectedLine,line);
+ }
+
+ protected void assertMarkersIsCreated(IFile file, MarkerData[] markersData) throws CoreException {
+ for (MarkerData markerData : markersData) {
+ assertMarkerIsCreated(file, markerData);
+ }
+ }
+
+ /**
+ *
+ * @author eskimo
+ *
+ */
+ public static class MarkerData {
+
+ private String type;
+ private String pattern;
+ private int line = -1;
+
+ public MarkerData(String type, String pattern, int line) {
+ this.type = type;
+ this.pattern = pattern;
+ this.line = line;
+ }
+
+ public int getLine() {
+ return line;
+ }
+
+ public void setLine(int line) {
+ this.line = line;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getPattern() {
+ return pattern;
+ }
+
+ public void setPattern(String pattern) {
+ this.pattern = pattern;
+ }
+
+ }
+
+}
Property changes on: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 11 months
JBoss Tools SVN: r6052 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-31 01:24:33 -0500 (Thu, 31 Jan 2008)
New Revision: 6052
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
fix test errors
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2008-01-31 05:14:12 UTC (rev 6051)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2008-01-31 06:24:33 UTC (rev 6052)
@@ -13,7 +13,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.seam.core.test.project.facet.Seam2FacetInstallDelegateTest;
import org.jboss.tools.seam.core.test.project.facet.SeamFacetInstallDelegateTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeManagerTest;
@@ -32,7 +31,7 @@
suite.addTestSuite(SeamRuntimeListConverterTest.class);
suite.addTestSuite(SeamRuntimeManagerTest.class);
suite.addTestSuite(SeamFacetInstallDelegateTest.class);
- suite.addTest(new SeamValidatorsTestSetup(new TestSuite(SeamValidatorsTest.class)));
+ suite.addTest(SeamValidatorsAllTests.suite());
// Seam 2 tests can't run on hudson for now ;(
//suite.addTestSuite(Seam2FacetInstallDelegateTest.class);
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-01-31 05:14:12 UTC (rev 6051)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-01-31 06:24:33 UTC (rev 6052)
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.seam.core.ISeamComponent;
@@ -46,30 +47,18 @@
TestProjectProvider providerEJB = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ejb", makeCopy);
projectEJB = providerEJB.getProject();
- try {
- projectEAR.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- projectWAR.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- projectEJB.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- } catch (Exception e) {
- JUnitUtils.fail("Error in refreshing",e);
- }
+ projectEAR.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ projectWAR.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ projectEJB.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
EditorTestHelper.joinBackgroundActivities();
}
- private ISeamProject getSeamProject(IProject project) {
- try {
- EditorTestHelper.joinBackgroundActivities();
-// XJob.waitForJob();
- } catch (Exception e) {
- JUnitUtils.fail("Interrupted",e);
- }
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- EditorTestHelper.joinBackgroundActivities();
- } catch (Exception e) {
- JUnitUtils.fail("Cannot build", e);
- }
+ private ISeamProject getSeamProject(IProject project) throws CoreException {
+
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ EditorTestHelper.joinBackgroundActivities();
+
ISeamProject seamProject = null;
/*
@@ -80,24 +69,12 @@
* (ISeamProject)project.getNature(SeamProject.NATURE_ID);
*/
seamProject = SeamCorePlugin.getSeamProject(project, true);
-// try {
-// seamProject = (ISeamProject)project.getNature(SeamProject.NATURE_ID);
-// } catch (Exception e) {
-// JUnitUtils.fail("Cannot get seam nature.",e);
-// }
+
assertNotNull("Seam project is null", seamProject);
return seamProject;
}
- /**
- * This empty test is meaningful as it gives Eclipse opportunity
- * to pass for the first time setUp() and show the license dialog
- * that may cause InterruptedException for XJob.waitForJob()
- */
- public void testCreatingProject() {
- }
-
- public void testProject() {
+ public void testEarProject() throws CoreException {
ISeamProject seamProject = getSeamProject(projectWAR);
ISeamComponent c = seamProject.getComponent("authenticator");
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java 2008-01-31 06:24:33 UTC (rev 6052)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.seam.core.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author eskimo
+ *
+ */
+public class SeamValidatorsAllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new SeamValidatorsTestSetup(new TestSuite(SeamValidatorsTest.class)));
+ return suite;
+ }
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-01-31 05:14:12 UTC (rev 6051)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-01-31 06:24:33 UTC (rev 6052)
@@ -13,8 +13,6 @@
import java.io.IOException;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
@@ -32,17 +30,26 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
import org.jboss.tools.seam.internal.core.SeamProject;
+import org.jboss.tools.seam.internal.core.validation.SeamRuntimeValidation;
import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
-public class SeamValidatorsTest extends TestCase {
+public class SeamValidatorsTest extends AbstractResourceMarkerTest {
IProject project = null;
- public SeamValidatorsTest() {}
+ public SeamValidatorsTest() {
+ super("Seam Validator Tests");
+ }
protected void setUp() throws Exception {
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("SeamWebWarTestProject");
+ if(project == null) {
+ new SeamValidatorsTestSetup(this).setUp();
+ }
project = ResourcesPlugin.getWorkspace().getRoot().getProject("SeamWebWarTestProject");
- project.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ this.project = project.getProject();
+ this.project.build(IncrementalProjectBuilder.FULL_BUILD, null);
EditorTestHelper.joinJobs(5000, 20000, 1000);
}
@@ -93,7 +100,7 @@
String[] messages = getMarkersMessage(bbcComponentFile);
- assertTrue("Problem marker 'Duplicate component name' not found","Duplicate component name: abcComponent".equals(messages[0]));
+ assertTrue("Problem marker 'Duplicate component name' not found","Duplicate component name: \"abcComponent\"".equals(messages[0]));
int[] lineNumbers = getMarkersNumbersOfLine(bbcComponentFile);
@@ -267,233 +274,123 @@
assertTrue("Problem marker has wrong line number", lineNumbers[0] == 15);
}
- public void testComponentLifeCycleMethodsValidator() {
+ public void testComponentLifeCycleMethodsValidator() throws CoreException {
+ final String TARGET_FILE_NAME
+ = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java";
+
ISeamProject seamProject = getSeamProject(project);
IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml");
- IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java");
+ final String NEW_CONTENT_FILE_NAME6 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.6";
// Duplicate @Destroy method
System.out.println("Test - Duplicate @Destroy method");
-
- IFile statefulComponentFile6 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.6");
- try{
- statefulComponentFile.setContents(statefulComponentFile6.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'StatefulComponent.java' content to " +
- "'StatefulComponent.6'", ex);
- }
-
+
refreshProject(project);
- int number = getMarkersNumber(statefulComponentFile);
- assertFalse("Problem marker 'Duplicate @Destroy method' was not found", number == 0);
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,
+ NEW_CONTENT_FILE_NAME6,
+ ".*\"destroyMethod\".*", 34);
- String[] messages = getMarkersMessage(statefulComponentFile);
- assertTrue("Problem marker 'Duplicate @Destroy method' was not found", messages[0].startsWith("Duplicate @Destroy method \"destroyMethod"));
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME, ".*\"destroyMethod2\"", 39);
- int[] lineNumbers = getMarkersNumbersOfLine(statefulComponentFile);
-
- assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
-
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 32);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 38);
-
-
// Duplicate @Create method
System.out.println("Test - Duplicate @Create method");
- IFile statefulComponentFile7 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.7");
- try{
- statefulComponentFile.setContents(statefulComponentFile7.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'StatefulComponent.java' content to " +
- "'StatefulComponent.7'", ex);
- }
+ final String NEW_CONTENT_FILE_NAME7 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.7";
+
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME7, ".*(a)Create.*\"createMethod\".*", 36);
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME, ".*(a)Create.*\"createMethod2\".*", 41);
- refreshProject(project);
- number = getMarkersNumber(statefulComponentFile);
- assertFalse("Problem marker 'Duplicate @Create method' was not found' not found' not found", number == 0);
- messages = getMarkersMessage(statefulComponentFile);
- assertTrue("Problem marker 'Duplicate @Create method' was not found", messages[0].startsWith("Duplicate @Create method \"createMethod"));
-
- lineNumbers = getMarkersNumbersOfLine(statefulComponentFile);
-
- assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
-
- if(messages[1].indexOf("createMethod2") >= 0){
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 33);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 40);
- }else{
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 40);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 33);
-
- }
-
// Duplicate @Unwrap method
System.out.println("Test - Duplicate @Unwrap method");
- IFile statefulComponentFile8 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.8");
- try{
- statefulComponentFile.setContents(statefulComponentFile8.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'StatefulComponent.java' content to " +
- "'StatefulComponent.8'", ex);
- }
+ final String NEW_CONTENT_FILE_NAME8 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.8";
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME8, ".*(a)Unwrap.*\"unwrapMethod\".*", 40);
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME, ".*(a)Unwrap.*\"unwrapMethod2\".*", 45);
- refreshProject(project);
- number = getMarkersNumber(statefulComponentFile);
- assertFalse("Problem marker 'Duplicate @Unwrap method' was not found' not found' not found", number == 0);
-
- messages = getMarkersMessage(statefulComponentFile);
- assertTrue("Problem marker 'Duplicate @Unwrap method' was not found", messages[0].startsWith("Duplicate @Unwrap method \"unwrapMethod"));
-
- lineNumbers = getMarkersNumbersOfLine(statefulComponentFile);
-
- assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
-
- if(messages[1].indexOf("unwrapMethod2") >= 0){
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 39);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 44);
- }else{
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 44);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 39);
-
- }
-
// Only component class can have @Destroy method
System.out.println("Test - Only component class can have @Destroy method");
- IFile componentsFile4 = project.getFile("WebContent/WEB-INF/components.4");
+ final String NEW_CONTENT_FILE_NAME9 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.9";
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME9, ".*(a)Destroy.*\"destroyMethod\".*", 25);
- try{
- componentsFile.setContents(componentsFile4.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'components.xml' content to " +
- "'components.4'", ex);
- }
- IFile statefulComponentFile9 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.9");
- try{
- statefulComponentFile.setContents(statefulComponentFile9.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'StatefulComponent.java' content to " +
- "'StatefulComponent.9'", ex);
- }
- refreshProject(project);
-
- number = getMarkersNumber(statefulComponentFile);
- assertFalse("Problem marker 'Only component class can have @Destroy method' not found' not found' not found", number == 0);
-
- messages = getMarkersMessage(statefulComponentFile);
- assertTrue("Problem marker 'Only component class can have @Destroy method' not found", "Only component class can have @Destroy method \"destroyMethod\"".equals(messages[0]));
-
- lineNumbers = getMarkersNumbersOfLine(statefulComponentFile);
-
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 23);
-
// Only component class can have @Create method
System.out.println("Test - Only component class can have @Create method");
- IFile statefulComponentFile10 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.10");
- try{
- statefulComponentFile.setContents(statefulComponentFile10.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'StatefulComponent.java' content to " +
- "'StatefulComponent.10'", ex);
- }
+ final String NEW_CONTENT_FILE_NAME10 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.10";
- refreshProject(project);
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME10, ".*(a)Create.*\"createMethod\".*", 25);
- number = getMarkersNumber(statefulComponentFile);
- assertFalse("Problem marker 'Only component class can have @Create method' not found' not found' not found", number == 0);
-
- messages = getMarkersMessage(statefulComponentFile);
- assertTrue("Problem marker 'Only component class can have @Create method' not found", "Only component class can have @Create method \"createMethod\"".equals(messages[0]));
-
- lineNumbers = getMarkersNumbersOfLine(statefulComponentFile);
-
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 23);
-
// Only component class can have @Unwrap method
System.out.println("Test - Only component class can have @Unwrap method");
- IFile statefulComponentFile11 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.11");
- try{
- statefulComponentFile.setContents(statefulComponentFile11.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'StatefulComponent.java' content to " +
- "'StatefulComponent.11'", ex);
- }
+ final String NEW_CONTENT_FILE_NAME11 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.11";
+
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME11, "Only component class can have @Unwrap method \"unwrapMethod\"", 26);
- refreshProject(project);
-
- number = getMarkersNumber(statefulComponentFile);
- assertFalse("Problem marker 'Only component class can have @Unwrap method' not found' not found' not found' not found", number == 0);
-
- messages = getMarkersMessage(statefulComponentFile);
- assertTrue("Problem marker 'Only component class can have @Unwrap method' not found", "Only component class can have @Unwrap method \"unwrapMethod\"".equals(messages[0]));
-
- lineNumbers = getMarkersNumbersOfLine(statefulComponentFile);
-
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 23);
-
// Only component class can have @Observer method
System.out.println("Test - Only component class can have @Observer method");
- IFile statefulComponentFile12 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.12");
- try{
- statefulComponentFile.setContents(statefulComponentFile12.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'StatefulComponent.java' content to " +
- "'StatefulComponent.12'", ex);
- }
-
- refreshProject(project);
-
- number = getMarkersNumber(statefulComponentFile);
- assertFalse("Problem marker 'Only component class can have @Observer method' not found' not found' not found' not found", number == 0);
-
- messages = getMarkersMessage(statefulComponentFile);
- assertTrue("Problem marker 'Only component class can have @Observer method' not found", "Only component class can have @Observer method \"observerMethod\"".equals(messages[0]));
-
- lineNumbers = getMarkersNumbersOfLine(statefulComponentFile);
-
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 23);
+ final String NEW_CONTENT_FILE_NAME12 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.12";
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME12, "Only component class can have @Observer method \"observerMethod\"", 26);
+
// Duplicate @Remove method
- IFile statefulComponentFile1 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.1");
- try{
- statefulComponentFile.setContents(statefulComponentFile1.getContents(), true, false, new NullProgressMonitor());
- }catch(Exception ex){
- JUnitUtils.fail("Error in changing 'StatefulComponent.java' content to " +
- "'StatefulComponent.1'", ex);
- }
+ final String NEW_CONTENT_FILE_NAME1 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.1";
- refreshProject(project);
+ //assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
- number = getMarkersNumber(statefulComponentFile);
- assertFalse("Problem marker 'Duplicate @Remove method' not found", number == 0);
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME1, "Duplicate @Remove method \"removeMethod1\"", 18);
+ assertMarkerIsCreated(
+ TARGET_FILE_NAME,"Duplicate @Remove method \"removeMethod2\"", 22);
- messages = getMarkersMessage(statefulComponentFile);
- assertTrue("Problem marker 'Duplicate @Remove method' not found", messages[0].startsWith("Duplicate @Remove method \"removeMethod"));
+ }
- lineNumbers = getMarkersNumbersOfLine(statefulComponentFile);
-
- assertTrue("Wrong number of problem markers", lineNumbers.length == messages.length && messages.length == 2);
-
- if(messages[1].indexOf("removeMethod2") >= 0){
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 17);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 21);
- }else{
- assertTrue("Problem marker has wrong line number", lineNumbers[0] == 21);
- assertTrue("Problem marker has wrong line number", lineNumbers[1] == 17);
- }
+ /**
+ * @param statefulComponentFile
+ * @param string
+ * @param i
+ * @throws CoreException
+ */
+ protected void assertMarkerIsCreated(String targetPath, String newContentPath,
+ String pattern, int line) throws CoreException {
+
+ IFile newContentFile = project.getFile(newContentPath);
+ IFile targetFile = project.getFile(targetPath);
+ targetFile.setContents(newContentFile.getContents(), true, false, new NullProgressMonitor());
+ refreshProject(project);
+ assertMarkerIsCreated(targetFile, SeamRuntimeValidation.MARKER_TYPE, pattern, line);
}
+
+ /**
+ * @param statefulComponentFile
+ * @param string
+ * @param i
+ * @throws CoreException
+ */
+ protected void assertMarkerIsCreated(String targetPath,
+ String pattern, int line) throws CoreException {
+
+ IFile targetFile = project.getFile(targetPath);
+ assertMarkerIsCreated(targetFile, SeamRuntimeValidation.MARKER_TYPE, pattern, line);
+ }
/**
* The validator should check duplicate @Remove methods only in stateful session bean component
@@ -627,7 +524,7 @@
assertFalse("Problem marker 'Unknown @DataModel/@Out name' not found' not found' not found' not found", number == 0);
messages = getMarkersMessage(selectionTestFile);
- assertTrue("Problem marker 'Unknown @DataModel/@Out name", messages[0].startsWith("Unknown @DataModel/@Out name: messageList2"));
+ assertTrue("Problem marker 'Unknown @DataModel/@Out name", messages[0].startsWith("Unknown @DataModel/@Out name: \"messageList2\""));
lineNumbers = getMarkersNumbersOfLine(selectionTestFile);
@@ -637,7 +534,7 @@
assertFalse("Problem marker 'Unknown @DataModel/@Out name' not found' not found' not found' not found", number == 0);
messages = getMarkersMessage(selectionIndexTestFile);
- assertTrue("Problem marker 'Unknown @DataModel/@Out name", messages[0].startsWith("Unknown @DataModel/@Out name: messageList2"));
+ assertTrue("Problem marker 'Unknown @DataModel/@Out name", messages[0].startsWith("Unknown @DataModel/@Out name: \"messageList2\""));
lineNumbers = getMarkersNumbersOfLine(selectionIndexTestFile);
@@ -676,7 +573,7 @@
assertTrue("Not all problem markers 'Duplicate variable name' was found", messages.length == 4);
for(int i=0;i<4;i++)
- assertTrue("Problem marker 'Duplicate variable name' not found", "Duplicate variable name: messageList".equals(messages[i]));
+ assertTrue("Problem marker 'Duplicate variable name' not found", "Duplicate variable name: \"messageList\"".equals(messages[i]));
int[] lineNumbers = getMarkersNumbersOfLine(contextVariableTestFile);
@@ -701,7 +598,7 @@
messages = getMarkersMessage(contextVariableTestFile);
- assertTrue("Problem marker 'Unknown variable name' not found", "Unknown context variable name: messageList5".equals(messages[0]));
+ assertTrue("Problem marker 'Unknown variable name' not found", "Unknown context variable name: \"messageList5\"".equals(messages[0]));
lineNumbers = getMarkersNumbersOfLine(contextVariableTestFile);
@@ -747,7 +644,7 @@
String[] messages = getMarkersMessage(abcComponentXHTMLFile);
- assertTrue("Problem marker 'Context variable cannot be resolved' not found", "bcComponent cannot be resolved".equals(messages[0]));
+ assertTrue("Problem marker 'Context variable cannot be resolved' not found", "\"bcComponent\" cannot be resolved".equals(messages[0]));
int[] lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile);
@@ -771,7 +668,7 @@
messages = getMarkersMessage(abcComponentXHTMLFile);
- assertTrue("Problem marker 'Property cannot be resolved' not found", "actionType2 cannot be resolved".equals(messages[0]));
+ assertTrue("Problem marker 'Property cannot be resolved' not found", "\"actionType2\" cannot be resolved".equals(messages[0]));
lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile);
@@ -931,7 +828,5 @@
public static void waitForJob() {
EditorTestHelper.joinJobs(1000,10000,500);
- // wait for Workspace runnable
- EditorTestHelper.runEventQueue(2000);
}
}
\ No newline at end of file
16 years, 11 months
JBoss Tools SVN: r6051 - trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-31 00:14:12 -0500 (Thu, 31 Jan 2008)
New Revision: 6051
Modified:
trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF
Log:
compilation errors fix
Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF 2008-01-31 04:55:25 UTC (rev 6050)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF 2008-01-31 05:14:12 UTC (rev 6051)
@@ -10,7 +10,7 @@
org.eclipse.core.resources,
org.eclipse.jdt.launching,
org.eclipse.jface,
- org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.connectivity;visibility:=reexport,
org.eclipse.datatools.connectivity.db.generic
Bundle-Activator: org.jboss.tools.jst.firstrun.JstFirstRunPlugin
Eclipse-LazyStart: true
16 years, 11 months