[weld-commits] Weld SVN: r6873 - core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx.

Author: aslak Date: 2010-08-01 13:30:30 -0400 (Sun, 01 Aug 2010) New Revision: 6873 Added: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnit.java Removed: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnitTest.java Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/TxEventTest.java Log: WELD-493 Renamed AbstractHTMLUnitTest, not a Test Copied: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnit.java (from rev 6870, core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnitTest.java) =================================================================== --- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnit.java (rev 0) +++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnit.java 2010-08-01 17:30:30 UTC (rev 6873) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.weld.tests.event.tx; + +import java.util.HashSet; +import java.util.Set; + +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +public abstract class AbstractHtmlUnit +{ + + public AbstractHtmlUnit() + { + super(); + } + + protected <T extends HtmlElement> T getFirstMatchingElement(HtmlPage page, Class<T> elementClass, String id) + { + + Set<T> inputs = getElements(page.getBody(), elementClass); + for (T input : inputs) + { + if (input.getId().contains(id)) + { + return input; + } + } + return null; + } + + protected <T> Set<T> getElements(HtmlElement rootElement, Class<T> elementClass) + { + Set<T> result = new HashSet<T>(); + + for (HtmlElement element : rootElement.getAllHtmlChildElements()) + { + result.addAll(getElements(element, elementClass)); + } + + if (elementClass.isInstance(rootElement)) + { + result.add(elementClass.cast(rootElement)); + } + return result; + + } + +} \ No newline at end of file Deleted: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnitTest.java =================================================================== --- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnitTest.java 2010-08-01 17:11:42 UTC (rev 6872) +++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/AbstractHtmlUnitTest.java 2010-08-01 17:30:30 UTC (rev 6873) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.weld.tests.event.tx; - -import java.util.HashSet; -import java.util.Set; - -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; - -public abstract class AbstractHtmlUnitTest -{ - - public AbstractHtmlUnitTest() - { - super(); - } - - protected <T extends HtmlElement> T getFirstMatchingElement(HtmlPage page, Class<T> elementClass, String id) - { - - Set<T> inputs = getElements(page.getBody(), elementClass); - for (T input : inputs) - { - if (input.getId().contains(id)) - { - return input; - } - } - return null; - } - - protected <T> Set<T> getElements(HtmlElement rootElement, Class<T> elementClass) - { - Set<T> result = new HashSet<T>(); - - for (HtmlElement element : rootElement.getAllHtmlChildElements()) - { - result.addAll(getElements(element, elementClass)); - } - - if (elementClass.isInstance(rootElement)) - { - result.add(elementClass.cast(rootElement)); - } - return result; - - } - -} \ No newline at end of file Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/TxEventTest.java =================================================================== --- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/TxEventTest.java 2010-08-01 17:11:42 UTC (rev 6872) +++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/TxEventTest.java 2010-08-01 17:30:30 UTC (rev 6873) @@ -36,7 +36,7 @@ @Category(Integration.class) @RunWith(Arquillian.class) @Run(RunModeType.AS_CLIENT) -public class TxEventTest extends AbstractHtmlUnitTest +public class TxEventTest extends AbstractHtmlUnit { @Deployment public static WebArchive createDeployment()