Author: scabanovich Date: 2011-12-20 20:48:08 -0500 (Tue, 20 Dec 2011) New Revision: 37478 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELReferenceTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java Log: JBIDE-10545 https://issues.jboss.org/browse/JBIDE-10545 Test is added. Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-12-21 01:45:34 UTC (rev 37477) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-12-21 01:48:08 UTC (rev 37478) @@ -61,6 +61,7 @@ import org.jboss.tools.cdi.core.test.tck.validation.DependentProjectValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.DeploymentProblemsValidationTests; import org.jboss.tools.cdi.core.test.tck.validation.DisableCDISupportTest; +import org.jboss.tools.cdi.core.test.tck.validation.ELReferenceTest; import org.jboss.tools.cdi.core.test.tck.validation.ELValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.IncrementalValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.SuppressWarningsTests; @@ -84,6 +85,7 @@ suiteAll.addTestSuite(TypeTest.class); TestSuite suite = new TestSuite("TCK Tests"); // TCK project tests + suite.addTestSuite(ELReferenceTest.class); suite.addTestSuite(ResolutionByNameTest.class); suite.addTestSuite(BeanDefinitionTest.class); suite.addTestSuite(NameDefinitionTest.class); Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELReferenceTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELReferenceTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELReferenceTest.java 2011-12-21 01:48:08 UTC (rev 37478) @@ -0,0 +1,70 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.core.test.tck.validation; + +import java.text.MessageFormat; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.preference.IPersistentPreferenceStore; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.osgi.util.NLS; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.preferences.CDIPreferences; +import org.jboss.tools.cdi.core.test.tck.TCKTest; +import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; +import org.jboss.tools.common.base.test.validation.TestUtil; +import org.jboss.tools.common.el.core.ELReference; +import org.jboss.tools.common.el.core.model.ELExpression; +import org.jboss.tools.common.el.core.resolver.ELContext; +import org.jboss.tools.jst.web.kb.PageContextFactory; +import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * @author Viacheslav Kabanovich + * See https://issues.jboss.org/browse/JBIDE-10545 + */ +public class ELReferenceTest extends TCKTest { + + public void testELReference() throws Exception { + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java"); + checkFile(file); + file = tckProject.getFile("WebContent/tests/jbt/refactoring/HomePage.xhtml"); + checkFile(file); + file = tckProject.getFile("WebContent/tests/lookup/injection/non/contextual/ManagedBeanTestPage.jsp"); + checkFile(file); + } + + void checkFile(IFile file) throws Exception { + assertTrue(file.exists()); + ELContext context = PageContextFactory.getInstance().createPageContext(file); + ELReference[] els = context.getELReferences(); + assertTrue(els.length > 0); + for (ELReference el: els) { + int start = el.getStartPosition(); + int length = el.getLength(); + ELExpression[] exs = el.getEl(); + + ELReference el1 = new ELReference(); + el1.setStartPosition(start); + el1.setLength(length); + el1.setResource(file); + ELExpression[] exs1 = el1.getEl(); + + assertEquals(exs.length, exs1.length); + for (int i = 0; i < exs.length; i++) { + assertEquals(exs[i].toString(), exs1[i].toString()); + } + } + } + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELReferenceTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain