JBoss Tools SVN: r42611 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test: uiutils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-07-17 03:44:40 -0400 (Tue, 17 Jul 2012)
New Revision: 42611
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigClassBaseOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigEEOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigInjectOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/uiutils/AssignableBeansDialogExt.java
Log:
fixing static fields
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-07-17 07:44:04 UTC (rev 42610)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-07-17 07:44:40 UTC (rev 42611)
@@ -24,8 +24,8 @@
*/
public class ExactAnnotationTest extends SolderAnnotationTestBase {
- private final String EXACT_INTERFACE = "exact-interface";
- private final String EXACT_BEANS = "exact-beans";
+ private static final String EXACT_INTERFACE = "exact-interface";
+ private static final String EXACT_BEANS = "exact-beans";
@After
public void waitForJobs() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java 2012-07-17 07:44:04 UTC (rev 42610)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/GenericOpenOnTest.java 2012-07-17 07:44:40 UTC (rev 42611)
@@ -28,9 +28,9 @@
public class GenericOpenOnTest extends Seam3TestBase {
- private final String GENERIC_POINT_1 = "MyExtendedConfiguration ";
- private final String GENERIC_POINT_2 = "MyConfigurationProducer.getOneConfig()";
- private final String GENERIC_POINT_3 = "MyConfigurationProducer.getSecondConfig()";
+ private static final String GENERIC_POINT_1 = "MyExtendedConfiguration ";
+ private static final String GENERIC_POINT_2 = "MyConfigurationProducer.getOneConfig()";
+ private static final String GENERIC_POINT_3 = "MyConfigurationProducer.getSecondConfig()";
private static String projectName = "generic";
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java 2012-07-17 07:44:04 UTC (rev 42610)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/NamedPackagesTest.java 2012-07-17 07:44:40 UTC (rev 42611)
@@ -28,15 +28,15 @@
*/
public class NamedPackagesTest extends Seam3TestBase {
- private final String CDI_SEAM_PACKAGE = "cdi.seam";
- private final String CDI_TEST_PACKAGE = "cdi.test";
- private final String ORG_JBOSS_PACKAGE = "org.jboss";
- private static String projectName = "named";
+ private static final String CDI_SEAM_PACKAGE = "cdi.seam";
+ private static final String CDI_TEST_PACKAGE = "cdi.test";
+ private static final String ORG_JBOSS_PACKAGE = "org.jboss";
+ private static final String projectName = "named";
- private final String PACKAGE_INFO_JAVA_CDI = "package-info.java.cdi";
- private final String PACKAGE_INFO_JAVA = "package-info.java";
+ private static final String PACKAGE_INFO_JAVA_CDI = "package-info.java.cdi";
+ private static final String PACKAGE_INFO_JAVA = "package-info.java";
- private final String MANAGER_JAVA = "Manager.java";
+ private static final String MANAGER_JAVA = "Manager.java";
@After
public void waitForJobs() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigClassBaseOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigClassBaseOpenOnTest.java 2012-07-17 07:44:04 UTC (rev 42610)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigClassBaseOpenOnTest.java 2012-07-17 07:44:40 UTC (rev 42611)
@@ -24,8 +24,8 @@
*/
public class SeamConfigClassBaseOpenOnTest extends Seam3TestBase {
- private static String projectName = "seamConfigOpenOn";
- private final String SEAM_CONFIG = "seam-beans.xml";
+ private static final String projectName = "seamConfigOpenOn";
+ private static final String SEAM_CONFIG = "seam-beans.xml";
@BeforeClass
public static void setup() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigEEOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigEEOpenOnTest.java 2012-07-17 07:44:04 UTC (rev 42610)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigEEOpenOnTest.java 2012-07-17 07:44:40 UTC (rev 42611)
@@ -25,7 +25,7 @@
public class SeamConfigEEOpenOnTest extends Seam3TestBase {
private static String projectName = "seamConfigEEOpenOn";
- private final String SEAM_CONFIG = "seam-beans.xml";
+ private static final String SEAM_CONFIG = "seam-beans.xml";
@BeforeClass
public static void setup() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigInjectOpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigInjectOpenOnTest.java 2012-07-17 07:44:04 UTC (rev 42610)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigInjectOpenOnTest.java 2012-07-17 07:44:40 UTC (rev 42611)
@@ -25,7 +25,7 @@
public class SeamConfigInjectOpenOnTest extends Seam3TestBase {
private static String projectName = "seamConfigInjectOpenOn";
- private final String SEAM_CONFIG = "seam-beans.xml";
+ private static final String SEAM_CONFIG = "seam-beans.xml";
@BeforeClass
public static void setup() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/uiutils/AssignableBeansDialogExt.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/uiutils/AssignableBeansDialogExt.java 2012-07-17 07:44:04 UTC (rev 42610)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/uiutils/AssignableBeansDialogExt.java 2012-07-17 07:44:40 UTC (rev 42611)
@@ -20,7 +20,7 @@
*/
public class AssignableBeansDialogExt extends AssignableBeansDialog {
- private final String ELIMINATED_DEFAULT_BEAN = "Eliminated @DefaultBean";
+ private static final String ELIMINATED_DEFAULT_BEAN = "Eliminated @DefaultBean";
public AssignableBeansDialogExt(SWTBotShell shell) {
super(shell);
13 years, 8 months
JBoss Tools SVN: r42610 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test: tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-07-17 03:44:04 -0400 (Tue, 17 Jul 2012)
New Revision: 42610
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigValidationTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java
Log:
new test SeamConfigValidationTest implemented and added into test suite
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java 2012-07-17 07:42:59 UTC (rev 42609)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/CDISeam3AllBotTests.java 2012-07-17 07:44:04 UTC (rev 42610)
@@ -22,9 +22,10 @@
import org.jboss.tools.cdi.seam3.bot.test.tests.NamedPackagesTest;
import org.jboss.tools.cdi.seam3.bot.test.tests.RequiresAnnotationTest;
import org.jboss.tools.cdi.seam3.bot.test.tests.ResourceOpenOnTest;
+import org.jboss.tools.cdi.seam3.bot.test.tests.SeamConfigClassBaseOpenOnTest;
import org.jboss.tools.cdi.seam3.bot.test.tests.SeamConfigEEOpenOnTest;
-import org.jboss.tools.cdi.seam3.bot.test.tests.SeamConfigClassBaseOpenOnTest;
import org.jboss.tools.cdi.seam3.bot.test.tests.SeamConfigInjectOpenOnTest;
+import org.jboss.tools.cdi.seam3.bot.test.tests.SeamConfigValidationTest;
import org.jboss.tools.cdi.seam3.bot.test.tests.VetoAnnotationTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
@@ -50,7 +51,8 @@
MessageLoggerAnnotationTest.class,
SeamConfigClassBaseOpenOnTest.class,
SeamConfigEEOpenOnTest.class,
- SeamConfigInjectOpenOnTest.class
+ SeamConfigInjectOpenOnTest.class,
+ SeamConfigValidationTest.class
})
public class CDISeam3AllBotTests extends AbstractTestSuite {
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigValidationTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/SeamConfigValidationTest.java 2012-07-17 07:44:04 UTC (rev 42610)
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012 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.seam3.bot.test.tests;
+
+import org.eclipse.core.resources.IMarker;
+import org.jboss.tools.cdi.bot.test.CDIConstants;
+import org.jboss.tools.cdi.seam3.bot.test.base.Seam3TestBase;
+import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibrary;
+import org.jboss.tools.ui.bot.ext.helper.MarkerHelper;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * @author jjankovi
+ *
+ */
+public class SeamConfigValidationTest extends Seam3TestBase {
+
+ private static String projectName = "seamConfigValidation";
+ private static final String SEAM_CONFIG = "seam-beans.xml";
+ private static IMarker[] markers = null;
+
+ @BeforeClass
+ public static void setup() {
+ importSeam3ProjectWithLibrary(projectName, SeamLibrary.SOLDER_3_1);
+ openSeamConfig();
+ getAllSeamConfigMarkers();
+ assertExpectedCount(markers.length, 4);
+ }
+
+ @Test
+ public void testNonExistedField() {
+
+ /* get marker by its location */
+ IMarker marker = getMarkerByLocation(markers, 8);
+ assertNotNull(marker);
+
+ /* test the message of marker */
+ assertMessageContainsExpectedValue(MarkerHelper.getMarkerMessage(marker),
+ "Cannot resolve field or method");
+ }
+
+ @Test
+ public void testNonExistedConstructor() {
+
+ /* get marker by its location */
+ IMarker marker = getMarkerByLocation(markers, 11);
+ assertNotNull(marker);
+
+ /* test the message of marker */
+ assertMessageContainsExpectedValue(MarkerHelper.getMarkerMessage(marker),
+ "Cannot resolve constructor");
+
+ }
+
+ @Test
+ public void testNonSupportedParameters() {
+
+ /* get marker by its location */
+ IMarker marker = getMarkerByLocation(markers,15);
+ assertNotNull(marker);
+
+ /* test the message of marker */
+ assertMessageContainsExpectedValue(MarkerHelper.getMarkerMessage(marker),
+ "Cannot resolve method");
+
+ }
+
+ @Test
+ public void testNonExistedClass() {
+
+ /* get marker by its location */
+ IMarker marker = getMarkerByLocation(markers, 24);
+ assertNotNull(marker);
+
+ /* test the message of marker */
+ assertMessageContainsExpectedValue(MarkerHelper.getMarkerMessage(marker),
+ "Cannot resolve type");
+
+ }
+
+ private static void getAllSeamConfigMarkers() {
+ markers = getMarkersForResource(SEAM_CONFIG, projectName,
+ CDIConstants.WEBCONTENT, CDIConstants.WEB_INF);
+ }
+
+ private static void openSeamConfig() {
+ packageExplorer.openFile(projectName, CDIConstants.WEBCONTENT,
+ CDIConstants.WEB_INF, SEAM_CONFIG);
+ bot.cTabItem("Source").activate();
+ }
+
+ private static IMarker[] getMarkersForResource(String resource, String ... path) {
+ MarkerHelper markerHelper = new MarkerHelper(resource, path);
+ return markerHelper.getMarkers();
+ }
+
+ private static void assertExpectedCount(int realCount, int expectedCount) {
+ assertTrue("Expected count: " + expectedCount + " real count: " + realCount,
+ realCount == expectedCount);
+ }
+
+ private IMarker getMarkerByLocation(IMarker[] markers, int location) {
+ for (IMarker m : markers) {
+ int markerLocation;
+ try {
+ markerLocation = Integer.parseInt(MarkerHelper.getMarkerLineNumber(m));
+ } catch (NumberFormatException nfe) {
+ return null;
+ }
+ if (markerLocation == location) {
+ return m;
+ }
+ }
+ return null;
+ }
+
+ private void assertMessageContainsExpectedValue(String message,
+ String... expectedValues) {
+ for (String value : expectedValues) {
+ assertContains(value, message);
+ }
+ }
+
+}
13 years, 8 months
JBoss Tools SVN: r42609 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects: seamConfigValidation and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-07-17 03:42:59 -0400 (Tue, 17 Jul 2012)
New Revision: 42609
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.project
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/.jsdtscope
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.common.component
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/WEB-INF/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/WEB-INF/lib/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/WEB-INF/seam-beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/build/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/src/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/src/test/
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/src/test/Report.java
Log:
new test project for seam3 bot tests
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.classpath
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.classpath
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.project
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.project
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/.jsdtscope
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/.jsdtscope
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.jdt.core.prefs 2012-07-17 07:42:59 UTC (rev 42609)
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.common.component
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.common.component
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-07-17 07:42:59 UTC (rev 42609)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-07-17 07:42:59 UTC (rev 42609)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/META-INF/MANIFEST.MF 2012-07-17 07:42:59 UTC (rev 42609)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/WEB-INF/seam-beans.xml
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/WebContent/WEB-INF/seam-beans.xml
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/src/test/Report.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/src/test/Report.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/resources/projects/seamConfigValidation/src/test/Report.java 2012-07-17 07:42:59 UTC (rev 42609)
@@ -0,0 +1,15 @@
+package test;
+
+public class Report {
+
+ private String value;
+
+ public Report() {
+
+ }
+
+ public void send(int value) {
+
+ }
+
+}
13 years, 8 months
JBoss Tools SVN: r42608 - trunk/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-16 22:59:32 -0400 (Mon, 16 Jul 2012)
New Revision: 42608
Modified:
trunk/build/aggregate/webtools-site/index-template.html
Log:
fix webtools site template
Modified: trunk/build/aggregate/webtools-site/index-template.html
===================================================================
--- trunk/build/aggregate/webtools-site/index-template.html 2012-07-16 22:33:25 UTC (rev 42607)
+++ trunk/build/aggregate/webtools-site/index-template.html 2012-07-17 02:59:32 UTC (rev 42608)
@@ -31,7 +31,7 @@
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
Update Site for ${update.site.name}.
- <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2) too.</span></p>
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
13 years, 8 months
JBoss Tools SVN: r42607 - tags.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-16 18:33:25 -0400 (Mon, 16 Jul 2012)
New Revision: 42607
Added:
tags/jbosstools-3.3.1.Final/
Log:
tag as version 3.3.1.Final on branch 3.3.x
13 years, 8 months
JBoss Tools SVN: r42606 - branches/jbosstools-3.3.x/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-16 18:28:27 -0400 (Mon, 16 Jul 2012)
New Revision: 42606
Modified:
branches/jbosstools-3.3.x/build/aggregate/webtools-site/index-template.html
Log:
fix webtools site template
Modified: branches/jbosstools-3.3.x/build/aggregate/webtools-site/index-template.html
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/webtools-site/index-template.html 2012-07-16 22:24:18 UTC (rev 42605)
+++ branches/jbosstools-3.3.x/build/aggregate/webtools-site/index-template.html 2012-07-16 22:28:27 UTC (rev 42606)
@@ -31,7 +31,7 @@
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
Update Site for ${update.site.name}.
- <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2) too.</span></p>
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
13 years, 8 months
JBoss Tools SVN: r42605 - trunk/download.jboss.org/jbosstools/updates/webtools/indigo.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-16 18:24:18 -0400 (Mon, 16 Jul 2012)
New Revision: 42605
Modified:
trunk/download.jboss.org/jbosstools/updates/webtools/indigo/index.html
Log:
update webtools/indigo to 3.3.1.Final
Modified: trunk/download.jboss.org/jbosstools/updates/webtools/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/webtools/indigo/index.html 2012-07-16 22:24:04 UTC (rev 42604)
+++ trunk/download.jboss.org/jbosstools/updates/webtools/indigo/index.html 2012-07-16 22:24:18 UTC (rev 42605)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - Web Tools - Stable Release Update Site: 3.3.0.v20120615-1211-H103-Final.webtools</title>
+<title>JBoss Tools - Web Tools - Stable Release Update Site: 3.3.1.v20120714-2254-H107-Final.webtools</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -24,14 +24,14 @@
<h2 class="title">JBoss Tools - Web Tools - Stable Release Update Site</h2>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.v20120615-1211-H103-Final.webtools</span></td>
+ <td class="sub-header" width="100%"><span>Latest Build: 3.3.1.v20120714-2254-H107-Final.webtools</span></td>
</tr>
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>Stable Release</b>
Update Site for JBoss Tools - Web Tools.
- <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p>
+ <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2) too.</span></p>
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
@@ -81,20 +81,20 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20120611-1725-H88-Final.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
- <td><span style="font-size:x-small">3.2.1.v20120611-1725-H88-Final</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.3.1.v20120715-0237-H92-Final.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span style="font-size:x-small">3.3.1.v20120715-0237-H92-Final</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20120615-1559-H138-Final.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20120615-1559-H138-Final</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.1.v20120715-0243-H142-Final.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span style="font-size:x-small">2.3.1.v20120715-0243-H142-Final</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20120611-1733-H71-Final.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20120611-1733-H71-Final</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.3.1.v20120715-0236-H78-Final.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span style="font-size:x-small">1.3.1.v20120715-0236-H78-Final</span></td>
<td></td>
</tr>
<tr style="background-color:#DDDDDD">
13 years, 8 months
JBoss Tools SVN: r42602 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-16 17:45:14 -0400 (Mon, 16 Jul 2012)
New Revision: 42602
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
Log:
JBIDE-12295
https://issues.jboss.org/browse/JBIDE-12295
Open-on of definition of a var, which has unresolved value.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-07-16 21:44:20 UTC (rev 42601)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-07-16 21:45:14 UTC (rev 42602)
@@ -354,6 +354,9 @@
}
} else {
resolution = resolveELOperand(file, context, operand, returnEqualedVariablesOnly, false, offset);
+ if(var != null && !resolution.getSegments().isEmpty()) {
+ ((ELSegmentImpl)resolution.getSegments().get(0)).setVar(var);
+ }
}
}
13 years, 8 months
JBoss Tools SVN: r42601 - trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-16 17:44:20 -0400 (Mon, 16 Jul 2012)
New Revision: 42601
Modified:
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java
Log:
JBIDE-12295
https://issues.jboss.org/browse/JBIDE-12295
Open-on of definition of a var, which has unresolved value.
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java 2012-07-16 21:38:33 UTC (rev 42600)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java 2012-07-16 21:44:20 UTC (rev 42601)
@@ -31,6 +31,7 @@
import org.jboss.tools.common.el.core.resolver.ELResolution;
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.el.core.resolver.ELSegment;
+import org.jboss.tools.common.el.core.resolver.ELSegmentImpl;
import org.jboss.tools.common.el.core.resolver.IOpenableReference;
import org.jboss.tools.jst.web.kb.PageContextFactory;
@@ -52,6 +53,7 @@
ELInvocationExpression expression = findInvocationExpressionByOffset(reference, region.getOffset());
if(expression != null){
ELResolver[] resolvers = context.getElResolvers();
+ ELSegment unresolved = null;
for(ELResolver resolver : resolvers){
ELResolution resolution = resolver.resolve(context, expression, region.getOffset());
if(resolution != null){
@@ -67,10 +69,22 @@
links.add(new ELHyperlink(textViewer.getDocument(), reference, segment, openable));
}
}
+ } else if(segment != null && ((ELSegmentImpl)segment).getVar() != null && unresolved == null && segment.getOpenable().length > 0) {
+ unresolved = segment;
}
-
}
}
+ if(links.isEmpty() && unresolved != null) {
+ //This is a case when a reference to var is resolved, but its value is not resolved.
+ //More than one resolver can see that var, we may use any one of them.
+ //Available openable is to the var definition.
+ IOpenableReference[] openables = unresolved.getOpenable();
+ if(openables.length > 0) {
+ for (IOpenableReference openable: openables) {
+ links.add(new ELHyperlink(textViewer.getDocument(), reference, unresolved, openable));
+ }
+ }
+ }
}
}
13 years, 8 months
JBoss Tools SVN: r42599 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: smoke and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-07-16 17:10:31 -0400 (Mon, 16 Jul 2012)
New Revision: 42599
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/JSPPageCreationTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java
Log:
Fixes for JBT 3.3.1
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java 2012-07-16 20:24:32 UTC (rev 42598)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java 2012-07-16 21:10:31 UTC (rev 42599)
@@ -77,30 +77,6 @@
util.sleep(TIME_1S);
selectionText = jspTextEditor.getSelection();
assertEquals("Step 4. Selected text in the Source Part is wrong: ", "e Plain", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
-
- /*
- * Navigate to the text
- */
- jspTextEditor.setFocus();
- jspTextEditor.navigateTo(11, 38);
- util.sleep(TIME_1S);
- jspTextEditor.navigateTo(11, 39);
- util.sleep(TIME_1S);
- /*
- * Select some text to the right
- */
- KeyboardHelper.selectTextUsingSWTEvents(d, true, SELECTION_LENGTH);
- util.sleep(TIME_1S);
- selectionText = webBrowser.getSelectionText();
- assertEquals("Step 5. Selected text in the Visual Part is wrong: ", "llo Dem", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
- jspTextEditor.navigateTo(11, 46);
- util.sleep(TIME_1S);
- jspTextEditor.navigateTo(11, 51);
- util.sleep(TIME_1S);
- KeyboardHelper.selectTextUsingSWTEvents(d, false, SELECTION_LENGTH);
- util.sleep(TIME_1S);
- selectionText = webBrowser.getSelectionText();
- assertEquals("Step 6. Selected text in the Visual Part is wrong: ", "emo App", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2012-07-16 20:24:32 UTC (rev 42598)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2012-07-16 21:10:31 UTC (rev 42599)
@@ -63,7 +63,7 @@
0, 0);
xhtmlTextEditor.insertText("<h1>" + insertText + "</h1>");
xhtmlTextEditor.save();
- bot.sleep(Timing.time2S());
+ bot.sleep(Timing.time5S());
bot.toolbarButtonWithTooltip(SWTJBTExt.isRunningOnMacOs() ?
IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH).click();
SWTBotEditorExt multiPageEditor = swtBotExt.swtBotEditorExtByTitle(XhtmlFilePerformanceTest.TEST_PAGE_NAME);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/JSPPageCreationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/JSPPageCreationTest.java 2012-07-16 20:24:32 UTC (rev 42598)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/JSPPageCreationTest.java 2012-07-16 21:10:31 UTC (rev 42599)
@@ -50,6 +50,8 @@
tree.setFocus();
+ bot.sleep(Timing.time5S());
+
SWTBotTreeItem webContentTreeItem = tree
.getTreeItem(JBT_TEST_PROJECT_NAME)
.expand()
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java 2012-07-16 20:24:32 UTC (rev 42598)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/XHTMLPageCreationTest.java 2012-07-16 21:10:31 UTC (rev 42599)
@@ -51,6 +51,8 @@
tree.setFocus();
+ bot.sleep(Timing.time5S());
+
SWTBotTreeItem webContentTreeItem = tree
.getTreeItem(JBT_TEST_PROJECT_NAME)
.expand()
13 years, 8 months