Added click link by image support, updated changes file

Author: Jim Weaver

jWebUnit/CHANGES

@@ -1,3 +1,21 @@
+CHANGES SINCE RC2:
+
+** Additional Functionality**
+
+Support for links with images contributed by Justin Sampson
+Methods were added to assert and navigate links with images by filename.
+
+assertFormElementEmpty method added - a convenience.
+
+
+**API Changes**
+assertHasForm renamed to assertFormPresent to be consistent with other methods.
+
+
+**Miscellaneous**
+HttpUnit 1.4.6 incorporated.
+
+
 CHANGES SINCE RC1:
 
 **Additional Functionality**

jWebUnit/src/net/sourceforge/jwebunit/HttpUnitDialog.java

@@ -444,6 +444,21 @@ public boolean isLinkPresentWithText(String linkText) {
         }
     }
 
+    /**
+     * Return true if a link is present with a given image based on filename of image.
+     *
+     * @param imageFileName A suffix of the image's filename; for example, to match
+     *                      <tt>"images/my_icon.png"<tt>, you could just pass in
+     *                      <tt>"my_icon.png"<tt>.
+     */
+    public boolean isLinkPresentWithImage(String imageFileName) {
+        try {
+            return (resp.getFirstMatchingLink(new LinkImagePredicate(), imageFileName) != null);
+        } catch (SAXException e) {
+            throw new RuntimeException(ExceptionUtility.stackTraceToString(e));
+        }
+    }
+
     /**
      * Return true if a link is present in the current response with the
      * specified id.

jWebUnit/src/net/sourceforge/jwebunit/WebTestCase.java

@@ -200,6 +200,14 @@ public void assertSubmitButtonValue(String buttonName, String expectedValue) {
         tester.assertSubmitButtonValue(buttonName, expectedValue);
     }
 
+    public void assertLinkPresent(String linkId) {
+        tester.assertLinkPresent(linkId);
+    }
+
+    public void assertLinkNotPresent(String linkId) {
+        tester.assertLinkNotPresent(linkId);
+    }
+
     public void assertLinkPresentWithText(String linkText) {
         tester.assertLinkPresentWithText(linkText);
     }
@@ -208,12 +216,12 @@ public void assertLinkNotPresentWithText(String linkText) {
         tester.assertLinkNotPresentWithText(linkText);
     }
 
-    public void assertLinkPresent(String linkId) {
-        tester.assertLinkPresent(linkId);
+    public void assertLinkPresentWithImage(String imageFileName) {
+        tester.assertLinkPresentWithImage(imageFileName);
     }
 
-    public void assertLinkNotPresent(String linkId) {
-        tester.assertLinkNotPresent(linkId);
+    public void assertLinkNotPresentWithImage(String imageFileName) {
+        tester.assertLinkNotPresentWithImage(imageFileName);
     }
 
     public void assertElementPresent(String anID) {
@@ -265,6 +273,10 @@ protected void clickLinkWithText(String linkText) {
         tester.clickLinkWithText(linkText);
     }
 
+    protected void clickLinkWithImage(String imageFileName) {
+        tester.clickLinkWithImage(imageFileName);
+    }
+
     protected void clickLink(String linkId) {
         tester.clickLink(linkId);
     }

jWebUnit/src/net/sourceforge/jwebunit/WebTester.java

@@ -574,6 +574,28 @@ public void assertLinkNotPresentWithText(String linkText) {
         Assert.assertTrue("Link with text [" + linkText + "] found in response.", !dialog.isLinkPresentWithText(linkText));
     }
 
+    /**
+     * Assert that a link containing a specified image is present.
+     *
+     * @param imageFileName A suffix of the image's filename; for example, to match
+     *                      <tt>"images/my_icon.png"<tt>, you could just pass in
+     *                      <tt>"my_icon.png"<tt>.
+     */
+    public void assertLinkPresentWithImage(String imageFileName) {
+        Assert.assertTrue("Link with image file [" + imageFileName + "] not found in response.", dialog.isLinkPresentWithImage(imageFileName));
+    }
+
+    /**
+     * Assert that a link containing a specified image is not present.
+     *
+     * @param imageFileName A suffix of the image's filename; for example, to match
+     *                      <tt>"images/my_icon.png"<tt>, you could just pass in
+     *                      <tt>"my_icon.png"<tt>.
+     */
+    public void assertLinkNotPresentWithImage(String imageFileName) {
+        Assert.assertTrue("Link with image file [" + imageFileName + "] found in response.", !dialog.isLinkPresentWithImage(imageFileName));
+    }
+
     /**
      * Assert that an element with a given id is present.
      *
@@ -689,6 +711,19 @@ public void clickLinkWithText(String linkText) {
         dialog.clickLinkWithText(linkText);
     }
 
+    /**
+     * Navigate by selection of a link with a given image.
+     *
+     * @param imageFileName A suffix of the image's filename; for example, to match
+     *                      <tt>"images/my_icon.png"<tt>, you could just pass in
+     *                      <tt>"my_icon.png"<tt>.
+     */
+    public void clickLinkWithImage(String imageFileName) {
+        assertLinkPresentWithImage(imageFileName);
+        dialog.clickLinkWithImage(imageFileName);
+    }
+
+
     /**
      * Navigate by selection of a link with given id.
      *

jWebUnit/test/net/sourceforge/jwebunit/NavigationTest.java

@@ -42,21 +42,29 @@ public void testInvalidBeginAt() {
         fail("Expected exception");
     }
 
-    public void testClickLink() {
+    public void testClickLinkWithText() {
         gotoLinkTestPage();
         clickLinkWithText("an active link");
         assertTitleEquals("targetPage");
     }
 
+    public void testClickLinkWithImage() {
+        gotoLinkTestPage();
+        clickLinkWithImage("graphic.jpg");
+        assertTitleEquals("targetPage2");
+    }
+
     public void testClickLinkByID() {
         gotoLinkTestPage();
         clickLink("activeID");
         assertTitleEquals("targetPage");
     }
 
     private void gotoLinkTestPage() {
-        defineWebPage("pageWithLink", "<a href=\"/targetPage.html\" id=\"activeID\">an <b>active</b> link</A>\n");
+        defineWebPage("pageWithLink", "<a href=\"/targetPage.html\" id=\"activeID\">an <b>active</b> link</A>\n" +
+                                      "<a href=\"/targetPage2.html\"><img src=\"graphic.jpg\"/></a>)\n");
         defineWebPage("targetPage", "");
+        defineWebPage("targetPage2", "");
         beginAt("/pageWithLink.html");
         assertTitleEquals("pageWithLink");
     }

jWebUnit/test/net/sourceforge/jwebunit/WebAssertionsTest.java

@@ -49,6 +49,14 @@ public void testAssertLinkNotPresent() throws Throwable {
         assertPassFail("assertLinkNotPresent", "no_link_id", "test_link_id");
     }
 
+    public void testAssertLinkPresentWithImage() throws Throwable {
+        assertPassFail("assertLinkPresentWithImage", "graphic.jpg", "nosuchgraphic.jsp");
+    }
+
+    public void testAssertLinkNotPresentWithImage() throws Throwable {
+        assertPassFail("assertLinkNotPresentWithImage", "nosuchgraphic.jpg", "graphic.jpg");
+    }
+
     public void testAssertElementPresent() throws Throwable {
         assertElementPresent("row1");
         assertPassFail("assertElementPresent", "span_id", "no_id");
@@ -78,6 +86,7 @@ private void addTestPage() {
                                   "<tr><td>table text row 2</td></tr>" +
                                   "<tr><td>table text row 3</td><td>row 3 col 1</td>" +
                                   "<a id=\"test_link_id\" href=\"someurl.html\">test link</a>" +
+                                  "<a id=\"test_graphic_link_id\" href=\"someurl2.html\"><img src=\"graphic.jpg\"/></a>" +
                                   "<form>" +
                                   "<input type=\"text\" name=\"testInputElement\" value=\"testValue\"/>" +
                                   "<input type=\"submit\" name=\"submitButton\" value=\"buttonLabel\"/>" +