You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/11/04 20:49:09 UTC
[2/3] git commit: Remove errant @Test annotation from class
Remove errant @Test annotation from class
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/cc78fdeb
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/cc78fdeb
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/cc78fdeb
Branch: refs/heads/master
Commit: cc78fdebf5f20d278d98791d7d7bdc70518d676e
Parents: 864623a
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Nov 4 11:23:23 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Nov 4 11:26:58 2013 -0800
----------------------------------------------------------------------
...eanEditorWithOverridenCssClassesTests.groovy | 34 ++++++++------------
1 file changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/cc78fdeb/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app3/BeanEditorWithOverridenCssClassesTests.groovy
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app3/BeanEditorWithOverridenCssClassesTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app3/BeanEditorWithOverridenCssClassesTests.groovy
index 92d4463..04ef718 100644
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app3/BeanEditorWithOverridenCssClassesTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app3/BeanEditorWithOverridenCssClassesTests.groovy
@@ -1,38 +1,32 @@
package org.apache.tapestry5.integration.app3
-import org.apache.tapestry5.integration.app3.services.AppModule
-import org.apache.tapestry5.corelib.components.BeanEditForm
import org.apache.tapestry5.corelib.components.BeanEditor
import org.apache.tapestry5.integration.TapestryCoreTestCase
-import org.apache.tapestry5.integration.app1.data.RegistrationData
import org.apache.tapestry5.integration.app3.services.AppModule
import org.apache.tapestry5.test.TapestryTestConfiguration
-import org.testng.annotations.Test
/**
* Tests for the {@link BeanEditor} component CSS overrides
*/
@TapestryTestConfiguration(webAppFolder = "src/test/app3")
-@Test
-public class BeanEditorTestsWithOverridenCssClassesTests extends TapestryCoreTestCase
-{
-
+public class BeanEditorTestsWithOverridenCssClassesTests extends TapestryCoreTestCase {
+
/** TAP5-2182 */
public void bean_editor_overriden_markup() {
- final String formGroupLocator = String.format("//form[@id='form']/div[@class='%s']", AppModule.FORM_GROUP_WRAPPER_CSS_CLASS_VALUE)
- final String divCssLocator = formGroupLocator + "/@class"
- final String labelCssLocator = formGroupLocator + "/label/@class"
- final String inputCssLocator = formGroupLocator + String.format("/%s[@class='%s']/input/@class",
- AppModule.FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_NAME_VALUE,
+ def formGroupLocator = "//form[@id='form']/div[@class='${AppModule.FORM_GROUP_WRAPPER_CSS_CLASS_VALUE}']"
+ def divCssLocator = "$formGroupLocator/@class"
+ def labelCssLocator = "$formGroupLocator/label/@class"
+ def inputCssLocator = String.format("%s/%s[@class='%s']/input/@class",
+ formGroupLocator,
+ AppModule.FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_NAME_VALUE,
AppModule.FORM_GROUP_FORM_FIELD_WRAPPER_ELEMENT_CSS_CLASS_VALUE)
-
+
open("/beaneditorwithoverridencssclassesdemo")
-
- assertEquals(AppModule.FORM_GROUP_WRAPPER_CSS_CLASS_VALUE, getAttribute(divCssLocator))
- assertEquals(AppModule.FORM_GROUP_LABEL_CSS_CLASS_VALUE, getAttribute(labelCssLocator))
- assertEquals(AppModule.FORM_FIELD_CSS_CLASS_VALUE, getAttribute(inputCssLocator))
-
+
+ assertEquals AppModule.FORM_GROUP_WRAPPER_CSS_CLASS_VALUE, getAttribute(divCssLocator)
+ assertEquals AppModule.FORM_GROUP_LABEL_CSS_CLASS_VALUE, getAttribute(labelCssLocator)
+ assertEquals AppModule.FORM_FIELD_CSS_CLASS_VALUE, getAttribute(inputCssLocator)
}
-
+
}