Remove tests from old-tck that were already migated to old-tck-selenium

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
jakartaee · Feb 13, 2024 · 4d4c070 · 4d4c070
1 parent 98bbfc3
commit 4d4c070
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 694 deletions.
diff --git a/tck/old-tck/run/src/test/etc/ts-all-standalone.jtx b/tck/old-tck/run/src/test/etc/ts-all-standalone.jtx
@@ -5242,11 +5242,6 @@ com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlangwrapper/URLClient
 com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlangwrapper/URLClient.java#vdlWrapperRestoreViewNPETest
 com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlangwrapper/URLClient.java#vdlWrapperRetargetAttachedObjectsNPETest
 com/sun/ts/tests/jsf/api/jakarta_faces/view/viewdeclarationlangwrapper/URLClient.java#vdlWrapperRetargetMethodExpressionsNPETest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxAllKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxFormKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxNoneKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxThisKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/tagwrapper/URLClient.java#ajaxTagWrappingTest
 com/sun/ts/tests/jsf/spec/appconfigresources/absolute_ordering/URLClient.java#testDocumentAbsoluteOrdering
 com/sun/ts/tests/jsf/spec/appconfigresources/relative_ordering/URLClient.java#testDocumentRelativeOrderingTest1
 com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/URLClient.java#applicationConfigurationfilesTest1
@@ -5305,9 +5300,6 @@ com/sun/ts/tests/jsf/spec/render/booleancheckbox/URLClient.java#booleanCheckboxR
 com/sun/ts/tests/jsf/spec/render/booleancheckbox/URLClient.java#booleanCheckboxRenderPassthroughTest
 com/sun/ts/tests/jsf/spec/render/commandbutton/URLClient.java#cbuttonRenderDecodeTest
 com/sun/ts/tests/jsf/spec/render/commandbutton/URLClient.java#cbuttonRenderEncodeNonPassthroughTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderDecodeTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderEncodeTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderPassthroughTest
 com/sun/ts/tests/jsf/spec/render/datatable/URLClient.java#dtableRenderEncodeBasicTest
 com/sun/ts/tests/jsf/spec/render/datatable/URLClient.java#dtableRenderEncodeCaptionTest
 com/sun/ts/tests/jsf/spec/render/datatable/URLClient.java#dtableRenderEncodeColGrpTest
@@ -5407,7 +5399,6 @@ com/sun/ts/tests/jsf/spec/templating/repeat/URLClient.java#templateUIRepeatOffse
 com/sun/ts/tests/jsf/spec/templating/repeat/URLClient.java#templateUIRepeatVarStatusTest
 com/sun/ts/tests/jsf/spec/templating/repeat/URLClient.java#templateUIRepeatVarTest
 com/sun/ts/tests/jsf/spec/view/protectedview/URLClient.java#viewProtectedViewNonAccessPointTest
-com/sun/ts/tests/jsf/spec/view/protectedview/URLClient.java#viewProtectedViewSameWebAppAccessTest
 com/sun/ts/tests/jsf/spec/view/viewhandler/URLClient.java#viewHandlerCreateViewTest
 com/sun/ts/tests/jsf/spec/view/viewhandler/URLClient.java#viewHandlerRestoreViewTest
 com/sun/ts/tests/jsf/spec/webapp/factoryfinder/URLClient.java#factoryFinderConfig1Test

diff --git a/tck/old-tck/source/install/jsf/bin/ts.jtx b/tck/old-tck/source/install/jsf/bin/ts.jtx
@@ -37,15 +37,4 @@ com/sun/ts/tests/jsf/spec/render/onelistbox/URLClient.java#oneListboxRenderDecod
 com/sun/ts/tests/jsf/spec/render/outputlink/URLClient.java#outputLinkRenderPassthroughTest
 com/sun/ts/tests/jsf/spec/resource/packaging/classpath/URLClient.java#jsfJsDoesExistTest
 com/sun/ts/tests/jsf/spec/webapp/tldsig/URLClient.java#jsfTldSignatureTest
-
-#skipped due to htmlunit's rhino engine /javascript syntax incompabilitities, ported to old-tck-selenium
-com/sun/ts/tests/jsf/spec/ajax/tagwrapper/URLClient.java#ajaxTagWrappingTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxAllKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxThisKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxFormKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxNoneKeywordTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderEncodeTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderDecodeTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderPassthroughTest
 com/sun/ts/tests/jsf/spec/view/protectedview/URLClient.java#viewProtectedViewNonAccessPointTest
-com/sun/ts/tests/jsf/spec/view/protectedview/URLClient.java#viewProtectedViewSameWebAppAccessTest
diff --git a/tck/old-tck/source/install/jsf/bin/ts.jtx.platform b/tck/old-tck/source/install/jsf/bin/ts.jtx.platform
@@ -40,15 +40,4 @@ com/sun/ts/tests/jsf/spec/render/onelistbox/URLClient.java#oneListboxRenderDecod
 com/sun/ts/tests/jsf/spec/render/outputlink/URLClient.java#outputLinkRenderPassthroughTest
 com/sun/ts/tests/jsf/spec/resource/packaging/classpath/URLClient.java#jsfJsDoesExistTest
 com/sun/ts/tests/jsf/spec/webapp/tldsig/URLClient.java#jsfTldSignatureTest
-
-#skipped due to htmlunit's rhino engine /javascript syntax incompabilitities, ported to old-tck-selenium
-com/sun/ts/tests/jsf/spec/ajax/tagwrapper/URLClient.java#ajaxTagWrappingTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxAllKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxThisKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxFormKeywordTest
-com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java#ajaxNoneKeywordTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderEncodeTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderDecodeTest
-com/sun/ts/tests/jsf/spec/render/commandlink/URLClient.java#clinkRenderPassthroughTest
 com/sun/ts/tests/jsf/spec/view/protectedview/URLClient.java#viewProtectedViewNonAccessPointTest
-com/sun/ts/tests/jsf/spec/view/protectedview/URLClient.java#viewProtectedViewSameWebAppAccessTest
diff --git a/tck/old-tck/source/src/com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java b/tck/old-tck/source/src/com/sun/ts/tests/jsf/spec/ajax/keyword/URLClient.java
@@ -52,87 +52,6 @@ public Status run(String[] args, PrintWriter out, PrintWriter err) {
    * @class.setup_props: webServerHost; webServerPort; ts_home;
    */
 
-  /**
-   * @testName: ajaxAllKeywordTest
-   * @assertion_ids: PENDING
-   * @test_Strategy: Unsure the keyword 'all' works correctly with the f:ajax
-   *                 tag as value to 'execute' and 'render' attributes.
-   * 
-   * @since 2.0
-   */
-  public void ajaxAllKeywordTest() throws Fault {
-
-    List<HtmlPage> pages = new ArrayList<HtmlPage>();
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxAllKeyword1.xhtml"));
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxAllKeyword2.xhtml"));
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxAllKeyword3.xhtml"));
-
-    String buttonId = "allKeyword";
-    String spanId = "out";
-
-    this.validateKeyword(pages, buttonId, spanId, EXPECTED);
-
-  }// End ajaxAllKeywordTest
-
-  /**
-   * @testName: ajaxThisKeywordTest
-   * @assertion_ids: PENDING
-   * @test_Strategy: Unsure the keyword 'this' works correctly with the f:ajax
-   *                 tag as value to 'execute' and 'render' attributes.
-   * 
-   * @since 2.0
-   */
-  public void ajaxThisKeywordTest() throws Fault {
-    List<HtmlPage> pages = new ArrayList<HtmlPage>();
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxThisKeyword1.xhtml"));
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxThisKeyword2.xhtml"));
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxThisKeyword3.xhtml"));
-
-    String buttonId = "thisKeyword";
-    String spanId = "out";
-
-    this.validateKeyword(pages, buttonId, spanId, EXPECTED);
-  } // End ajaxThisKeywordTest
-
-  /**
-   * @testName: ajaxFormKeywordTest
-   * @assertion_ids: PENDING
-   * @test_Strategy: Unsure the keyword 'form' works correctly with the f:ajax
-   *                 tag as value to 'execute' and 'render' attributes.
-   * 
-   * @since 2.0
-   */
-  public void ajaxFormKeywordTest() throws Fault {
-    List<HtmlPage> pages = new ArrayList<HtmlPage>();
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxFormKeyword1.xhtml"));
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxFormKeyword2.xhtml"));
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxFormKeyword3.xhtml"));
-
-    String buttonId = "formKeyword";
-    String spanId = "out";
-
-    this.validateKeyword(pages, buttonId, spanId, EXPECTED);
-  } // End ajaxThisKeywordTest
-
-  /**
-   * @testName: ajaxNoneKeywordTest
-   * @assertion_ids: PENDING
-   * @test_Strategy: Unsure the keyword 'none' works correctly with the f:ajax
-   *                 tag as value to 'execute' and 'render' attributes.
-   * 
-   * @since 2.0
-   */
-  public void ajaxNoneKeywordTest() throws Fault {
-    List<HtmlPage> pages = new ArrayList<HtmlPage>();
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxNoneKeyword1.xhtml"));
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxNoneKeyword2.xhtml"));
-    pages.add(getPage(CONTEXT_ROOT + "/faces/ajaxNoneKeyword3.xhtml"));
-
-    String buttonId = "noneKeyword";
-    String spanId = "out";
-
-    this.validateKeyword(pages, buttonId, spanId, EXPECTED);
-  } // End ajaxThisKeywordTest
 
   // ---------------------------------------------------------- private
   // methods

diff --git a/tck/old-tck/source/src/com/sun/ts/tests/jsf/spec/ajax/tagwrapper/URLClient.java b/tck/old-tck/source/src/com/sun/ts/tests/jsf/spec/ajax/tagwrapper/URLClient.java
@@ -31,134 +31,46 @@
 
 public class URLClient extends BaseHtmlUnitClient {
 
-  private static final String CONTEXT_ROOT = "/jsf_ajax_tagwrapper_web";
+    private static final String CONTEXT_ROOT = "/jsf_ajax_tagwrapper_web";
 
-  private static final String SPAN = "span";
+    private static final String SPAN = "span";
 
-  private static final String NL = System.getProperty("line.seperator", "\n");
+    private static final String NL = System.getProperty("line.seperator", "\n");
 
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out, true),
-        new PrintWriter(System.err, true));
-    s.exit();
-  }
-
-  public Status run(String[] args, PrintWriter out, PrintWriter err) {
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /**
-   * @testName: ajaxTagWrappingTest
-   * @assertion_ids: PENDING
-   * @test_Strategy: Unsure that the ajax tag supports being "wrapped" around
-   *                 multiple components (enabling Ajax for many components).
-   * 
-   * @since 2.0
-   */
-  public void ajaxTagWrappingTest() throws Fault {
-    StringBuilder messages = new StringBuilder(128);
-    Formatter formatter = new Formatter(messages);
-
-    HtmlPage page = getPage(CONTEXT_ROOT + "/faces/ajaxTagWrap.xhtml");
-
-    // First we'll check the first page was output correctly
-    this.validateSpanTag(page, "out1", "0");
-    this.validateSpanTag(page, "checkedvalue", "false");
-    this.validateSpanTag(page, "outtext", "");
-
-    // Submit the ajax request
-    HtmlInput button1 = (HtmlInput) getElementOfTypeIncludingId(page, "input",
-        "button1");
-
-    if (!validateExistence("button1", "input", button1, formatter)) {
-      handleTestStatus(messages);
-      return;
-    }
-
-    try {
-      button1.click();
-    } catch (IOException ex) {
-      formatter.format("Unexpected Execption thrown while clicking '%s'.",
-          button1.getId());
-      ex.printStackTrace();
-    }
-
-    // Check that the ajax request succeeds - eventually.
-    this.validateSpanTag(page, "out1", "1");
-
-    // // Check on the text field
-    HtmlInput intext = ((HtmlInput) getElementOfTypeIncludingId(page, "input",
-        "intext"));
-
-    if (!validateExistence("input", "input", intext, formatter)) {
-      handleTestStatus(messages);
-      return;
+    public static void main(String[] args) {
+        URLClient theTests = new URLClient();
+        Status s = theTests.run(args, new PrintWriter(System.out, true), new PrintWriter(System.err, true));
+        s.exit();
     }
-    try {
-      intext.focus();
-      intext.type("test");
-      intext.blur();
-    } catch (IOException ex) {
-      formatter.format("Unexpected Test failing when setting one or "
-          + "more of the following attributes: focus, type, or blur");
-      ex.printStackTrace();
-    }
-
-    this.validateSpanTag(page, "outtext", "test");
-
-    // Check the checkbox
-
-    HtmlInput checkbox = (HtmlInput) getElementOfTypeIncludingId(page, "input",
-        "checkbox");
-
-    if (!validateExistence("checkbox", "input", checkbox, formatter)) {
-      handleTestStatus(messages);
-      return;
-    }
-
-    checkbox.setChecked(true);
-
-    if (!checkbox.isChecked()) {
-      formatter.format(
-          "Unexpected value for '%s'!" + NL + "Expected: '%s'" + NL
-              + "Received: '%s'" + NL,
-          checkbox.getId(), "true", checkbox.isChecked());
-    }
-
-    handleTestStatus(messages);
-  }// End ajaxAllKeywordTest
-
-  // ---------------------------------------------------------- private
-  // methods
-  /**
-   * Test for a the give @String "expectedValue" to match the value of the
-   * named @HtmlSpan "element "spanID".
-   * 
-   * @param page
-   *          - @HtmlPage that contains @HtmlSpan element.
-   * @param expectedValue
-   *          - The expected result.
-   * @param formatter
-   *          - used to gather test result output.
-   */
-  private void validateSpanTag(HtmlPage page, String spanId,
-      String expectedValue) throws Fault {
-    StringBuilder messages = new StringBuilder(128);
-    Formatter formatter = new Formatter(messages);
-
-    HtmlSpan output = (HtmlSpan) getElementOfTypeIncludingId(page, SPAN,
-        spanId);
 
-    if (!validateExistence(spanId, SPAN, output, formatter)) {
-      handleTestStatus(messages);
-      return;
+    public Status run(String[] args, PrintWriter out, PrintWriter err) {
+        return super.run(args, out, err);
     }
-    validateElementValue(output, expectedValue, formatter);
 
-  }// End validateSpanTag
+    /*
+     * @class.setup_props: webServerHost; webServerPort; ts_home;
+     */
+
+    // ---------------------------------------------------------- private
+    // methods
+    /**
+     * Test for a the give @String "expectedValue" to match the value of the named @HtmlSpan "element "spanID".
+     * 
+     * @param page - @HtmlPage that contains @HtmlSpan element.
+     * @param expectedValue - The expected result.
+     * @param formatter - used to gather test result output.
+     */
+    private void validateSpanTag(HtmlPage page, String spanId, String expectedValue) throws Fault {
+        StringBuilder messages = new StringBuilder(128);
+        Formatter formatter = new Formatter(messages);
+
+        HtmlSpan output = (HtmlSpan) getElementOfTypeIncludingId(page, SPAN, spanId);
+
+        if (!validateExistence(spanId, SPAN, output, formatter)) {
+            handleTestStatus(messages);
+            return;
+        }
+        validateElementValue(output, expectedValue, formatter);
+
+    }// End validateSpanTag
 } // END URLClient