diff --git a/mozilla/java/dist/mcp-test/src/test/java/cardemo/CarDemoTest.java b/mozilla/java/dist/mcp-test/src/test/java/cardemo/CarDemoTest.java index 6e9228aa5f1..3728e80c52d 100755 --- a/mozilla/java/dist/mcp-test/src/test/java/cardemo/CarDemoTest.java +++ b/mozilla/java/dist/mcp-test/src/test/java/cardemo/CarDemoTest.java @@ -1,5 +1,5 @@ /* - * $Id: CarDemoTest.java,v 1.6 2007-03-09 04:34:23 edburns%acm.org Exp $ + * $Id: CarDemoTest.java,v 1.7 2007-03-15 00:33:10 edburns%acm.org Exp $ */ /* @@ -32,6 +32,8 @@ import org.mozilla.mcp.AjaxListener; import org.mozilla.mcp.MCP; import org.mozilla.webclient.WebclientTestCase; import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.Document; /** * @@ -61,7 +63,8 @@ public class CarDemoTest extends WebclientTestCase { enum TestFeature { RECEIVED_END_AJAX_EVENT, HAS_MAP, - HAS_VALID_PARTIAL_RESPONSE, + HAS_VALID_RESPONSE_TEXT, + HAS_VALID_RESPONSE_XML, HAS_VALID_READYSTATE, STOP_WAITING } @@ -75,13 +78,39 @@ public class CarDemoTest extends WebclientTestCase { if (null != eventMap) { bitSet.flip(TestFeature.HAS_MAP.ordinal()); } + // Make some assertions about the response text String responseText = (String) eventMap.get("responseText"); if (null != responseText) { if (-1 != responseText.indexOf("") && -1 != responseText.indexOf("")) { - bitSet.flip(TestFeature.HAS_VALID_PARTIAL_RESPONSE.ordinal()); + bitSet.flip(TestFeature.HAS_VALID_RESPONSE_TEXT.ordinal()); } } + Document responseXML = (Document) + eventMap.get("responseXML"); + Element rootElement = null, element = null; + Node node = null; + String tagName = null; + try { + rootElement = responseXML.getDocumentElement(); + tagName = rootElement.getTagName(); + if (tagName.equals("partial-response")) { + element = (Element) rootElement.getFirstChild(); + tagName = element.getTagName(); + if (tagName.equals("components")) { + element = (Element) rootElement.getLastChild(); + tagName = element.getTagName(); + if (tagName.equals("state")) { + bitSet.flip(TestFeature. + HAS_VALID_RESPONSE_XML.ordinal()); + } + } + } + } + catch (Throwable t) { + + } + String readyState = (String) eventMap.get("readyState"); bitSet.set(TestFeature.HAS_VALID_READYSTATE.ordinal(), null != readyState && readyState.equals("4")); @@ -117,7 +146,8 @@ public class CarDemoTest extends WebclientTestCase { // assert that the ajax transaction succeeded assertTrue(bitSet.get(TestFeature.RECEIVED_END_AJAX_EVENT.ordinal())); assertTrue(bitSet.get(TestFeature.HAS_MAP.ordinal())); - assertTrue(bitSet.get(TestFeature.HAS_VALID_PARTIAL_RESPONSE.ordinal())); + assertTrue(bitSet.get(TestFeature.HAS_VALID_RESPONSE_TEXT.ordinal())); + assertTrue(bitSet.get(TestFeature.HAS_VALID_RESPONSE_XML.ordinal())); assertTrue(bitSet.get(TestFeature.HAS_VALID_READYSTATE.ordinal())); bitSet.clear(); diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/mcp/package.html b/mozilla/java/webclient/classes_spec/org/mozilla/mcp/package.html index e351479769c..b0e06745a72 100755 --- a/mozilla/java/webclient/classes_spec/org/mozilla/mcp/package.html +++ b/mozilla/java/webclient/classes_spec/org/mozilla/mcp/package.html @@ -110,40 +110,48 @@ href="http://developers.sun.com/web/swdp/index.jsp">Project Dynamic Faces for Ajax.

-
  1. enum TestFeature {
    2. -
  2.     RECEIVED_END_AJAX_EVENT,
    3. -
  3.     HAS_MAP,
    4. -
  4.     HAS_VALID_PARTIAL_RESPONSE,
    5. -
  5.     HAS_VALID_READYSTATE,
    6. -
  6.     STOP_WAITING
    7. -
  7. }
    8. -
  8.  
    9. -
  9. public void testCardemo() throws Exception {
    10. -
  10.    
    11. -
  11.     MCP mcp = new MCP();
    12. -
  12.     try {
    13. -
  13.         mcp.setAppData(getBrowserBinDir());
    14. -
  14.     }
    15. -
  15.     catch (Exception e) {
    16. -
  16.         fail();
    17. -
  17.     }
    18. -
  18.    
    19. -
  19.     mcp.getRealizedVisibleBrowserWindow();
    20. -
  20.     final BitSet bitSet = new BitSet();
    21. -
  21.     AjaxListener listener = new AjaxListener() {
    22. -
  22.       public void endAjax(Map eventMap) {
    23. -
  23.           bitSet.flip(TestFeature.RECEIVED_END_AJAX_EVENT.ordinal());
    24. -
  24.           if (null != eventMap) {
    25. -
  25.               bitSet.flip(TestFeature.HAS_MAP.ordinal());
    26. -
  26.           }
    27. +
    1. public void testCardemo() throws Exception {
      2. +
    2.     mcp.getRealizedVisibleBrowserWindow();
      3. +
    3.     final BitSet bitSet = new BitSet();
      4. +
    4.     AjaxListener listener = new AjaxListener() {
      5. +
    5.       public void endAjax(Map eventMap) {
      6. +
    6.           bitSet.flip(TestFeature.RECEIVED_END_AJAX_EVENT.ordinal());
      7. +
    7.           if (null != eventMap) {
      8. +
    8.               bitSet.flip(TestFeature.HAS_MAP.ordinal());
      9. +
    9.           }
      10. +
    10.           // Make some assertions about the response text
    11.           String responseText = (String) eventMap.get("responseText");
    12.           if (null != responseText) {
    13.               if (-1 != responseText.indexOf("<partial-response>") &&
    14.                   -1 != responseText.indexOf("</partial-response>")) {
      15. -
    15.                   bitSet.flip(TestFeature.
      16. -
    16.                     HAS_VALID_PARTIAL_RESPONSE.ordinal());
      17. +
    17.                 bitSet.flip(TestFeature.HAS_VALID_RESPONSE_TEXT.ordinal());
      18. +
    18.               }
      19. +
    19.           }
      20. +
    20.           Document responseXML = (Document)
      21. +
    21.               eventMap.get("responseXML");
      22. +
    22.           Element rootElement = null, element = null;
      23. +
    23.           Node node = null;
      24. +
    24.           String tagName = null;
      25. +
    25.           try {
      26. +
    26.               rootElement = responseXML.getDocumentElement();
      27. +
    27.               tagName = rootElement.getTagName();
      28. +
    28.               if (tagName.equals("partial-response")) {
      29. +
    29.                   element = (Element) rootElement.getFirstChild();
      30. +
    30.                   tagName = element.getTagName();
      31. +
    31.                   if (tagName.equals("components")) {
      32. +
    32.                       element = (Element) rootElement.getLastChild();
      33. +
    33.                       tagName = element.getTagName();
      34. +
    34.                       if (tagName.equals("state")) {
      35. +
    35.                           bitSet.flip(TestFeature.
      36. +
    36.                                       HAS_VALID_RESPONSE_XML.ordinal());
      37. +
    37.                       }
      38. +
    38.                   }
    39.               }
    40.           }
      41. +
    41.           catch (Throwable t) {
      42. +
    42.               
      43. +
    43.           }
      44. +
    44.           
    45.           String readyState = (String) eventMap.get("readyState");
    46.           bitSet.set(TestFeature.HAS_VALID_READYSTATE.ordinal(),
    47.                      null != readyState && readyState.equals("4"));
      48. @@ -179,21 +187,22 @@ Faces for Ajax.

    48.     // assert that the ajax transaction succeeded
    49.     assertTrue(bitSet.get(TestFeature.RECEIVED_END_AJAX_EVENT.ordinal()));
    50.     assertTrue(bitSet.get(TestFeature.HAS_MAP.ordinal()));
      51. -
    51.     assertTrue(bitSet.get(TestFeature.HAS_VALID_PARTIAL_RESPONSE.ordinal()));
      52. -
    52.     assertTrue(bitSet.get(TestFeature.HAS_VALID_READYSTATE.ordinal()));
      53. -
    53.     bitSet.clear();
      54. +
    54.     assertTrue(bitSet.get(TestFeature.HAS_VALID_RESPONSE_TEXT.ordinal()));
      55. +
    55.     assertTrue(bitSet.get(TestFeature.HAS_VALID_RESPONSE_XML.ordinal()));
      56. +
    56.     assertTrue(bitSet.get(TestFeature.HAS_VALID_READYSTATE.ordinal()));
      57. +
    57.     bitSet.clear();
      58. +
    58.    
      59. +
    59.     // Sample the Basis-Preis and Ihr-Preis after the ajax transaction
      60. +
    60.     pricePanel = mcp.findElement("j_id_id10:zone1");
      61. +
    61.     assertNotNull(pricePanel);
      62. +
    62.     pricePanelText = pricePanel.getTextContent();
    63.    
      64. -
    64.     // Sample the Basis-Preis and Ihr-Preis after the ajax transaction
      65. -
    65.     pricePanel = mcp.findElement("j_id_id10:zone1");
      66. -
    66.     assertNotNull(pricePanel);
      67. -
    67.     pricePanelText = pricePanel.getTextContent();
      68. -
    68.    
      69. -
    69.     assertNotNull(pricePanelText);
      70. -
    70.     assertTrue(pricePanelText.matches("(?s).*Basis-Preis\\s*15700.*"));
      71. -
    71.     assertTrue(pricePanelText.matches("(?s).*Ihr Preis\\s*16600.*"));
      72. -
    72.    
      73. -
    73.     mcp.deleteBrowserControl();
      74. -
    74. }
+
  •     assertNotNull(pricePanelText);
    • +
  •     assertTrue(pricePanelText.matches("(?s).*Basis-Preis\\s*15700.*"));
    • +
  •     assertTrue(pricePanelText.matches("(?s).*Ihr Preis\\s*16600.*"));
    • +
  •    
    • +
  •     mcp.deleteBrowserControl();
    • +
  • }