Updated installation doc, added clickLinkWithImage to HttpUnitDialog

Author: Jim Weaver

jWebUnit/doc/installation.html

@@ -30,11 +30,8 @@
 <!-- Begin Main -->
 First download jWebUnit from the <a href="http://sourceforge.net/projects/jwebunit/files">files area</a>
 and expand to a local directory.<p>
-Next, copy the jars needed below to the project you wish to test, or include them in that
-project's classpath from where you expanded them too.  There is a jWebUnit jar in the root directory.  You can use this
-jar alone to run jWebUnit, but only if you already have the jars for jWebUnit's dependencies in your target project.
-jWebUnit includes jars for the projects it is dependent on in its lib directory, so if your project
-is not already using them you can get them there.  The dependencies are as follows:
+There are some jars for jWebUnit dependencies in the lib directory of your installation that may need to be added
+to your project's classpath before you can write project tests with jWebUnit.  The dependencies are as follows:
 <p>
 <h2>Dependencies</h2>
 <table class="default" cellspacing="2" border="1">

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

@@ -459,8 +459,8 @@ public boolean isLinkPresent(String anId) {
     }
 
     /**
-     * Navigate by submitting a request based on the specified link.  A
-     * RuntimeException is thrown if no such link can be found.
+     * Navigate by submitting a request based on a link containing the
+     * specified text.  A RuntimeException is thrown if no such link can be found.
      *
      * @param linkText text which link to be navigated should contain.
      */
@@ -477,7 +477,7 @@ public void clickLinkWithText(String linkText) {
     }
 
     /**
-     * Navigate by submitting a request based on the specified link.  A
+     * Navigate by submitting a request based on a link with a given ID.  A
      * RuntimeException is thrown if no such link can be found.
      *
      * @param anID id of link to be navigated.
@@ -495,6 +495,27 @@ public void clickLink(String anID) {
 
     }
 
+    /**
+     * Navigate by submitting a request based on a link with a given image file name.
+     * A RuntimeException is thrown if no such link can be found.
+     *
+     *
+     * @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) {
+        WebLink link = null;
+        try {
+            link = resp.getFirstMatchingLink(new LinkImagePredicate(), imageFileName);
+        } catch (SAXException e) {
+            throw new RuntimeException(ExceptionUtility.stackTraceToString(e));
+        }
+        if (link == null)
+            throw new RuntimeException("No Link found with imageFileName \"" + imageFileName + "\"");
+        submitRequest(link.getRequest());
+    }
+
     /**
      * Return true if a radio group contains the indicated option.
      *

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

@@ -0,0 +1,42 @@
+/********************************************************************************
+ * Copyright (c) 2001, ThoughtWorks, Inc.
+ * Distributed open-source, see full license under licenses/jwebunit_license.txt
+**********************************/
+package net.sourceforge.jwebunit;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import com.meterware.httpunit.WebLink;
+import com.meterware.httpunit.HTMLElementPredicate;
+
+/**
+ * Matches to a Link element containing an image with a specified filename string as a suffix.
+ *
+ * @author Justin Sampson
+ */
+public class LinkImagePredicate implements HTMLElementPredicate
+    {
+
+        public
+        boolean matchesCriteria(Object webLink, Object criteria)
+        {
+            Element a = (Element) ((WebLink) webLink).getDOMSubtree();
+            Element img = getChildImageElement(a);
+
+            if (img == null)
+            {
+                return false;
+            }
+
+            String src = img.getAttribute("src");
+            return src.endsWith((String) criteria);
+        }
+
+        private
+        Element getChildImageElement(Element htmlElement)
+        {
+            NodeList nodes = htmlElement.getElementsByTagName("img");
+            return nodes.getLength() == 0 ? null : (Element) nodes.item(0);
+        }
+
+    }