Implemented method for executing ajax re-rendered scripts.

Implemented several tests for ClassDetails.

@@ -43,6 +43,17 @@
                     <optimize>false</optimize>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
         </plugins>
     </build>

@@ -7,9 +7,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Node;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class DomChangeLogger implements DomChangeListener {
 
     private static final Log LOG = LogFactory.getLog(DomChangeLogger.class);
+    private Set<String> detailIds = new HashSet<String>();
 
     public void nodeAdded(DomChangeEvent event) {
         logEvent(event, "added");
@@ -19,6 +23,14 @@ public class DomChangeLogger implements DomChangeListener {
         logEvent(event, "removed");
     }
 
+    public void showDetails(String id) {
+        detailIds.add(id);
+    }
+
+    public void hideDetails(String id) {
+        detailIds.remove(id);
+    }
+
     private void logEvent(DomChangeEvent event, String action) {
         String changed;
         final DomNode changedNode = event.getChangedNode();
@@ -36,7 +48,7 @@ public class DomChangeLogger implements DomChangeListener {
         }
         LOG.info("DomChangeEvent[action=" + action + ";changedElement=" + changed + ";source=" + event.getSource() + ";parent=" + parent + "]");
         final Node id = event.getChangedNode().getAttributes().getNamedItem("id");
-        if (id != null && "searchClass:searchStudent".equals(id.getTextContent())) {
+        if (id != null && detailIds.contains(id.getTextContent())) {
             LOG.info(event.getChangedNode().asXml());
         }
     }

 package pl.labno.bernard.htmlunified;
 
 import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.DomNode;
 import com.gargoylesoftware.htmlunit.html.DomNodeList;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlTableCell;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class WebClientUtils {
@@ -29,19 +33,27 @@ public class WebClientUtils {
         WebClientUtils.defaultTimeout = defaultTimeout;
     }
 
-    public static int waitForJSJob(WebClient webClient) {
-        return waitForJSJob(webClient, webClient.waitForBackgroundJavaScript(10) - 1);
+    public static int waitForJSJob(String message, WebClient webClient) {
+        return waitForJSJob(message, webClient, webClient.waitForBackgroundJavaScript(10) - 1);
     }
 
-    public static int waitForJSJob(WebClient webClient, int initialJobCount) {
-        return waitForJSJob(webClient, initialJobCount, defaultTimeout);
+    public static int waitForJSJob(String message, WebClient webClient, int initialJobCount) {
+        return waitForJSJob(message, webClient, initialJobCount, defaultTimeout);
     }
 
-    public static int waitForJSJob(WebClient webClient, int initialJobCount, long timeout) {
-        return waitForJSJob(webClient, initialJobCount, timeout, defaultCheckInterval);
+    public static int waitForJSJob(WebClient webClient, int initialJobCount, int timeout) {
+        return waitForJSJob(null, webClient, initialJobCount, timeout);
     }
 
-    public static int waitForJSJob(WebClient webClient, int initialJobCount, long timeout, long checkInterval) {
+    public static int waitForJSJob(String message, WebClient webClient, int initialJobCount, long timeout) {
+        return waitForJSJob(message, webClient, initialJobCount, timeout, defaultCheckInterval);
+    }
+
+    public static int waitForJSJob(String message, WebClient webClient, int initialJobCount, int timeout) {
+        return waitForJSJob(message, webClient, initialJobCount, timeout, defaultCheckInterval);
+    }
+
+    public static int waitForJSJob(String message, WebClient webClient, int initialJobCount, long timeout, long checkInterval) {
         int jobs;
         long startTime = System.currentTimeMillis();
         do {
@@ -50,7 +62,7 @@ public class WebClientUtils {
                 throw new RuntimeException("Number of JavaScript jobs doesn't drop to initial level for " + timeout + " seconds. It's memory leak in your JavaScript rather then request taking so long!");
             }
         } while (jobs > initialJobCount);
-        System.out.println("Waiting took: " + (System.currentTimeMillis() - startTime) + "ms");
+        System.out.println("Waiting" + (message == null ? "" : " for " + message) + " took: " + (System.currentTimeMillis() - startTime) + "ms");
         return jobs;
     }
 
@@ -88,4 +100,32 @@ public class WebClientUtils {
             }
         } while (startTime + timeout > System.currentTimeMillis());
     }
+
+    public static void executeAjaxReRenderedScripts(HtmlPage page) {
+        final DomNodeList<HtmlElement> scripts = page.getElementsByTagName("script");
+        /**
+         * We cannot iterate over html DomNodeList cause it depends on sibling relationship which we will modify.
+         */
+        final List<HtmlElement> scriptsList = new ArrayList<HtmlElement>();
+        for (HtmlElement element : scripts) {
+            scriptsList.add(element);
+        }
+        for (HtmlElement element : scriptsList) {
+            if (element.getChildNodes().size() > 1) {
+                element.removeChild(element.getFirstChild());
+                final DomNode sibling = element.getNextSibling();
+                final DomNode parentNode = element.getParentNode();
+                /**
+                 * Script will be executed upon inserting into DOM tree, so we removed and add it again.
+                 */
+                if (sibling != null) {
+                    parentNode.removeChild(element);
+                    sibling.insertBefore(element);
+                } else {
+                    parentNode.removeChild(element);
+                    parentNode.appendChild(element);
+                }
+            }
+        }
+    }
 }

+package pl.labno.bernard.htmlunified;
+
+import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSpan;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.List;
+
+public class ClassDetailsTest {
+
+    @Test
+    public void openDetailsModalPanel() throws IOException {
+        WebClient client = new WebClient(BrowserVersion.FIREFOX_3_6);
+        HtmlPage page = login(client);
+        @SuppressWarnings("unchecked")
+        final List<HtmlSpan> titleElements = (List<HtmlSpan>) page.getElementById("results:schedule").getByXPath(".//span[@class='fc-event-title']");
+        Assert.assertNotSame(0, titleElements.size());
+        new RequestResponseLogger(client);
+        page.addDomChangeListener(new DomChangeLogger());
+        WebClientUtils.waitForJSJob("initial javascript to finish", client, 0, 30000);
+        System.out.println("item:" + titleElements.get(0).asText());
+        ((HtmlElement) titleElements.get(0).getParentNode()).mouseOver();
+        ((HtmlElement) titleElements.get(0).getParentNode()).click();
+        WebClientUtils.waitForJSJob("classDetailsModalPanel shown after schedule event clicked", client, 0, 30000);
+        Assert.assertNotNull(page.getElementById("classDetailsModalPanelContainer"));
+    }
+
+    @Test
+    public void closeDetailsModalPanel() throws IOException {
+        WebClient client = new WebClient(BrowserVersion.FIREFOX_3_6);
+        HtmlPage page = login(client);
+        @SuppressWarnings("unchecked")
+        final List<HtmlSpan> titleElements = (List<HtmlSpan>) page.getElementById("results:schedule").getByXPath(".//span[@class='fc-event-title']");
+        Assert.assertNotSame(0, titleElements.size());
+//        new RequestResponseLogger(client);
+//        page.addDomChangeListener(new DomChangeLogger());
+        WebClientUtils.waitForJSJob("initial javascript to finish", client, 0, 30000);
+        System.out.println("item:" + titleElements.get(0).asText());
+        ((HtmlElement) titleElements.get(0).getParentNode()).mouseOver();
+        ((HtmlElement) titleElements.get(0).getParentNode()).click();
+        WebClientUtils.waitForJSJob("classDetailsModalPanel shown after schedule event clicked", client, 0, 30000);
+        Assert.assertNotNull(page.getElementById("classDetailsModalPanelContainer"));
+        ((HtmlElement) page.getElementById("classDetailsModalPanelContainer").getByXPath("//*[contains(@src,'close.png')]").get(0)).click();
+        WebClientUtils.waitForJSJob("classDetailsModalPanel hidden after cancel button", client, 0, 30000);
+        Assert.assertNull(page.getElementById("classDetailsModalPanelContainer"));
+    }
+
+    @Test
+    public void removeClass() throws IOException {
+        WebClient client = new WebClient(BrowserVersion.FIREFOX_2);
+        final RequestResponseLogger requestResponseLogger = new RequestResponseLogger(client);
+        requestResponseLogger.off();
+        HtmlPage page = login(client);
+        @SuppressWarnings("unchecked")
+        final List<HtmlSpan> titleElements = (List<HtmlSpan>) page.getElementById("results:schedule").getByXPath(".//span[@class='fc-event-title']");
+        Assert.assertEquals(6, titleElements.size());
+        Assert.assertNotSame(0, titleElements.size());
+        WebClientUtils.waitForJSJob("initial javascript to finish", client, 0, 30000);
+
+        client.setAlertHandler(new AlertLogger());
+        final DomChangeLogger domChangeLogger = new DomChangeLogger();
+        domChangeLogger.showDetails("results:j_id2158");
+//        page.addDomChangeListener(domChangeLogger);
+//        page.addHtmlAttsributeChangeListener(new HtmlAttributeChangeLogger());
+//        requestResponseLogger.on();
+
+        ((HtmlElement) titleElements.get(0).getParentNode()).mouseOver();
+        ((HtmlElement) titleElements.get(0).getParentNode()).click();
+        WebClientUtils.waitForJSJob("classDetailsModalPanel shown after schedule event clicked", client, 0, 30000);
+        WebClientUtils.executeAjaxReRenderedScripts(page);
+        Assert.assertNotNull(page.getElementById("classDetailsModalPanelContainer"));
+        ((HtmlElement) page.getElementById("classDetailsModalPanelContainer").getByXPath("//*[contains(@src,'remove.png')]").get(0)).click();
+        WebClientUtils.waitForJSJob("classDetailsModalPanel hidden after remove button", client, 0, 30000);
+        WebClientUtils.executeAjaxReRenderedScripts(page);
+        WebClientUtils.waitForJSJob("schedule refresh", client, 0, 30000);
+        Assert.assertNull(page.getElementById("classDetailsModalPanelContainer"));
+        Assert.assertEquals(5, page.getElementById("results:schedule").getByXPath(".//span[@class='fc-event-title']").size());
+    }
+
+    private HtmlPage login(WebClient client) throws IOException {
+        HtmlPage page = (HtmlPage) client.getPage("http://localhost:8080/schoolmanager/view/class/current.seam?networkId=salsafactory");
+        ((HtmlInput) page.getElementById("loginForm:email")).setValueAttribute("it.crowd.test@gmail.com");
+        ((HtmlInput) page.getElementById("loginForm:password")).setValueAttribute("aaaaa");
+        HtmlPage oldPage = page;
+        page = page.getElementById("loginForm:submit").click();
+//        This assert would fail (when page redidrects than you need to obtain new page)
+//        Assert.assertEquals(page,oldPage);
+        Assert.assertEquals(client.getCurrentWindow().getEnclosedPage(), page);
+        return page;
+    }
+}

 package pl.labno.bernard.htmlunified;
 
 import com.gargoylesoftware.htmlunit.BrowserVersion;
+import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
 import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -8,11 +9,12 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.ArrayList;
 
 public class SandboxTest {
 
     @Test
-    public void test() throws IOException {
+    public void testClickImage() throws IOException {
         final WebClient client = new WebClient(BrowserVersion.FIREFOX_3_6);
         client.setAjaxController(new NicelyResynchronizingAjaxController());
         HtmlPage page = (HtmlPage) client.getPage("file:./target/test-classes/sandbox.html");
@@ -20,4 +22,23 @@ public class SandboxTest {
         page.getElementById("close").click();
         Assert.assertEquals("", page.getElementById("elementToHide").asText());
     }
+
+    @Test
+    public void testClickJQueryBoundElement() throws IOException {
+        final WebClient client = new WebClient(BrowserVersion.FIREFOX_3_6);
+        client.setAjaxController(new NicelyResynchronizingAjaxController());
+        HtmlPage page = (HtmlPage) client.getPage("file:./target/test-classes/sandbox.html");
+        final ArrayList<String> alerts = new ArrayList<String>();
+        client.setAlertHandler(new CollectingAlertHandler(alerts));
+        page.getElementById("clickable").click();
+        System.out.println(alerts);
+        Assert.assertEquals(1, alerts.size());
+        Assert.assertEquals("Clicked clickable", alerts.get(0));
+
+        alerts.clear();
+        page.getElementById("clickable2child").click();
+        System.out.println(alerts);
+        Assert.assertEquals(1, alerts.size());
+        Assert.assertEquals("Clicked clickable2", alerts.get(0));
+    }
 }

@@ -30,7 +30,7 @@ public class ScheduleTest {
         for (HtmlSpan o : titleElements) {
             titles.add(o.asText());
         }
-        Assert.assertEquals(4, titles.size());
+        Assert.assertEquals(6, titles.size());
     }
 
     @Test
@@ -58,7 +58,6 @@ public class ScheduleTest {
         System.out.println("Success!");
 
 
-//            page = (HtmlPage) client.getPage("http://localhost:8080/schoolmanager/view/class/current.seam?networkId=salsafactory");
         WebClientUtils.waitForJSJob(client, 0, 30000);
         Assert.assertEquals(client.getCurrentWindow().getEnclosedPage(), page);
         studentInput = (HtmlInput) page.getElementById("searchClass:student_i");
@@ -66,7 +65,6 @@ public class ScheduleTest {
         studentInput.type('l');
         studentInput.type('i');
         Assert.assertEquals(client.getCurrentWindow().getEnclosedPage(), page);
-//        WebClientUtils.forceWait(2000);
 //        Here the suggestionBox is still hidden
         WebClientUtils.waitForJSJob(client, 0, 30000);
 //        Here suggestionBox is visible
@@ -138,7 +136,7 @@ public class ScheduleTest {
 
     private HtmlPage login(WebClient client) throws IOException {
         HtmlPage page = (HtmlPage) client.getPage("http://localhost:8080/schoolmanager/view/class/current.seam?networkId=salsafactory");
-        ((HtmlInput) page.getElementById("loginForm:email")).setValueAttribute("s4237@pjwstk.edu.pl");
+        ((HtmlInput) page.getElementById("loginForm:email")).setValueAttribute("it.crowd.test@gmail.com");
         ((HtmlInput) page.getElementById("loginForm:password")).setValueAttribute("aaaaa");
         HtmlPage oldPage = page;
         page = page.getElementById("loginForm:submit").click();

@@ -3,10 +3,28 @@
 <html>
 <head>
     <title></title>
+    <script type="text/javascript" src="jquery-1.3.2.js"></script>
+    <script type="text/javascript">
+        jQuery(function() {
+            jQuery("#clickable").click(function() {
+                alert("Clicked " + this.id);
+            });
+            jQuery("#clickable2").click(function() {
+                alert("Clicked " + this.id);
+            });
+        });
+    </script>
 </head>
 <body>
 <img id="close" onclick="var e = document.getElementById('elementToHide');e.removeChild(e.firstChild)" alt="close"/>
 
 <div id="elementToHide">elementToHide</div>
+
+<div id="clickable">Click me</div>
+<div id="clickable2">
+    <a>
+        <span id="clickable2child">Clickable child</span>
+    </a>
+</div>
 </body>
 </html>
\ No newline at end of file