diff --git a/tck/faces41/headAndBodyRenderer/src/main/webapp/WEB-INF/web.xml b/tck/faces41/headAndBodyRenderer/src/main/webapp/WEB-INF/web.xml
index 830eb81511..2c68bce4ec 100644
--- a/tck/faces41/headAndBodyRenderer/src/main/webapp/WEB-INF/web.xml
+++ b/tck/faces41/headAndBodyRenderer/src/main/webapp/WEB-INF/web.xml
@@ -42,7 +42,6 @@
facesServlet
*.xhtml
- *.xhtmlAsHtml5
*.xhtmlAsXhtml
*.xhtmlAsXml
diff --git a/tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversion.xhtml b/tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversionViaAttribute.xhtml
similarity index 89%
rename from tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversion.xhtml
rename to tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversionViaAttribute.xhtml
index e447ad3ddf..45c6b54960 100644
--- a/tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversion.xhtml
+++ b/tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversionViaAttribute.xhtml
@@ -18,14 +18,14 @@
-->
- Spec1819: explicit conversion
+ Spec1819: explicit conversion via attribute
-
+
-
+
diff --git a/tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversionViaTag.xhtml b/tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversionViaTag.xhtml
new file mode 100644
index 0000000000..0d4135893a
--- /dev/null
+++ b/tck/faces41/uuidConverter/src/main/webapp/spec1819explicitConversionViaTag.xhtml
@@ -0,0 +1,35 @@
+
+
+
+
+ Spec1819: explicit conversion via tag
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tck/faces41/uuidConverter/src/test/java/org/eclipse/ee4j/tck/faces/faces41/uuidConverter/Spec1819IT.java b/tck/faces41/uuidConverter/src/test/java/org/eclipse/ee4j/tck/faces/faces41/uuidConverter/Spec1819IT.java
index 7006360f38..2b5b33f9e4 100644
--- a/tck/faces41/uuidConverter/src/test/java/org/eclipse/ee4j/tck/faces/faces41/uuidConverter/Spec1819IT.java
+++ b/tck/faces41/uuidConverter/src/test/java/org/eclipse/ee4j/tck/faces/faces41/uuidConverter/Spec1819IT.java
@@ -86,8 +86,8 @@ public void testEmptyImplicitUUID() {
* @see https://github.com/jakartaee/faces/issues/1819
*/
@Test
- public void testValidExplicitUUID() {
- WebPage page = getPage("spec1819explicitConversion.xhtml");
+ public void testValidExplicitUUIDviaAttribute() {
+ WebPage page = getPage("spec1819explicitConversionViaAttribute.xhtml");
WebElement input = page.findElement(By.id("form:input"));
input.sendKeys(TEST_UUID);
WebElement submit = page.findElement(By.id("form:submit"));
@@ -103,8 +103,8 @@ public void testValidExplicitUUID() {
* @see https://github.com/jakartaee/faces/issues/1819
*/
@Test
- public void testInvalidExplicitUUID() {
- WebPage page = getPage("spec1819explicitConversion.xhtml");
+ public void testInvalidExplicitUUIDviaAttribute() {
+ WebPage page = getPage("spec1819explicitConversionViaAttribute.xhtml");
WebElement input = page.findElement(By.id("form:input"));
input.sendKeys("fubar");
WebElement submit = page.findElement(By.id("form:submit"));
@@ -120,8 +120,59 @@ public void testInvalidExplicitUUID() {
* @see https://github.com/jakartaee/faces/issues/1819
*/
@Test
- public void testEmptyExplicitUUID() {
- WebPage page = getPage("spec1819explicitConversion.xhtml");
+ public void testEmptyExplicitUUIDviaAttribute() {
+ WebPage page = getPage("spec1819explicitConversionViaAttribute.xhtml");
+ WebElement input = page.findElement(By.id("form:input"));
+ input.sendKeys("");
+ WebElement submit = page.findElement(By.id("form:submit"));
+ submit.click();
+ WebElement messages = page.findElement(By.id("form:messages"));
+ assertEquals("", messages.getText());
+ WebElement output = page.findElement(By.id("form:output"));
+ assertEquals("", output.getText());
+ }
+
+ /**
+ * @see UUIDConverter
+ * @see https://github.com/jakartaee/faces/issues/1819
+ */
+ @Test
+ public void testValidExplicitUUIDviaTag() {
+ WebPage page = getPage("spec1819explicitConversionViaTag.xhtml");
+ WebElement input = page.findElement(By.id("form:input"));
+ input.sendKeys(TEST_UUID);
+ WebElement submit = page.findElement(By.id("form:submit"));
+ submit.click();
+ WebElement messages = page.findElement(By.id("form:messages"));
+ assertEquals("", messages.getText());
+ WebElement output = page.findElement(By.id("form:output"));
+ assertEquals(TEST_UUID, output.getText());
+ }
+
+ /**
+ * @see UUIDConverter
+ * @see https://github.com/jakartaee/faces/issues/1819
+ */
+ @Test
+ public void testInvalidExplicitUUIDviaTag() {
+ WebPage page = getPage("spec1819explicitConversionViaTag.xhtml");
+ WebElement input = page.findElement(By.id("form:input"));
+ input.sendKeys("fubar");
+ WebElement submit = page.findElement(By.id("form:submit"));
+ submit.click();
+ WebElement messages = page.findElement(By.id("form:messages"));
+ assertEquals("form:input: 'fubar' must be a UUID.", messages.getText());
+ WebElement output = page.findElement(By.id("form:output"));
+ assertEquals("", output.getText());
+ }
+
+ /**
+ * @see UUIDConverter
+ * @see https://github.com/jakartaee/faces/issues/1819
+ */
+ @Test
+ public void testEmptyExplicitUUIDviaTag() {
+ WebPage page = getPage("spec1819explicitConversionViaTag.xhtml");
WebElement input = page.findElement(By.id("form:input"));
input.sendKeys("");
WebElement submit = page.findElement(By.id("form:submit"));