Author: vrubezhny Date: 2011-09-09 15:18:36 -0400 (Fri, 09 Sep 2011) New Revision: 34616 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/elValidation1.xhtml Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/ca/ Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java Log: JBIDE-9633 Create JUnit tests to cover JBIDE-9515 issue JUnit Test is added for proposals filtering and proposals applying check Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/elValidation1.xhtml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/elValidation1.xhtml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/elValidation1.xhtml 2011-09-09 19:18:36 UTC (rev 34616) @@ -0,0 +1,13 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:define name="body"> + <h:outputText value="#{namedBean.foo}"/> + <h:outputText value="#{sheep.name}" + rendered="#{(game.value == 'foo' and game.value == 'foo') ? game.value == 'foo' : false}"/> + </ui:define> +</ui:composition> \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/elValidation1.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2011-09-09 19:09:18 UTC (rev 34615) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2011-09-09 19:18:36 UTC (rev 34616) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. + * Copyright (c) 2009-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, @@ -13,24 +13,10 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.xerces.impl.validation.ValidationManager; -import org.eclipse.core.internal.jobs.JobManager; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.internal.core.JavaModelManager; -import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController; -import org.eclipse.jst.jsp.core.internal.contentproperties.JSPFContentPropertiesManager; -import org.eclipse.jst.jsp.core.internal.java.search.JSPIndexManager; -import org.eclipse.jst.jsp.core.internal.taglib.TaglibHelperManager; -import org.eclipse.jst.jsp.core.taglib.TaglibIndex; -import org.eclipse.wst.sse.core.internal.validate.ValidationMessage; import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.cdi.core.test.CDICoreTestSetup; -import org.jboss.tools.cdi.core.test.tck.TCKTest; import org.jboss.tools.cdi.ui.test.marker.CDIMarkerResolutionTest; import org.jboss.tools.cdi.ui.test.perspective.CDIPerspectiveTest; import org.jboss.tools.cdi.ui.test.preferences.CDIPreferencePageTest; @@ -40,7 +26,6 @@ import org.jboss.tools.cdi.ui.test.wizard.NewCDIClassWizardFactoryTest; import org.jboss.tools.cdi.ui.test.wizard.NewCDIWizardTest; import org.jboss.tools.test.util.ResourcesUtils; -import org.jboss.tools.test.util.WorkbenchUtils; /** * @author Alexey Kazakov @@ -65,7 +50,7 @@ suiteAll.addTestSuite(NewCDIClassWizardFactoryTest.class); suiteAll.addTestSuite(CDIPreferencePageTest.class); suiteAll.addTestSuite(NewCDIWizardTest.class); - suiteAll.addTestSuite(CAELProposalFilteringTest.class); + suite.addTestSuite(CAELProposalFilteringTest.class); suite.addTestSuite(CDISearchParticipantTest.class); suite.addTestSuite(ELReferencesQueryParticipantTest.class); Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2011-09-09 19:09:18 UTC (rev 34615) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2011-09-09 19:18:36 UTC (rev 34616) @@ -16,6 +16,7 @@ matches.add(new MatchStructure("/tck/WebContent/test.jsp", "sheep")); matches.add(new MatchStructure("/tck/WebContent/el/integration/JSFTestPage.jsp", "sheep")); matches.add(new MatchStructure("/tck/WebContent/tests/lookup/el/integration/JSFTestPage.jsp", "sheep")); + matches.add(new MatchStructure("/tck/WebContent/elValidation1.xhtml", "sheep")); QueryParticipantTestUtils.testSearchParticipant(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/lookup/el/integration/Sheep.java", @@ -44,7 +45,7 @@ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>(); matches.add(new MatchStructure("/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Zoo.java", "aaam")); - + QueryParticipantTestUtils.testSearchParticipant(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Zoo.java", QueryParticipantTestUtils.METHOD_SEARCH, @@ -60,7 +61,8 @@ matches.add(new MatchStructure("/tck/WebContent/test.jsp", "name")); matches.add(new MatchStructure("/tck/WebContent/el/integration/JSFTestPage.jsp", "name")); matches.add(new MatchStructure("/tck/WebContent/tests/lookup/el/integration/JSFTestPage.jsp", "name")); - + matches.add(new MatchStructure("/tck/WebContent/elValidation1.xhtml", "name")); + QueryParticipantTestUtils.testSearchParticipant(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/lookup/el/integration/Sheep.java", QueryParticipantTestUtils.METHOD_SEARCH,