Index: /trunk/autoquest-htmlmonitor-test/data/guimappings/guimapping-html.txt =================================================================== --- /trunk/autoquest-htmlmonitor-test/data/guimappings/guimapping-html.txt (revision 1069) +++ /trunk/autoquest-htmlmonitor-test/data/guimappings/guimapping-html.txt (revision 1069) @@ -0,0 +1,134 @@ +a = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLLink +# abbr = +# address = +# applet = +area = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLLink +# article +# aside = +# audio = + +b = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +# bdi = +# bdo = +# blockquote +body = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +button = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton + +canvas = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCanvas +# caption = +cite = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +code = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +# col = +# colgroup = +command = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton + +# datalist = +dd = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +del = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +# details = +dfn = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +div = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +dl = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +document = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLDocument +dt = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText + +em = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +embed = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCanvas + +fieldset = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +figcaption = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +figure = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +footer = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +form = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel + +header = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +hgroup = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +h1 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +h2 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +h3 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +h4 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +h5 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +h6 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +# hr = +html = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel + +i = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +# iframe = +img = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLImage +input_button = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton +input_checkbox = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCheckBox +input_file = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton +input_image = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton +input_number = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLComboBox +input_password = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField +input_radio = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLRadioButton +input_reset = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton +input_submit = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton +input_text = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField +# input = +ins = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText + +kbd = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +keygen = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLComboBox + +label = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +legend = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +li = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel + +# map = +mark = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +# menu = +meter = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLImage + +nav = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +# noscript = + +object = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCanvas +ol = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +# optgroup = +# option = +output = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText + +p = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +# param = +pre = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +progress = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLImage + +q = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText + +# rp = +# rt = +# ruby = + +s = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +samp = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +section = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +select = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLComboBox +server = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLServer +small = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +# source = +span = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +strong = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +sub = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +summary = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +sup = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText + +table = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +tbody = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +td = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +textarea = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextArea +tfoot = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +th = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +thead = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +time = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +tr = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +# track = + +u = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +ul = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel + +var = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText +# video = + +# wbr = + Index: /trunk/autoquest-htmlmonitor-test/data/robots/robotfilter.txt =================================================================== --- /trunk/autoquest-htmlmonitor-test/data/robots/robotfilter.txt (revision 1069) +++ /trunk/autoquest-htmlmonitor-test/data/robots/robotfilter.txt (revision 1069) @@ -0,0 +1,66 @@ +findlinks +discobot +Googlebot +Slurp +YandexBot +Spider +ScholarUniverse +Baiduspider +Exabot +Robot +MetaGer-Bot +YandexImages +Gigabot +SiteBot +bingbot +Ezooms +Jeeves/Teoma +msnbot +DotBot +changedetection.com/bot.html +FAST Enterprise Crawler 6 +psbot +http://ws.daum.net/aboutWebSearch.html +NerdByNature.Bot +Sogou web spider +ssearch_bot +Purebot +http://www.icjobs.de +scoutjet +Netcraft Web Server Survey +TurnitinBot +ia_archiver +MJ12bot +Domnutch-Bot +Eurobot +GarlikCrawler +CMS Crawler +MSIECrawler +NaverBot +80legs +AhrefsBot +SISTRIX Crawler +NetcraftSurveyAgent +Search17Bot +Semager +YandexFavicons +heritrix +suggybot +Netluchs +Ocelli +PHPCrawl +SolomonoBot +Sosospider +Xerka WebBot +YahooCacheSystem +Xenu Link Sleuth +cmsworldmap +suchen.de +amaredo.com/de/suche.html +ibot +w3af.sourceforge.net +w3af.sf.net +yacybot +larbin2 +t-h-u-n-d-e-r-s-t-o-n-e +sqlmap Index: /trunk/autoquest-htmlmonitor-test/pom.xml =================================================================== --- /trunk/autoquest-htmlmonitor-test/pom.xml (revision 1068) +++ /trunk/autoquest-htmlmonitor-test/pom.xml (revision 1069) @@ -22,4 +22,10 @@ + de.ugoe.cs.autoquest + autoquest-plugin-html + ${tested-autoquest-version} + test + + org.apache.httpcomponents httpclient @@ -28,3 +34,63 @@ + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + get-htmlmonitor-config + process-classes + + unpack + + + + + de.ugoe.cs.autoquest + autoquest-htmlmonitor + ${tested-autoquest-version} + config + zip + ${basedir}/data + + + + + + get-html-plugin-config + process-classes + + unpack + + + + + de.ugoe.cs.autoquest + autoquest-plugin-html + ${tested-autoquest-version} + config + zip + ${basedir}/data + + + + + + + + maven-clean-plugin + 2.5 + + + + ${basedir}/data + + + + + + Index: /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServerTest.java =================================================================== --- /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServerTest.java (revision 1068) +++ /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServerTest.java (revision 1069) @@ -56,4 +56,9 @@ * */ + private HtmlGUIElement guiStructure; + + /** + * + */ private String eventHandlingError; @@ -97,18 +102,35 @@ @Test public void testSimpleMessage() throws Exception { + String clientId = "123"; + String message = "{" + " \"message\": {" + " \"clientInfos\": {" + - " \"clientId\":\"123\"," + + " \"clientId\":\"" + clientId + "\"," + " \"userAgent\":\"Agent\"," + " \"title\":\"Title\"," + " \"url\":\"http://host/path\"" + " }," + + " \"guiModel\": {" + + " \"tagName\":\"html\"," + + " \"index\":\"0\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"head\"," + + " \"index\":\"0\"," + + " }," + + " {" + + " \"tagName\":\"body\"," + + " \"htmlId\":\"gsr\"," + + " }" + + " ]" + + " }," + " \"events\":" + " [ {" + " \"time\":\"12345\"," + - " \"path\":\"/html[0]/body(id=gsr)\"," + - " \"eventType\":\"onunload\"" + + " \"path\":\"/html[0]/body(htmlId=gsr)\"," + + " \"eventType\":\"onclick\"" + + " \"coordinates\": [\"194\", \"7\"]" + " }" + " ]" + @@ -122,19 +144,34 @@ } + // check the GUI structure + HtmlGUIElement parent = null; + HtmlGUIElement element = guiStructure; + + assertGuiElement(element, HtmlServer.class, parent, 1); + + parent = element; + element = parent.getChildren().get(0); + assertGuiElement(element, HtmlDocument.class, parent, 1); + + HtmlDocument document = (HtmlDocument) element; + + parent = element; + element = parent.getChildren().get(0); + assertGuiElement(element, HtmlPageElement.class, parent, 2); + + parent = element; + element = parent.getChildren().get(0); + assertGuiElement(element, HtmlPageElement.class, parent, 0); + element = parent.getChildren().get(1); + assertGuiElement(element, HtmlPageElement.class, parent, 0); + + // check the event assertNotNull(events); assertEquals(1, events.length); - assertEquals(new Long(12345), events[0].getTime()); - assertEquals("/html[0]/body(id=gsr)", events[0].getPath()); - assertEquals("onunload", events[0].getEventType()); - - assertNull(events[0].getKey()); - assertNull(events[0].getScrollPosition()); - assertNull(events[0].getCoordinates()); - - assertEquals("Title", events[0].getClientInfos().getTitle()); - assertEquals("Agent", events[0].getClientInfos().getUserAgent()); - assertEquals("http://host/path", events[0].getClientInfos().getUrl().toString()); - assertEquals("123", events[0].getClientInfos().getClientId()); + assertEvent(0, 12345, "/html[0]/body(htmlId=gsr)", element, document, "onclick", + null, null, new Integer[] {194, 7}, + "Title", "Agent", "http://host/path", "123"); + } @@ -144,18 +181,75 @@ @Test public void testComplexMessage() throws Exception { + String clientId = "123"; + String message = "{" + " \"message\": {" + " \"clientInfos\": {" + - " \"clientId\":\"123\"," + + " \"clientId\":\"" + clientId + "\"," + " \"userAgent\":\"Agent\"," + " \"title\":\"Title\"," + " \"url\":\"http://host/path\"" + " }," + + " \"guiModel\": {" + + " \"tagName\":\"html\"," + + " \"index\":\"0\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"head\"," + + " \"index\":\"0\"," + + " }," + + " {" + + " \"tagName\":\"body\"," + + " \"htmlId\":\"gsr\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input1\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input2\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input3\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input4\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input5\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input6\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input7\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input8\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input9\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input10\"," + + " }," + + " ]" + + " }" + + " ]" + + " }," + " \"events\":" + - " [" + - " {" + + " [ {" + " \"time\":\"1\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input1)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input1)\"," + " \"eventType\":\"onclick\"," + " \"coordinates\": [\"194\", \"7\"]" + @@ -163,5 +257,5 @@ " {" + " \"time\":\"2\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input2)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input2)\"," + " \"eventType\":\"ondblclick\"," + " \"coordinates\": [\"194\", \"7\"]" + @@ -169,10 +263,10 @@ " {" + " \"time\":\"3\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input3)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input3)\"," + " \"eventType\":\"onfocus\"" + " }," + " {" + " \"time\":\"4\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input4)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input4)\"," + " \"eventType\":\"onclick\"," + " \"coordinates\": [\"125\", \"14\"]" + @@ -180,20 +274,20 @@ " {" + " \"time\":\"5\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input5)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input5)\"," + " \"eventType\":\"onfocus\"" + " }," + " {" + " \"time\":\"6\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input6)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input6)\"," + " \"eventType\":\"onfocus\"" + " }," + " {" + " \"time\":\"7\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input7)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input7)\"," + " \"eventType\":\"onfocus\"" + " }," + " {" + " \"time\":\"8\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input8)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input8)\"," + " \"eventType\":\"onclick\"," + " \"coordinates\": [\"255\", \"4\"]" + @@ -201,5 +295,5 @@ " {" + " \"time\":\"9\"," + - " \"path\":\"/html[0]/body(id=gsr)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)\"," + " \"eventType\":\"onscroll\"," + " \"scrollPosition\": [\"23\", \"567\"]" + @@ -207,5 +301,5 @@ " {" + " \"time\":\"10\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input10)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input10)\"," + " \"eventType\":\"onclick\"," + " \"coordinates\": [\"516\", \"154\"]" + @@ -214,5 +308,5 @@ " }" + "}"; - + sendMessageAndAssertResponse(message); @@ -221,55 +315,85 @@ } + // check the GUI structure + HtmlGUIElement parent = null; + HtmlGUIElement element = guiStructure; + + assertGuiElement(element, HtmlServer.class, parent, 1); + + parent = element; + element = parent.getChildren().get(0); + assertGuiElement(element, HtmlDocument.class, parent, 1); + + HtmlDocument document = (HtmlDocument) element; + + parent = element; + element = parent.getChildren().get(0); + assertGuiElement(element, HtmlPageElement.class, parent, 2); + + parent = element; + element = parent.getChildren().get(0); + assertGuiElement(element, HtmlPageElement.class, parent, 0); + element = parent.getChildren().get(1); + assertGuiElement(element, HtmlPageElement.class, parent, 10); + + parent = element; + for (HtmlGUIElement child : parent.getChildren()) { + assertGuiElement(child, HtmlPageElement.class, parent, 0); + } + + // check the events assertNotNull(events); assertEquals(10, events.length); for (int i = 0; i < events.length; i++) { - assertEquals("event " + i, new Long(i + 1), events[i].getTime()); + String targetDOMPath; + HtmlGUIElement target; + Integer[] scrollPosition = null; if (i == 8) { - assertEquals("event " + i, "/html[0]/body(id=gsr)", events[i].getPath()); + targetDOMPath = "/html[0]/body(htmlId=gsr)"; + target = parent; + scrollPosition = new Integer[] { 23, 567 }; } else { - assertEquals("event " + i, "/html[0]/body(id=gsr)/input(id=input" + (i + 1) + ")", - events[i].getPath()); - } - + targetDOMPath = + "/html[0]/body(htmlId=gsr)/input_button(htmlId=input" + (i + 1) + ")"; + target = parent.getChildren().get(i); + } + + String eventType; if ((i == 1)) { - assertEquals("event " + i, "ondblclick", events[i].getEventType()); + eventType = "ondblclick"; } else if ((i == 2) || ((4 <= i) && (i <= 6))) { - assertEquals("event " + i, "onfocus", events[i].getEventType()); + eventType = "onfocus"; } else if ((i == 8)) { - assertEquals("event " + i, "onscroll", events[i].getEventType()); + eventType = "onscroll"; } else { - assertEquals("event " + i, "onclick", events[i].getEventType()); + eventType = "onclick"; } assertNull("event " + i, events[i].getKey()); - if ((i == 8)) { - assertNotNull("event " + i, events[i].getScrollPosition()); - assertArrayEquals - ("event " + i, new Integer[] { 23, 567 }, events[i].getScrollPosition()); - } - else { - assertNull("event " + i, events[i].getScrollPosition()); - } - - if ((i == 2) || ((4 <= i) && (i <= 6)) || (i == 8)) { - assertNull("event " + i, events[i].getCoordinates()); - } - else { - assertNotNull("event " + i, events[i].getCoordinates()); - assertEquals("event " + i, 2, events[i].getCoordinates().length); - } - - assertEquals("event " + i, "Title", events[i].getClientInfos().getTitle()); - assertEquals("event " + i, "Agent", events[i].getClientInfos().getUserAgent()); - assertEquals("event " + i, "http://host/path", - events[i].getClientInfos().getUrl().toString()); - assertEquals("event " + i, "123", events[i].getClientInfos().getClientId()); + Integer[] coordinates = null; + if (i <= 1) { + coordinates = new Integer[] { 194, 7 }; + } + else if (i == 3) { + coordinates = new Integer[] { 125, 14 }; + } + else if (i == 7) { + coordinates = new Integer[] { 255, 4 }; + } + else if (i == 9) { + coordinates = new Integer[] { 516, 154 }; + } + + assertEvent(i, i + 1, targetDOMPath, target, document, eventType, + null, scrollPosition, coordinates, + "Title", "Agent", "http://host/path", "123"); + } } @@ -310,9 +434,23 @@ " \"url\":\"http://host/path\"" + " }," + + " \"guiModel\": {" + + " \"tagName\":\"html\"," + + " \"index\":\"0\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"head\"," + + " \"index\":\"0\"," + + " }," + + " {" + + " \"tagName\":\"body\"," + + " \"htmlId\":\"gsr\"," + + " }" + + " ]" + + " }," + " \"events\":" + " [ {" + - " \"time\":\"12345\"," + - " \"path\":\"/html[0]/body(id=gsr)\"," + - " \"eventType\":\"onscroll\"" + + " \"time\":\"9\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)\"," + + " \"eventType\":\"onscroll\"," + " }" + " ]" + @@ -337,8 +475,22 @@ " \"url\":\"http://host/path\"" + " }," + + " \"guiModel\": {" + + " \"tagName\":\"html\"," + + " \"index\":\"0\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"head\"," + + " \"index\":\"0\"," + + " }," + + " {" + + " \"tagName\":\"body\"," + + " \"htmlId\":\"gsr\"," + + " }" + + " ]" + + " }," + " \"events\":" + " [ {" + " \"time\":\"12345\"," + - " \"path\":\"/html[0]/body(id=gsr)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)\"," + " \"eventType\":\"onunload\"" + " }" + @@ -365,8 +517,22 @@ " \"url\":\"http://host/path\"" + " }," + + " \"guiModel\": {" + + " \"tagName\":\"html\"," + + " \"index\":\"0\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"head\"," + + " \"index\":\"0\"," + + " }," + + " {" + + " \"tagName\":\"body\"," + + " \"htmlId\":\"gsr\"," + + " }" + + " ]" + + " }," + " \"events\":" + " [ {" + " \"time\":\"blub\"," + - " \"path\":\"/html[0]/body(id=gsr)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)\"," + " \"eventType\":\"onunload\"" + " }" + @@ -389,7 +555,13 @@ */ @Override - public void handleMessage(HtmlClientInfos clientInfos, HtmlEvent[] events) { + public void handleMessage(HtmlClientInfos clientInfos, + HtmlGUIElement guiStructure, + HtmlEvent[] events) + { if (clientInfos == null) { eventHandlingError = "client infos were null"; + } + else if (guiStructure == null) { + eventHandlingError = "gui structure was null"; } else if (events == null) { @@ -404,4 +576,5 @@ this.events = events; + this.guiStructure = guiStructure; } } @@ -435,3 +608,68 @@ } + /** + * + */ + private void assertGuiElement(HtmlGUIElement element, + Class type, + HtmlGUIElement parent, + int noOfChildren) + { + assertTrue(type.isInstance(element)); + + if (parent != null) { + assertEquals(parent.getId(), element.getParentId()); + } + else { + assertNull(element.getParentId()); + } + + assertNotNull(element.getId()); + + if (noOfChildren > 0) { + assertNotNull(element.getChildren()); + assertEquals(noOfChildren, element.getChildren().size()); + } + else { + assertNull(element.getChildren()); + } + } + + /** + * + */ + private void assertEvent(int index, + long timestamp, + String targetDOMPath, + HtmlGUIElement target, + HtmlDocument document, + String eventType, + Integer key, + Integer[] scrollPosition, + Integer[] coordinates, + String clientInfoTitle, + String clientInfoAgent, + String clientInfoURL, + String clientId) + { + assertEquals("event " + index, new Long(timestamp), events[index].getTime()); + assertEquals("event " + index, targetDOMPath, events[index].getTargetDOMPath()); + assertEquals("event " + index, target, events[index].getTarget()); + assertEquals("event " + index, document, events[index].getTargetDocument()); + assertEquals("event " + index, eventType, events[index].getEventType()); + + assertEquals("event " + index, key, events[index].getKey()); + assertArrayEquals("event " + index, scrollPosition, events[index].getScrollPosition()); + assertArrayEquals("event " + index, coordinates, events[index].getCoordinates()); + + assertEquals + ("event " + index, clientInfoTitle, events[index].getClientInfos().getTitle()); + assertEquals + ("event " + index, clientInfoAgent, events[index].getClientInfos().getUserAgent()); + assertEquals + ("event " + index, clientInfoURL, events[index].getClientInfos().getUrl().toString()); + assertEquals + ("event " + index, clientId, events[index].getClientInfos().getClientId()); + } + } Index: /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorTest.java =================================================================== --- /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorTest.java (revision 1068) +++ /trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorTest.java (revision 1069) @@ -17,9 +17,7 @@ import static org.junit.Assert.*; -import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; import java.util.List; @@ -34,4 +32,17 @@ import org.junit.Test; +import de.ugoe.cs.autoquest.eventcore.Event; +import de.ugoe.cs.autoquest.eventcore.IEventType; +import de.ugoe.cs.autoquest.eventcore.gui.KeyboardFocusChange; +import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonInteraction; +import de.ugoe.cs.autoquest.eventcore.gui.MouseClick; +import de.ugoe.cs.autoquest.eventcore.gui.MouseDoubleClick; +import de.ugoe.cs.autoquest.eventcore.gui.Scroll; +import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; +import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; +import de.ugoe.cs.autoquest.plugin.html.HTMLLogParser; +import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLDocument; +import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageElement; +import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLServer; import de.ugoe.cs.util.console.TextConsole; @@ -108,9 +119,24 @@ " \"url\":\"http://host/path\"" + " }," + + " \"guiModel\": {" + + " \"tagName\":\"html\"," + + " \"index\":\"0\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"head\"," + + " \"index\":\"0\"," + + " }," + + " {" + + " \"tagName\":\"body\"," + + " \"htmlId\":\"gsr\"," + + " }" + + " ]" + + " }," + " \"events\":" + " [ {" + " \"time\":\"12345\"," + - " \"path\":\"/html[0]/body(id=gsr)\"," + - " \"eventType\":\"onunload\"" + + " \"path\":\"/html[0]/body(htmlId=gsr)\"," + + " \"eventType\":\"onclick\"" + + " \"coordinates\": [\"194\", \"7\"]" + " }" + " ]" + @@ -120,14 +146,83 @@ sendMessageAndAssertResponse(message); + htmlMonitor.stop(); + htmlMonitor = null; + File logFile = new File(LOG_FILE_DIR + File.separator + clientId + File.separator + - "htmlmonitor_" + clientId + ".log"); + "htmlmonitor_" + clientId + "_000.log"); assertTrue(logFile.exists()); - String[] logEntries = readLogEntries(logFile); - assertEquals(1, logEntries.length); - - assertLogMessage(logEntries[0], clientId, "12345", "Title", "http://host/path", "Agent", - "onunload", "/html[0]/body(id=gsr)"); + HTMLLogParser parser = new HTMLLogParser(); + + parser.parseFile(logFile); + + // check the GUI model + GUIModel guiModel = parser.getGuiModel(); + assertNotNull(guiModel); + + List nodes = guiModel.getRootElements(); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get server node + IGUIElement node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLServer); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get document node + node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLDocument); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get html node + node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLPageElement); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); // only one child as the head tag should have been ignored + + // get body node + node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLPageElement); + assertEquals("HTML", node.getPlatform()); + assertTrue(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(0, nodes.size()); + + // check the sequences + Collection> sequences = parser.getSequences(); + + assertNotNull(sequences); + + Iterator> iterator = sequences.iterator(); + assertTrue(iterator.hasNext()); + + List sequence = iterator.next(); + assertFalse(iterator.hasNext()); + + assertNotNull(sequence); + assertEquals(1, sequence.size()); + + assertEvent(sequence.get(0), 12345, MouseClick.class, node, 194, 7); } @@ -148,9 +243,64 @@ " \"url\":\"http://host/path\"" + " }," + + " \"guiModel\": {" + + " \"tagName\":\"html\"," + + " \"index\":\"0\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"head\"," + + " \"index\":\"0\"," + + " }," + + " {" + + " \"tagName\":\"body\"," + + " \"htmlId\":\"gsr\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input1\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input2\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input3\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input4\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input5\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input6\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input7\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input8\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input9\"," + + " }," + + " {" + + " \"tagName\":\"input_button\"," + + " \"htmlId\":\"input10\"," + + " }," + + " ]" + + " }" + + " ]" + + " }," + " \"events\":" + - " [" + - " {" + + " [ {" + " \"time\":\"1\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input1)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input1)\"," + " \"eventType\":\"onclick\"," + " \"coordinates\": [\"194\", \"7\"]" + @@ -158,5 +308,5 @@ " {" + " \"time\":\"2\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input2)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input2)\"," + " \"eventType\":\"ondblclick\"," + " \"coordinates\": [\"194\", \"7\"]" + @@ -164,10 +314,10 @@ " {" + " \"time\":\"3\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input3)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input3)\"," + " \"eventType\":\"onfocus\"" + " }," + " {" + " \"time\":\"4\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input4)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input4)\"," + " \"eventType\":\"onclick\"," + " \"coordinates\": [\"125\", \"14\"]" + @@ -175,20 +325,20 @@ " {" + " \"time\":\"5\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input5)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input5)\"," + " \"eventType\":\"onfocus\"" + " }," + " {" + " \"time\":\"6\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input6)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input6)\"," + " \"eventType\":\"onfocus\"" + " }," + " {" + " \"time\":\"7\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input7)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input7)\"," + " \"eventType\":\"onfocus\"" + " }," + " {" + " \"time\":\"8\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input8)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input8)\"," + " \"eventType\":\"onclick\"," + " \"coordinates\": [\"255\", \"4\"]" + @@ -196,5 +346,5 @@ " {" + " \"time\":\"9\"," + - " \"path\":\"/html[0]/body(id=gsr)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)\"," + " \"eventType\":\"onscroll\"," + " \"scrollPosition\": [\"23\", \"567\"]" + @@ -202,5 +352,5 @@ " {" + " \"time\":\"10\"," + - " \"path\":\"/html[0]/body(id=gsr)/input(id=input10)\"," + + " \"path\":\"/html[0]/body(htmlId=gsr)/input_button(htmlId=input10)\"," + " \"eventType\":\"onclick\"," + " \"coordinates\": [\"516\", \"154\"]" + @@ -212,32 +362,111 @@ sendMessageAndAssertResponse(message); + htmlMonitor.stop(); + htmlMonitor = null; + File logFile = new File(LOG_FILE_DIR + File.separator + clientId + File.separator + - "htmlmonitor_" + clientId + ".log"); + "htmlmonitor_" + clientId + "_000.log"); assertTrue(logFile.exists()); - String[] logEntries = readLogEntries(logFile); - assertEquals(10, logEntries.length); - - assertLogMessage(logEntries[0], clientId, "1", "Title", "http://host/path", "Agent", - "onclick", "/html[0]/body(id=gsr)/input(id=input1)", "194,7"); - assertLogMessage(logEntries[1], clientId, "2", "Title", "http://host/path", "Agent", - "ondblclick", "/html[0]/body(id=gsr)/input(id=input2)", "194,7"); - assertLogMessage(logEntries[2], clientId, "3", "Title", "http://host/path", "Agent", - "onfocus", "/html[0]/body(id=gsr)/input(id=input3)"); - assertLogMessage(logEntries[3], clientId, "4", "Title", "http://host/path", "Agent", - "onclick", "/html[0]/body(id=gsr)/input(id=input4)", "125,14"); - assertLogMessage(logEntries[4], clientId, "5", "Title", "http://host/path", "Agent", - "onfocus", "/html[0]/body(id=gsr)/input(id=input5)"); - assertLogMessage(logEntries[5], clientId, "6", "Title", "http://host/path", "Agent", - "onfocus", "/html[0]/body(id=gsr)/input(id=input6)"); - assertLogMessage(logEntries[6], clientId, "7", "Title", "http://host/path", "Agent", - "onfocus", "/html[0]/body(id=gsr)/input(id=input7)"); - assertLogMessage(logEntries[7], clientId, "8", "Title", "http://host/path", "Agent", - "onclick", "/html[0]/body(id=gsr)/input(id=input8)", "255,4"); - assertLogMessage(logEntries[8], clientId, "9", "Title", "http://host/path", "Agent", - "onscroll", "/html[0]/body(id=gsr)", "23,567"); - assertLogMessage(logEntries[9], clientId, "10", "Title", "http://host/path", "Agent", - "onclick", "/html[0]/body(id=gsr)/input(id=input10)", "516,154"); + HTMLLogParser parser = new HTMLLogParser(); + + parser.parseFile(logFile); + + // check the GUI model + GUIModel guiModel = parser.getGuiModel(); + assertNotNull(guiModel); + + List nodes = guiModel.getRootElements(); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get server node + IGUIElement node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLServer); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get document node + node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLDocument); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get html node + node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLPageElement); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); // only one child as the head tag should have been ignored + + // get body node + IGUIElement body = nodes.get(0); + assertNotNull(body); + assertTrue(body instanceof HTMLPageElement); + assertEquals("HTML", body.getPlatform()); + assertTrue(body.isUsed()); + + nodes = guiModel.getChildren(body); + assertNotNull(nodes); + assertEquals(10, nodes.size()); + + // get input nodes + for (int i = 0; i < nodes.size(); i++) { + node = nodes.get(i); + assertNotNull(node); + assertTrue(node instanceof HTMLPageElement); + assertEquals("HTML", node.getPlatform()); + + if (i != 8) { + assertTrue(node.isUsed()); + } + else { + assertFalse(node.isUsed()); + } + + assertNotNull(guiModel.getChildren(node)); + assertEquals(0, guiModel.getChildren(node).size()); + } + + // check the sequences + Collection> sequences = parser.getSequences(); + + assertNotNull(sequences); + + Iterator> iterator = sequences.iterator(); + assertTrue(iterator.hasNext()); + + List sequence = iterator.next(); + assertFalse(iterator.hasNext()); + + assertNotNull(sequence); + assertEquals(10, sequence.size()); + + assertEvent(sequence.get(0), 1, MouseClick.class, nodes.get(0), 194, 7); + assertEvent(sequence.get(1), 2, MouseDoubleClick.class, nodes.get(1), 194, 7); + assertEvent(sequence.get(2), 3, KeyboardFocusChange.class, nodes.get(2), 0, 0); + assertEvent(sequence.get(3), 4, MouseClick.class, nodes.get(3), 125, 14); + assertEvent(sequence.get(4), 5, KeyboardFocusChange.class, nodes.get(4), 0, 0); + assertEvent(sequence.get(5), 6, KeyboardFocusChange.class, nodes.get(5), 0, 0); + assertEvent(sequence.get(6), 7, KeyboardFocusChange.class, nodes.get(6), 0, 0); + assertEvent(sequence.get(7), 8, MouseClick.class, nodes.get(7), 255, 4); + assertEvent(sequence.get(8), 9, Scroll.class, body, 0, 0); + assertEvent(sequence.get(9), 10, MouseClick.class, nodes.get(9), 516, 154); + } @@ -258,9 +487,24 @@ " \"url\":\"http://host/path\"" + " }," + + " \"guiModel\": {" + + " \"tagName\":\"html\"," + + " \"index\":\"0\"," + + " \"children\":" + + " [ {" + + " \"tagName\":\"head\"," + + " \"index\":\"0\"," + + " }," + + " {" + + " \"tagName\":\"body\"," + + " \"htmlId\":\"gsr\"," + + " }" + + " ]" + + " }," + " \"events\":" + " [ {" + " \"time\":\"12345\"," + - " \"path\":\"/html[0]/body(id=gsr)\"," + - " \"eventType\":\"onunload\"" + + " \"path\":\"/html[0]/body(htmlId=gsr)\"," + + " \"eventType\":\"onclick\"" + + " \"coordinates\": [\"194\", \"7\"]" + " }" + " ]" + @@ -279,6 +523,11 @@ } + htmlMonitor.stop(); + htmlMonitor = null; + + HTMLLogParser parser = new HTMLLogParser(); + // assert 9 already rotated log files - for (int i = 0; i < (numberOfSessions - 1); i++) { + for (int i = 0; i < numberOfSessions; i++) { File logFile = new File(LOG_FILE_DIR + File.separator + clientId + File.separator + "htmlmonitor_" + clientId + "_00" + i + ".log"); @@ -286,22 +535,75 @@ assertTrue(logFile.exists()); - String[] logEntries = readLogEntries(logFile); - assertEquals(1, logEntries.length); + parser.parseFile(logFile); + } + + // check the GUI model + GUIModel guiModel = parser.getGuiModel(); + assertNotNull(guiModel); + + List nodes = guiModel.getRootElements(); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get server node + IGUIElement node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLServer); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get document node + node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLDocument); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); + + // get html node + node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLPageElement); + assertEquals("HTML", node.getPlatform()); + assertFalse(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(1, nodes.size()); // only one child as the head tag should have been ignored + + // get body node + node = nodes.get(0); + assertNotNull(node); + assertTrue(node instanceof HTMLPageElement); + assertEquals("HTML", node.getPlatform()); + assertTrue(node.isUsed()); + + nodes = guiModel.getChildren(node); + assertNotNull(nodes); + assertEquals(0, nodes.size()); + + // check the sequences + Collection> sequences = parser.getSequences(); + + assertNotNull(sequences); + assertEquals(numberOfSessions, sequences.size()); + + Iterator> iterator = sequences.iterator(); + + while (iterator.hasNext()) { + List sequence = iterator.next(); + + assertNotNull(sequence); + assertEquals(1, sequence.size()); - assertLogMessage(logEntries[0], clientId, "12345", "Title", "http://host/path", "Agent", - "onunload", "/html[0]/body(id=gsr)"); - } - - // and now the last but current one - File logFile = new File(LOG_FILE_DIR + File.separator + clientId + File.separator + - "htmlmonitor_" + clientId + ".log"); - - assertTrue(logFile.exists()); - - String[] logEntries = readLogEntries(logFile); - assertEquals(1, logEntries.length); - - assertLogMessage(logEntries[0], clientId, "12345", "Title", "http://host/path", "Agent", - "onunload", "/html[0]/body(id=gsr)"); + assertEvent(sequence.get(0), 12345, MouseClick.class, node, 194, 7); + } } @@ -335,52 +637,21 @@ /** - *

- * TODO: comment - *

- * - * @param logFile - * @return - */ - private String[] readLogEntries(File logFile) throws Exception { - List logEntries = new ArrayList(); - BufferedReader reader = null; - - try { - reader = new BufferedReader - (new InputStreamReader(new FileInputStream(logFile))); - - String line = null; - while ((line = reader.readLine()) != null) { - logEntries.add(line); - } - } - finally { - if (reader != null) { - reader.close(); - } - } - - return logEntries.toArray(new String[logEntries.size()]); - } - - /** - * - */ - private void assertLogMessage(String logMessage, - String... assertedMessageContent) + * + */ + private void assertEvent(Event event, + int timestamp, + Class eventType, + IGUIElement eventTarget, + int xCoordinate, + int yCoordinate) { - StringBuffer assertedMessage = new StringBuffer(); - - for (int i = 0; i < assertedMessageContent.length; i++) { - if (i > 0) { - assertedMessage.append(' '); - } - - assertedMessage.append('"'); - assertedMessage.append(assertedMessageContent[i]); - assertedMessage.append('"'); - } - - assertEquals(assertedMessage.toString(), logMessage); + assertEquals(timestamp, event.getTimestamp()); + assertTrue(eventType.isInstance(event.getType())); + assertEquals(eventTarget, event.getTarget()); + + if (event.getType() instanceof MouseButtonInteraction) { + assertEquals(xCoordinate, ((MouseButtonInteraction) event.getType()).getX()); + assertEquals(yCoordinate, ((MouseButtonInteraction) event.getType()).getY()); + } } Index: /trunk/autoquest-htmlmonitor-test/src/test/resources/test.html =================================================================== --- /trunk/autoquest-htmlmonitor-test/src/test/resources/test.html (revision 1068) +++ /trunk/autoquest-htmlmonitor-test/src/test/resources/test.html (revision 1069) @@ -5,4 +5,6 @@ + + - + @@ -30,5 +32,5 @@ input type text - + @@ -38,5 +40,5 @@ - + Index: /trunk/autoquest-htmlmonitor/.settings/org.eclipse.core.resources.prefs =================================================================== --- /trunk/autoquest-htmlmonitor/.settings/org.eclipse.core.resources.prefs (revision 1068) +++ /trunk/autoquest-htmlmonitor/.settings/org.eclipse.core.resources.prefs (revision 1069) @@ -1,2 +1,4 @@ eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/js=UTF-8 encoding/=UTF-8 Index: /trunk/autoquest-htmlmonitor/pom.xml =================================================================== --- /trunk/autoquest-htmlmonitor/pom.xml (revision 1068) +++ /trunk/autoquest-htmlmonitor/pom.xml (revision 1069) @@ -56,4 +56,9 @@ json-simple 1.1.1 + + + commons-codec + commons-codec + 1.7 @@ -118,4 +123,5 @@ src/main/assembly/bin.xml + src/main/assembly/config.xml Index: /trunk/autoquest-htmlmonitor/src/main/assembly/config.xml =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/assembly/config.xml (revision 1069) +++ /trunk/autoquest-htmlmonitor/src/main/assembly/config.xml (revision 1069) @@ -0,0 +1,19 @@ + + config + + zip + + false + + + data + + + **/* + + + + Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlDocument.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlDocument.java (revision 1069) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlDocument.java (revision 1069) @@ -0,0 +1,144 @@ +// Copyright 2012 Georg-August-Universität Göttingen, Germany +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package de.ugoe.cs.autoquest.htmlmonitor; + +/** + *

+ * represents a document on a web server including its path and query in the URL. + *

+ * + * @author Patrick Harms + */ +class HtmlDocument extends HtmlGUIElement { + + /** + * the server on which the document resists + */ + private HtmlServer server; + + /** + * the path to the document on the server + */ + private String path; + + /** + * the query on the path that created the document (including the leading questionmark) + */ + private String query; + + /** + * the title of the document, null if none is present + */ + private String title; + + /** + *

+ * instantiates a new document element + *

+ * + * @param id the id of the document + * @param server the server on which the document resists + * @param path the path to the document on the server + * @param query the query on the path that created the document (may include the questionmark) + * @param title the title of the document, null if none is present + */ + HtmlDocument(String id, HtmlServer server, String path, String query, String title) { + super(id, server); + + if (server == null) { + throw new IllegalArgumentException("server must not be null"); + } + + if (path == null) { + throw new IllegalArgumentException("path must not be null"); + } + + this.server = server; + this.path = path; + this.query = query; + this.title = title; + + if ((this.query != null) && (!this.query.startsWith("?"))) { + this.query = "?" + this.query; + } + } + + /** + * @return the server on which the document resists + */ + HtmlServer getServer() { + return server; + } + + /** + * @return the path to the document on the server + */ + String getPath() { + return path; + } + + /** + * @return the query on the path that created the document (including the leading questionmark) + */ + String getQuery() { + return query; + } + + /** + * @return the title of the document, null if none is present + */ + String getTitle() { + return title; + } + + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement#equals(de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement) + */ + @Override + public boolean equals(HtmlGUIElement obj) { + if (this == obj) { + return true; + } + else if (obj instanceof HtmlDocument) { + return equals((HtmlDocument) obj); + } + else { + return false; + } + } + + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement#equals(de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement) + */ + public boolean equals(HtmlDocument other) { + if (this == other) { + return true; + } + + return (server.equals(other.server) && path.equals(other.path) && + (query != null ? query.equals(other.query) : other.query == null) && + (title != null ? title.equals(other.title) : other.title == null)); + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + return server.hashCode() + path.hashCode() + (query != null ? query.hashCode() : 0) + + (title != null ? title.hashCode() : 0); + } + +} Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlEvent.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlEvent.java (revision 1068) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlEvent.java (revision 1069) @@ -38,7 +38,17 @@ /** - * the path in the HTML DOM to the object on which the event was executed - */ - private String path; + * the HTML element on which the event was executed + */ + private HtmlPageElement target; + + /** + * the document to which the HTML element on which the event was executed belongs + */ + private HtmlDocument targetDocument; + + /** + * the targets DOM path through the document to which it belongs + */ + private String targetDOMPath; /** @@ -69,10 +79,10 @@ /** *

- * initializes the event with all relevantinfos + * initializes the event with all relevant infos *

* * @param clientInfos infos about the client that caused the event * @param time the time stamp of the event - * @param path the path in the HTML DOM to the object on which the event was executed + * @param target the HTML element on which the event was executed * @param eventType the type of the event, e.g. onclick * @param coordinates the coordinates of the event, usually an array with two values @@ -86,5 +96,5 @@ HtmlEvent(HtmlClientInfos clientInfos, Long time, - String path, + HtmlPageElement target, String eventType, Integer[] coordinates, @@ -95,5 +105,7 @@ this.clientInfos = clientInfos; this.time = time; - this.path = path; + this.target = target; + this.targetDocument = target.getDocument(); + this.targetDOMPath = target.getDOMPath(); this.eventType = eventType; this.coordinates = coordinates; @@ -104,4 +116,46 @@ /** + *

+ * initializes the event for which the id of the target is not known yet. In this case + * the document and DOM path for the target are provided + *

+ * + * @param clientInfos infos about the client that caused the event + * @param time the time stamp of the event + * @param targetDocument the document to which the HTML element belongs on which the event was + * executed + * @param targetDOMPath the path through the DOM of the document of the HTML element on which + * the event was executed + * @param eventType the type of the event, e.g. onclick + * @param coordinates the coordinates of the event, usually an array with two values + * (x and y) + * @param key if the event is a key event, the key that was pressed or released + * @param scrollPosition if the event is a scroll event, the resulting position of the + * scrolled element + * @param selectedValue if the event is an on change event, the value to which the changed + * element is changed + */ + HtmlEvent(HtmlClientInfos clientInfos, + Long time, + HtmlDocument targetDocument, + String targetDOMPath, + String eventType, + Integer[] coordinates, + Integer key, + Integer[] scrollPosition, + String selectedValue) + { + this.clientInfos = clientInfos; + this.time = time; + this.targetDocument = targetDocument; + this.targetDOMPath = targetDOMPath; + this.eventType = eventType; + this.coordinates = coordinates; + this.key = key; + this.scrollPosition = scrollPosition; + this.selectedValue = selectedValue; + } + + /** * @return the clientInfos */ @@ -118,8 +172,22 @@ /** - * @return the path - */ - String getPath() { - return path; + * @return the target + */ + HtmlPageElement getTarget() { + return target; + } + + /** + * @return the targetDocument + */ + HtmlDocument getTargetDocument() { + return targetDocument; + } + + /** + * @return the targetDOMPath + */ + String getTargetDOMPath() { + return targetDOMPath; } Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlGUIElement.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlGUIElement.java (revision 1069) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlGUIElement.java (revision 1069) @@ -0,0 +1,134 @@ +// Copyright 2012 Georg-August-Universität Göttingen, Germany +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package de.ugoe.cs.autoquest.htmlmonitor; + +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * represents an element of an HTML GUI. This can be a server, which is usually the root of a + * GUI structure, a web page, or a tag within a web page. + *

+ * + * @author Patrick Harms + */ +abstract class HtmlGUIElement { + + /** + * the children of this element + */ + private List children; + + /** + * the id of this GUI element + */ + private String id; + + /** + * the parent GUI element, null if none is present + */ + private HtmlGUIElement parent; + + /** + *

+ * instantiates a new GUI element + *

+ * + * @param parentId the parent GUI element, null if none is present + */ + protected HtmlGUIElement(String id, HtmlGUIElement parent) { + if (id == null) { + throw new IllegalArgumentException("id must not be null"); + } + + this.id = id; + this.parent = parent; + } + + /** + *

+ * returns the children of this element if any, null else + *

+ * + * @return the children + */ + List getChildren() { + return children; + } + + + /** + * adds a child to this element. Merges children, for which the equal method returns true + * + * @param child the child to be added + */ + void addChild(HtmlGUIElement newChild) { + if (newChild != null) { + if (children == null) { + children = new ArrayList(); + } + + boolean added = false; + for (HtmlGUIElement child : children) { + if (child.equals(newChild)) { + if (newChild.getChildren() != null) { + for (HtmlGUIElement subchild : newChild.getChildren()) { + child.addChild(subchild); + } + } + + added = true; + break; + } + } + + if (!added) { + children.add(newChild); + } + } + } + + /** + * returns the id of the GUI element. + * + * @return the id of the GUI element + */ + String getId() { + return id; + } + + /** + *

+ * returns the id of the parent GUI element, if any + *

+ * + * @return the id of the parent GUI element, or null, if this element does not have a parent + */ + String getParentId() { + if (parent == null) { + return null; + } + else { + return parent.getId(); + } + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + public abstract boolean equals(HtmlGUIElement obj); + +} Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlGUIElementManager.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlGUIElementManager.java (revision 1069) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlGUIElementManager.java (revision 1069) @@ -0,0 +1,203 @@ +// Copyright 2012 Georg-August-Universität Göttingen, Germany +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package de.ugoe.cs.autoquest.htmlmonitor; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.apache.commons.codec.binary.Base64; + +/** + *

+ * TODO comment + *

+ * + * @author Patrick Harms + */ +class HtmlGUIElementManager { + + /** */ + private Map idMap = new HashMap(); + + /** */ + private Map> domPathMap = + new HashMap>(); + + /** + *

+ * TODO: comment + *

+ * + */ + HtmlServer createHtmlServer(String name, int port) { + if (name == null) { + throw new IllegalArgumentException("name must not be null"); + } + + String id = calculateId(name, Integer.toString(port)); + + HtmlGUIElement server = idMap.get(id); + + if (server == null) { + server = new HtmlServer(id, name, port); + idMap.put(id, server); + } + else if (!(server instanceof HtmlServer)) { + throw new RuntimeException + ("id conflict: calculated the same id for two different GUI elements"); + } + + return (HtmlServer) server; + } + + /** + *

+ * TODO: comment + *

+ * + */ + HtmlDocument createHtmlDocument(HtmlServer server, String path, String query, String title) { + if (server == null) { + throw new IllegalArgumentException("server must not be null"); + } + if (path == null) { + throw new IllegalArgumentException("path must not be null"); + } + + String id = calculateId(server.getId(), path, query, title); + + HtmlGUIElement document = idMap.get(id); + + if (document == null) { + document = new HtmlDocument(id, server, path, query, title); + idMap.put(id, document); + } + else if (!(document instanceof HtmlDocument)) { + throw new RuntimeException + ("id conflict: calculated the same id for two different GUI elements"); + } + + return (HtmlDocument) document; + } + + /** + *

+ * TODO: comment + *

+ * + * @param document + * @param parent + * @param tagName + * @param htmlid + * @param index + * @return + */ + HtmlPageElement createHtmlPageElement(HtmlDocument document, + HtmlPageElement parent, + String tagName, + String htmlId, + Integer index) + { + if (document == null) { + throw new IllegalArgumentException("document must not be null"); + } + if (tagName == null) { + throw new IllegalArgumentException("document must not be null"); + } + + String id = calculateId + (document.getId(), parent != null ? parent.getDOMPath() : null, tagName, htmlId, + index != null ? index.toString() : "-1"); + + HtmlGUIElement pageElement = idMap.get(id); + + if (pageElement == null) { + pageElement = new HtmlPageElement(id, document, parent, tagName, htmlId, index); + idMap.put(id, pageElement); + } + else if (!(pageElement instanceof HtmlPageElement)) { + throw new RuntimeException + ("id conflict: calculated the same id for two different GUI elements"); + } + + List candidates = + domPathMap.get(((HtmlPageElement) pageElement).getDOMPath()); + + if (candidates == null) { + candidates = new LinkedList(); + domPathMap.put(((HtmlPageElement) pageElement).getDOMPath(), candidates); + } + + if (!candidates.contains(pageElement)) { + candidates.add((HtmlPageElement) pageElement); + } + + return (HtmlPageElement) pageElement; + } + + /** + *

+ * TODO: comment + *

+ * + * @param document + * @param domPath + * @return + */ + HtmlPageElement getPageElement(HtmlDocument document, String domPath) { + List candidates = domPathMap.get(domPath); + + if (candidates != null) { + for (HtmlPageElement candidate : candidates) { + if (document.equals(candidate.getDocument())) { + return candidate; + } + } + } + + return null; + } + + /** + *

+ * TODO: comment + *

+ * + * @param name + * @param string + * @return + */ + private String calculateId(String... fragments) { + try { + MessageDigest md = MessageDigest.getInstance("SHA-512"); + + for (String fragment : fragments) { + if (fragment != null) { + md.update(fragment.getBytes()); + } + } + + return Base64.encodeBase64String(md.digest()); + } + catch (NoSuchAlgorithmException e) { + throw new IllegalStateException("Java VM does not support this code"); + } + } + +} Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorLogManager.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorLogManager.java (revision 1068) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorLogManager.java (revision 1069) @@ -116,5 +116,5 @@ @Override public void handleMessage(HtmlClientInfos clientInfos, - HtmlPageElement guiStructure, + HtmlGUIElement guiStructure, HtmlEvent[] events) { @@ -140,4 +140,5 @@ Console.printerrln("could not handle message of client " + clientInfos.getClientId() + ": " + e); + e.printStackTrace(); Console.logException(e); Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorMessageListener.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorMessageListener.java (revision 1068) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorMessageListener.java (revision 1069) @@ -36,5 +36,5 @@ */ void handleMessage(HtmlClientInfos clientInfos, - HtmlPageElement guiStructure, + HtmlGUIElement guiStructure, HtmlEvent[] events); Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorOutputWriter.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorOutputWriter.java (revision 1068) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorOutputWriter.java (revision 1069) @@ -179,5 +179,5 @@ @Override public void handleMessage(HtmlClientInfos clientInfos, - HtmlPageElement guiStructure, + HtmlGUIElement guiStructure, HtmlEvent[] events) { @@ -214,19 +214,30 @@ * @param guiStructure the GUI structure to be logged */ - private void dumpGuiStructure(HtmlPageElement guiStructure) { - outputWriter.print(""); - dumpParam("class", guiStructure.getTagName()); - dumpParam("htmlId", guiStructure.getId()); - dumpParam("title", guiStructure.getTitle()); - dumpParam("index", guiStructure.getIndex()); - dumpParam("parent", guiStructure.getParentPath()); + if (guiStructure instanceof HtmlServer) { + dumpParam("host", ((HtmlServer) guiStructure).getName()); + dumpParam("port", ((HtmlServer) guiStructure).getPort()); + } + else if (guiStructure instanceof HtmlDocument) { + dumpParam("path", ((HtmlDocument) guiStructure).getPath()); + dumpParam("query", ((HtmlDocument) guiStructure).getQuery()); + dumpParam("title", ((HtmlDocument) guiStructure).getTitle()); + } + else if (guiStructure instanceof HtmlPageElement) { + dumpParam("tagname", ((HtmlPageElement) guiStructure).getTagName()); + dumpParam("htmlid", ((HtmlPageElement) guiStructure).getHtmlId()); + dumpParam("index", ((HtmlPageElement) guiStructure).getIndex()); + } + + dumpParam("parent", guiStructure.getParentId()); outputWriter.println(""); if (guiStructure.getChildren() != null) { - for (HtmlPageElement child : guiStructure.getChildren()) { + for (HtmlGUIElement child : guiStructure.getChildren()) { dumpGuiStructure(child); } @@ -260,5 +271,12 @@ dumpParam("selectedValue", event.getSelectedValue()); - dumpParam("target", event.getPath()); + + if (event.getTarget() != null) { + dumpParam("target", event.getTarget().getId()); + } + else { + dumpParam("targetDocument", event.getTargetDocument().getId()); + dumpParam("targetDOMPath", event.getTargetDOMPath()); + } dumpParam("timestamp", event.getTime()); Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java (revision 1068) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java (revision 1069) @@ -78,4 +78,9 @@ * the message listener to forward received messages to. */ + private HtmlGUIElementManager guiElementManager = new HtmlGUIElementManager(); + + /** + * the message listener to forward received messages to. + */ private transient HtmlMonitorMessageListener messageListener; @@ -199,5 +204,5 @@ } else { - HtmlPageElement guiStructure = extractHtmlPageElements(message, clientInfos); + HtmlGUIElement guiStructure = extractHtmlPageElements(message, clientInfos); HtmlEvent[] events = extractHtmlEvents(message, clientInfos); @@ -275,6 +280,6 @@ events = new ArrayList(); - HtmlPageElement server = getServerElement(clientInfos); - HtmlPageElement page = getPageElementRepresentingWebPage(clientInfos, server); + HtmlServer server = getServerElement(clientInfos); + HtmlDocument document = getPageElementRepresentingWebPage(clientInfos, server); for (int i = 0; i < eventArray.size(); i++) { @@ -285,5 +290,5 @@ else { Long time = assertValue(((JSONObject) eventObj), "time", Long.class); - String path = assertValue(((JSONObject) eventObj), "path", String.class); + String domPath = assertValue(((JSONObject) eventObj), "path", String.class); String eventType = assertValue(((JSONObject) eventObj), "eventType", String.class); @@ -302,6 +307,6 @@ Console.printerrln(eventType + " event has no valid timestamp"); } - else if (path == null) { - Console.printerrln(eventType + " event has no valid path"); + else if (domPath == null) { + Console.printerrln(eventType + " event has no valid DOM path"); } else if ((coordinates != null) && (coordinates.length != 2)) { @@ -311,7 +316,17 @@ (eventType, coordinates, key, scrollPosition, selectedValue)) { - path = page.getPath() + path; - events.add(new HtmlEvent(clientInfos, time, path, eventType, - coordinates, key, scrollPosition, selectedValue)); + HtmlPageElement target = + guiElementManager.getPageElement(document, domPath); + + if (target != null) { + events.add(new HtmlEvent(clientInfos, time, target, eventType, + coordinates, key, scrollPosition, + selectedValue)); + } + else { + events.add(new HtmlEvent(clientInfos, time, document, domPath, + eventType, coordinates, key, scrollPosition, + selectedValue)); + } } else { @@ -342,12 +357,12 @@ * representation of the server of the HTML page that was observed */ - private HtmlPageElement extractHtmlPageElements(JSONObject object, - HtmlClientInfos clientInfos) + private HtmlServer extractHtmlPageElements(JSONObject object, + HtmlClientInfos clientInfos) { - HtmlPageElement server = getServerElement(clientInfos); - HtmlPageElement page = getPageElementRepresentingWebPage(clientInfos, server); + HtmlServer server = getServerElement(clientInfos); + HtmlDocument document = getPageElementRepresentingWebPage(clientInfos, server); JSONObject jsonPageElement = assertValue(object, "guiModel", JSONObject.class); - page.addChild(convert(jsonPageElement, page.getPath())); + document.addChild(convert(jsonPageElement, document, null)); return server; @@ -364,11 +379,13 @@ * @return as described */ - private HtmlPageElement getServerElement(HtmlClientInfos clientInfos) { - String id = clientInfos.getUrl().getHost(); + private HtmlServer getServerElement(HtmlClientInfos clientInfos) { + String host = clientInfos.getUrl().getHost(); + int port = 80; + if (clientInfos.getUrl().getPort() > -1) { - id += ":" + clientInfos.getUrl().getPort(); - } - - return new HtmlPageElement(null, "server", id, 0); + port = clientInfos.getUrl().getPort(); + } + + return guiElementManager.createHtmlServer(host, port); } @@ -384,19 +401,20 @@ * @return as described */ - private HtmlPageElement getPageElementRepresentingWebPage(HtmlClientInfos clientInfos, - HtmlPageElement server) + private HtmlDocument getPageElementRepresentingWebPage(HtmlClientInfos clientInfos, + HtmlServer server) { - String id = clientInfos.getUrl().getPath(); + String path = clientInfos.getUrl().getPath(); + String query = null; if (clientInfos.getUrl().getQuery() != null) { - id += "?" + clientInfos.getUrl().getQuery(); - } - - HtmlPageElement page = - new HtmlPageElement(server.getPath(), "document", id, clientInfos.getTitle(), 0); - - server.addChild(page); - - return page; + query = "?" + clientInfos.getUrl().getQuery(); + } + + HtmlDocument document = guiElementManager.createHtmlDocument + (server, path, query, clientInfos.getTitle()); + + server.addChild(document); + + return document; } @@ -408,18 +426,24 @@ * * @param jsonPageElement the JSON object to be converted - * @param parentPath the path through the DOM of the parent HTML page element of the - * converted one + * @param document the document to which the page element belongs + * @param parent the parent page element of the converted element, of null, if none + * is present. In this case the document is considered the parent + * element. * * @return as described. */ - private HtmlPageElement convert(JSONObject jsonPageElement, String parentPath) { + private HtmlPageElement convert(JSONObject jsonPageElement, + HtmlDocument document, + HtmlPageElement parent) + { HtmlPageElement result = null; if (jsonPageElement != null) { String tagName = assertValue(jsonPageElement, "tagName", String.class); - String id = assertValue(jsonPageElement, "id", String.class); + String htmlid = assertValue(jsonPageElement, "htmlId", String.class); Integer index = assertValue(jsonPageElement, "index", Integer.class); - result = new HtmlPageElement(parentPath, tagName, id, index); + result = guiElementManager.createHtmlPageElement + (document, parent, tagName, htmlid, index); JSONArray childElements = assertValue(jsonPageElement, "children", JSONArray.class); @@ -435,5 +459,5 @@ } else { - result.addChild(convert((JSONObject) jsonChild, result.getPath())); + result.addChild(convert((JSONObject) jsonChild, document, result)); } } Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlPageElement.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlPageElement.java (revision 1068) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlPageElement.java (revision 1069) @@ -15,38 +15,32 @@ package de.ugoe.cs.autoquest.htmlmonitor; -import java.util.ArrayList; -import java.util.List; - /** *

- * represents an element of an HTML GUI. This can be a server, which is usually the root of a - * GUI structure, a web page, or a tag within a web page. + * represents an element of an HTML GUI, i.e. a tag within a web page. *

* * @author Patrick Harms */ -class HtmlPageElement { - - /** - * path to the parent of this page element or null, if this is the root element - */ - private String parentPath; - - /** - * the name of the tag represented by this page element. May also be the name of the server - * or the page. +class HtmlPageElement extends HtmlGUIElement { + + /** + * the document to which the represented tag belongs + */ + private HtmlDocument document; + + /** + * the parent page element; if null, the document is considered the parent + */ + private HtmlPageElement parent; + + /** + * the name of the tag represented by this page element. */ private String tagName; /** - * the id of the page element. May also be the name of the server including port number or the - * URL of the page - */ - private String id; - - /** - * the title of the page if a page is represented through this element - */ - private String title; + * the id of the page element inside the DOM. + */ + private String htmlId; /** @@ -57,23 +51,41 @@ /** - * the children of this element - */ - private List children; - - /** *

* instantiates a new element representing a tag in an HTML page *

* - * @param parentPath the path through the DOM to the parent node of the represented tag - * @param tagName the name of the represented tag - * @param id the id of the tag in the DOM - * @param index the index of the represented tag regarding all tags with the same tag name - * in the list of children of the parent tag - */ - HtmlPageElement(String parentPath, String tagName, String id, Integer index) { - this.parentPath = parentPath; + * @param id the id of the page element + * @param document the document to which the represented tag belongs + * @param parent the parent page element; if null, the document is considered the parent + * @param tagName the name of the represented tag + * @param htmlId the id of the tag in the DOM + * @param index the index of the represented tag regarding all tags with the same + * tag name in the list of children of the parent tag + */ + HtmlPageElement(String id, + HtmlDocument document, + HtmlPageElement parent, + String tagName, + String htmlId, + Integer index) + { + super(id, parent == null ? document : parent); + + if (document == null) { + throw new IllegalArgumentException("document must not be null"); + } + + if (tagName == null) { + throw new IllegalArgumentException("tagName must not be null"); + } + + if ((htmlId == null) && (index == null)) { + throw new IllegalArgumentException("either one of htmlId and index must not be null"); + } + + this.document = document; + this.parent = parent; this.tagName = tagName; - this.id = id; + this.htmlId = htmlId; this.index = index; } @@ -81,23 +93,16 @@ /** *

- * instantiates a new element representing an HTML page + * returns the document to which the represented tag belongs *

* - * @param parentPath the path through the DOM to the parent node of the represented tag which is - * usually a server - * @param tagName the name of the represented tag which is the path of the web page - * @param title the title of the web page - * @param id the id of the web page which is its path - * @param index usually 0 - */ - HtmlPageElement(String parentPath, String tagName, String id, String title, Integer index) { - this(parentPath, tagName, id, index); - this.title = title; - } - - /** - *

- * returns the name of the tag represented by this page element. May also be the name of the - * server or the page. + * @return the document + */ + HtmlDocument getDocument() { + return document; + } + + /** + *

+ * returns the name of the tag represented by this page element. *

* @@ -110,23 +115,11 @@ /** *

- * returns the id of the page element. May also be the name of the server including port - * number or the URL of the page + * returns the id of the page element. *

* * @return the id */ - String getId() { - return id; - } - - /** - *

- * returns the title of the page if a page is represented through this element - *

- * - * @return the title - */ - String getTitle() { - return title; + String getHtmlId() { + return htmlId; } @@ -141,42 +134,4 @@ Integer getIndex() { return index; - } - - /** - *

- * returns the children of this element if any, null else - *

- * - * @return the children - */ - List getChildren() { - return children; - } - - - /** - * adds a child to this element - * - * @param child the child to be added - */ - void addChild(HtmlPageElement child) { - if (child != null) { - if (children == null) { - children = new ArrayList(); - } - - children.add(child); - } - } - - /** - *

- * returns the path to the parent of this page element or null, if this is the root element - *

- * - * @return as described - */ - String getParentPath() { - return parentPath; } @@ -190,8 +145,8 @@ * @return as described */ - String getPath() { + String getDOMPath() { StringBuffer result = new StringBuffer(); - if (parentPath != null) { - result.append(parentPath); + if (parent != null) { + result.append(parent.getDOMPath()); } @@ -199,7 +154,7 @@ result.append(tagName); - if ((id != null) && (!"".equals(id))) { - result.append("(id="); - result.append(id); + if ((htmlId != null) && (!"".equals(htmlId))) { + result.append("(htmlId="); + result.append(htmlId); result.append(")"); } @@ -213,3 +168,42 @@ } + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement#equals(de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement) + */ + @Override + public boolean equals(HtmlGUIElement obj) { + if (this == obj) { + return true; + } + else if (obj instanceof HtmlPageElement) { + return equals((HtmlPageElement) obj); + } + else { + return false; + } + } + + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement#equals(de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement) + */ + public boolean equals(HtmlPageElement other) { + if (this == other) { + return true; + } + + return (document.equals(other.document) && tagName.equals(other.tagName) && + (parent != null ? parent.equals(other.parent) : other.parent == null) && + (htmlId != null ? htmlId.equals(other.htmlId) : other.htmlId == null) && + (index != null ? index.equals(other.index) : other.index == null)); + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + return document.hashCode() + tagName.hashCode() + (parent != null ? parent.hashCode() : 0) + + (htmlId != null ? htmlId.hashCode() : 0) + (index != null ? index : 0); + } + } Index: /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlServer.java =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlServer.java (revision 1069) +++ /trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlServer.java (revision 1069) @@ -0,0 +1,118 @@ +// Copyright 2012 Georg-August-Universität Göttingen, Germany +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package de.ugoe.cs.autoquest.htmlmonitor; + +/** + *

+ * represents a web server including a port. + *

+ * + * @author Patrick Harms + */ +class HtmlServer extends HtmlGUIElement { + + /** + * the name of the represented server + */ + private String name; + + /** + * the port of the server (default is 80) + */ + private int port = 80; + + /** + *

+ * instantiates a new server element + *

+ * + * @param id the id of the server + * @param name the name of the server + * @param port the port on the server + * (must be between 0 and 65536, otherwise default 80 is used) + */ + HtmlServer(String id, String name, int port) { + super(id, null); + + if (name == null) { + throw new IllegalArgumentException("name must not be null"); + } + + this.name = name; + + if ((0 < port) && (port < 65536)) { + this.port = port; + } + + } + + /** + *

+ * returns the name of the server + *

+ * + * @return the name + */ + String getName() { + return name; + } + + /** + *

+ * returns the port on the server + *

+ * + * @return the port + */ + int getPort() { + return port; + } + + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement#equals(de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement) + */ + @Override + public boolean equals(HtmlGUIElement obj) { + if (this == obj) { + return true; + } + else if (obj instanceof HtmlServer) { + return equals((HtmlServer) obj); + } + else { + return false; + } + } + + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement#equals(de.ugoe.cs.autoquest.htmlmonitor.HtmlGUIElement) + */ + public boolean equals(HtmlServer other) { + if (this == other) { + return true; + } + + return (name.equals(other.name) && (port == other.port)); + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + return name.hashCode() + port; + } + +} Index: /trunk/autoquest-htmlmonitor/src/main/js/autoquest-htmlmonitor.js =================================================================== --- /trunk/autoquest-htmlmonitor/src/main/js/autoquest-htmlmonitor.js (revision 1068) +++ /trunk/autoquest-htmlmonitor/src/main/js/autoquest-htmlmonitor.js (revision 1069) @@ -305,5 +305,5 @@ if ((node.id) && (node.id !== "")) { - jsonRepresentation += "\"id\":\"" + node.id + "\""; + jsonRepresentation += "\"htmlId\":\"" + node.id + "\""; } else { Index: /trunk/autoquest-plugin-html-test/.classpath =================================================================== --- /trunk/autoquest-plugin-html-test/.classpath (revision 1068) +++ /trunk/autoquest-plugin-html-test/.classpath (revision 1069) @@ -13,5 +13,5 @@ - + Index: /trunk/autoquest-plugin-html-test/pom.xml =================================================================== --- /trunk/autoquest-plugin-html-test/pom.xml (revision 1068) +++ /trunk/autoquest-plugin-html-test/pom.xml (revision 1069) @@ -28,5 +28,5 @@ - get-jfc-plugin-config + get-html-plugin-config process-classes Index: /trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParserTest.java =================================================================== --- /trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParserTest.java (revision 1068) +++ /trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParserTest.java (revision 1069) @@ -19,4 +19,5 @@ import java.io.File; import java.util.Collection; +import java.util.Iterator; import java.util.List; import java.util.logging.Level; @@ -54,9 +55,16 @@ public void testParseFile() throws Exception { HTMLLogParser parser = new HTMLLogParser(); - parser.parseFile(new File(ClassLoader.getSystemResource("htmlmonitor_testtrace.xml").getFile())); + parser.parseFile(new File(ClassLoader.getSystemResource("htmlmonitor_testtrace_1.xml").getFile())); + parser.parseFile(new File(ClassLoader.getSystemResource("htmlmonitor_testtrace_2.xml").getFile())); Collection> events = parser.getSequences(); assertNotNull(events); - assertTrue(events.size() > 0); + assertEquals(2, events.size()); + + Iterator> iterator = events.iterator(); + assertNotNull(iterator); + assertEquals(1, iterator.next().size()); + assertEquals(3, iterator.next().size()); + assertFalse(iterator.hasNext()); System.err.println("{"); Index: unk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/OldHTMLLogParserTest.java =================================================================== --- /trunk/autoquest-plugin-html-test/src/test/java/de/ugoe/cs/autoquest/plugin/html/OldHTMLLogParserTest.java (revision 1068) +++ (revision ) @@ -1,116 +1,0 @@ -// Copyright 2012 Georg-August-Universität Göttingen, Germany -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package de.ugoe.cs.autoquest.plugin.html; - -import static org.junit.Assert.*; - -import java.io.File; -import java.util.Collection; -import java.util.List; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import de.ugoe.cs.autoquest.eventcore.Event; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; -import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement; -import de.ugoe.cs.util.console.TextConsole; - -/** - * - * @author Patrick Harms - */ -public class OldHTMLLogParserTest { - - /** - * - */ - @Before - public void setUp() throws Exception { - new TextConsole(); - } - - /** - * - */ - @After - public void tearDown() throws Exception {} - - /** - * - */ - @Test - public void test() { - OldHTMLLogParser parser = new OldHTMLLogParser(); - parser.parseFile(new File(ClassLoader.getSystemResource("trace.txt").getFile())); - Collection> events = parser.getSequences(); - - assertNotNull(events); - assertTrue(events.size() > 0); - - System.err.println("{"); - for (List session : events) { - System.err.println(" {"); - for (Event event : session) { - System.err.print(" "); - assertTrue(event instanceof Event); - System.err.print(event); - System.err.println(","); - } - System.err.println(" }"); - } - System.err.println("}"); - System.err.println("\n\n"); - - GUIModel guiModel = parser.getGuiModel(); - assertNotNull(guiModel); - guiModel.condenseModel(); - - for (IGUIElement root : guiModel.getRootElements()) { - dumpGUIElement(root, guiModel, ""); - } - } - - /** - * TODO: comment - * - * @param root - * @param guiModel - */ - private void dumpGUIElement(IGUIElement guiElement, GUIModel guiModel, String indent) { - assertTrue(guiElement instanceof HTMLGUIElement); - - System.err.print(indent); - System.err.print(guiElement); - - List children = guiModel.getChildren(guiElement); - - if ((children != null) && (children.size() > 0)) { - System.err.println(" {"); - - for (IGUIElement child : children) { - dumpGUIElement(child, guiModel, indent + " "); - } - - System.err.print(indent); - System.err.print("}"); - } - - System.err.println(); - } - -} Index: unk/autoquest-plugin-html-test/src/test/resources/htmlmonitor_testtrace.xml =================================================================== --- /trunk/autoquest-plugin-html-test/src/test/resources/htmlmonitor_testtrace.xml (revision 1068) +++ (revision ) @@ -1,38622 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: /trunk/autoquest-plugin-html-test/src/test/resources/htmlmonitor_testtrace_1.xml =================================================================== --- /trunk/autoquest-plugin-html-test/src/test/resources/htmlmonitor_testtrace_1.xml (revision 1069) +++ /trunk/autoquest-plugin-html-test/src/test/resources/htmlmonitor_testtrace_1.xml (revision 1069) @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/autoquest-plugin-html-test/src/test/resources/htmlmonitor_testtrace_2.xml =================================================================== --- /trunk/autoquest-plugin-html-test/src/test/resources/htmlmonitor_testtrace_2.xml (revision 1069) +++ /trunk/autoquest-plugin-html-test/src/test/resources/htmlmonitor_testtrace_2.xml (revision 1069) @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: unk/autoquest-plugin-html-test/src/test/resources/trace.txt =================================================================== --- /trunk/autoquest-plugin-html-test/src/test/resources/trace.txt (revision 1068) +++ (revision ) @@ -1,56 +1,0 @@ -"22638" "1351168129901" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/div[2]/form(id=modifypage)/div[0]" "46,717" -"22638" "1351168129904" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168130096" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168132422" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onfocus" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/textarea(id=text)" -"22638" "1351168132426" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/div[0]" "782,3" -"22638" "1351168173294" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onchange" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/textarea(id=text)" "[[TracNav(TOC|nocollapse)]] = Usability Analysis = AutoQUEST provides support for analysing the usability of a software. For this, it can be provided with recorded or manually created usage sessions. AutoQUEST transforms them into task trees and analyses them for known usability problems. As an example, a user may click three buttons of a user interface always in the same order. As she has to click three buttons, this is less efficient than clicking only one button that comprises the functionality of clicking the three buttons. AutoQUEST detects this and proposes to combine the three buttons to one. The following sections provide more details. == Generating Usage Models == The first step of AutoQUESTs usability analysis is the creation of usage models. Usage models can describe the interactions of a user performed on a GUI as well as calls to an API. The simplest usage model is a sequence of elementary actions. An action is, e.g., clicking with a mouse or pressing a key on the keyboard. A combination of several actions form a task. As an example, the task of entering a word into a textfield is a combination of actions, such as clicking on the textfield and pressing and releasing keys. Tasks and actions can be combined to form a higher level task. For example, the task of filling out a form presented by a software is made up of several tasks for entering values into textfields and a final click on a confirmation button. Furthermore, the task of filling out the form can be part of another higher level task. Therefore, we organize the tasks in task trees. A task tree is a structure for a task that a user or another system performs with a software. It decomposes a task into subtasks, which can be further subdivided. Each task and its subtasks are represented as nodes in the task tree. The leaf nodes of a task tree represent the actions a user must perform to fulfill the overall task. The subtasks of a parent task are set into temporal relationship. This defines the order in which they must be executed to fulfill the parent task. The input for generating task trees in AutoQUEST are sequences of elementary actions. Those can be manually defined or recorded using the monitors provided by AutoQUEST. AutoQUEST then combines actions that logically belong together into tasks. For example, it creates a task for all actions that took place in the same panel of a GUI. In a next step, AutoQUEST identifies iterations of tasks. Finally, AutoQUEST identifies selections between different tasks that a user can choose from at a specific point of using a software. The result is a condensed task tree, that shows all possible action combinations. The task tree model is not fully correct, as the analysed sequences do not contain all possible interactions. However, it provides sufficient information to perform a usability analysis for the concrete interaction sequence that was analysed. == Generating Interface Models == For its subsequent usability analysis, AutoQUEST requires a model of the user interface. This is determined based for the interaction sequences. The interaction sequences contain the interactions that took place as well as the interface elements that were used. The latter one are extracted and combined to an interface model. == Analysing Usability == To assess the usability of a software, AutoQUEST first analyses the generated task trees. Those show initial usability issues. As an example, a task tree should not contain too many iterations, as users should not be forced to iterate something. Furthermore, a task should not be split up into too many subtasks that have to be executed in exactly one sequence. Users usually have problems in performing more than 7 steps in a specific order to achieve a goal. In a next step, the usability analysis also includes the interface model. As an example, AutoQUEST may detect, that most interactions of the user are done on text fields. This may be OK for very specific applications, but usually, it is much more easy for users to enter data using GUI elements like date choosers, combo boxes, etc. Therefore, AutoQUEST also identifies potential of improving the interaction design of a user interface." -"22638" "1351168173428" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)" "608,819" -"22638" "1351168173635" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onscroll" "/html[0]/body[0]" "0,130" -"22638" "1351168175229" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/div[1]" "357,947" -"22638" "1351168175230" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168175494" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168183157" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/div[2]/form(id=modifypage)/div[0]" "28,718" -"22638" "1351168183159" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168183348" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168185596" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onfocus" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/textarea(id=text)" -"22638" "1351168185597" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/div[0]" "742,0" -"22638" "1351168199036" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onchange" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/textarea(id=text)" "[[TracNav(TOC|nocollapse)]] = Usability Analysis = AutoQUEST provides support for analysing the usability of a software. For this, it can be provided with recorded or manually created usage sessions. AutoQUEST transforms them into task trees and analyses them for known usability problems. As an example, a user may click three buttons of a user interface always in the same order. As she has to click three buttons, this is less efficient than clicking only one button that comprises the functionality of clicking the three buttons. AutoQUEST detects this and proposes to combine the three buttons to one. The following sections provide more details. == Generating Usage Models == The first step of AutoQUESTs usability analysis is the creation of usage models. Usage models can describe the interactions of a user performed on a GUI as well as calls to an API. The simplest usage model is a sequence of elementary actions. An action is, e.g., clicking with a mouse or pressing a key on the keyboard. A combination of several actions form a task. As an example, the task of entering a word into a textfield is a combination of actions, such as clicking on the textfield and pressing and releasing keys. Tasks and actions can be combined to form a higher level task. For example, the task of filling out a form presented by a software is made up of several tasks for entering values into textfields and a final click on a confirmation button. Furthermore, the task of filling out the form can be part of another higher level task. Therefore, we organize the tasks in task trees. A task tree is a structure for a task that a user or another system performs with a software. It decomposes a task into subtasks, which can be further subdivided. Each task and its subtasks are represented as nodes in the task tree. The leaf nodes of a task tree represent the actions a user must perform to fulfill the overall task. The subtasks of a parent task are set into temporal relationship. This defines the order in which they must be executed to fulfill the parent task. The input for generating task trees in AutoQUEST are sequences of elementary actions. Those can be manually defined or recorded using the monitors provided by AutoQUEST. AutoQUEST then combines actions that logically belong together into tasks. For example, it creates a task for all actions that took place in the same panel of a GUI. In a next step, AutoQUEST identifies iterations of tasks. Finally, AutoQUEST identifies selections between different tasks that a user can choose from at a specific point of using a software. The result is a condensed task tree, that shows all possible action combinations. The task tree model is not fully correct, as the analysed sequences do not contain all possible actions. However, it provides sufficient information to perform a usability analysis for the concrete action sequence that was analysed. == Generating Interface Models == For its subsequent usability analysis, AutoQUEST requires a model of the user interface. This is determined based for the interaction sequences. The interaction sequences contain the interactions that took place as well as the interface elements that were used. The latter one are extracted and combined to an interface model. == Analysing Usability == To assess the usability of a software, AutoQUEST first analyses the generated task trees. Those show initial usability issues. As an example, a task tree should not contain too many iterations, as users should not be forced to iterate something. Furthermore, a task should not be split up into too many subtasks that have to be executed in exactly one sequence. Users usually have problems in performing more than 7 steps in a specific order to achieve a goal. In a next step, the usability analysis also includes the interface model. As an example, AutoQUEST may detect, that most interactions of the user are done on text fields. This may be OK for very specific applications, but usually, it is much more easy for users to enter data using GUI elements like date choosers, combo boxes, etc. Therefore, AutoQUEST also identifies potential of improving the interaction design of a user interface." -"22638" "1351168199132" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/div(id=help)" "472,823" -"22638" "1351168199354" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onscroll" "/html[0]/body[0]" "0,176" -"22638" "1351168200964" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/div[1]" "323,991" -"22638" "1351168200967" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168201141" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168202248" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onscroll" "/html[0]/body[0]" "0,1" -"22638" "1351168209355" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/div[2]/form(id=modifypage)/div[0]" "34,712" -"22638" "1351168209356" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168209448" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168212116" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onfocus" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/textarea(id=text)" -"22638" "1351168212119" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/div[0]" "775,0" -"22638" "1351168231178" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onscroll" "/html[0]/body[0]" "0,98" -"22638" "1351168234637" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onchange" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/textarea(id=text)" "[[TracNav(TOC|nocollapse)]] = Usability Analysis = AutoQUEST provides support for analysing the usability of a software. For this, it can be provided with recorded or manually created usage sessions. AutoQUEST transforms them into task trees and analyses them for known usability problems. As an example, a user may click three buttons of a user interface always in the same order. As she has to click three buttons, this is less efficient than clicking only one button that comprises the functionality of clicking the three buttons. AutoQUEST detects this and proposes to combine the three buttons to one. The following sections provide more details. == Generating Usage Models == The first step of AutoQUESTs usability analysis is the creation of usage models. Usage models can describe the interactions of a user performed on a GUI as well as calls to an API. The simplest usage model is a sequence of elementary actions. An action is, e.g., clicking with a mouse or pressing a key on the keyboard. A combination of several actions form a task. As an example, the task of entering a word into a textfield is a combination of actions, such as clicking on the textfield and pressing and releasing keys. Tasks and actions can be combined to form a higher level task. For example, the task of filling out a form presented by a software is made up of several tasks for entering values into textfields and a final click on a confirmation button. Furthermore, the task of filling out the form can be part of another higher level task. Therefore, we organize the tasks in task trees. A task tree is a structure for a task that a user or another system performs with a software. It decomposes a task into subtasks, which can be further subdivided. Each task and its subtasks are represented as nodes in the task tree. The leaf nodes of a task tree represent the actions a user must perform to fulfill the overall task. The subtasks of a parent task are set into temporal relationship. This defines the order in which they must be executed to fulfill the parent task. The input for generating task trees in AutoQUEST are sequences of elementary actions. Those can be manually defined or recorded using the monitors provided by AutoQUEST. AutoQUEST then combines actions that logically belong together into tasks. For example, it creates a task for all actions that took place in the same panel of a GUI. In a next step, AutoQUEST identifies iterations of tasks. Finally, AutoQUEST identifies selections between different tasks that a user can choose from at a specific point of using a software. The result is a condensed task tree, that shows all possible action combinations. The task tree model is not fully correct, as the analysed sequences do not contain all possible actions. However, it provides sufficient information to perform a usability analysis for the concrete action sequence that was analysed. == Generating Interface Models == For its subsequent usability analysis, AutoQUEST requires a model of the user interface. This is determined based for the action sequences. The action sequences contain the actions that took place as well as the interface elements that were used. The latter one are extracted and combined to an interface model. == Analysing Usability == To assess the usability of a software, AutoQUEST first analyses the generated task trees. Those show initial usability issues. As an example, a task tree should not contain too many iterations, as users should not be forced to iterate something. Furthermore, a task should not be split up into too many subtasks that have to be executed in exactly one sequence. Users usually have problems in performing more than 7 steps in a specific order to achieve a goal. In a next step, the usability analysis also includes the interface model. As an example, AutoQUEST may detect, that most interactions of the user are done on text fields. This may be OK for very specific applications, but usually, it is much more easy for users to enter data using GUI elements like date choosers, combo boxes, etc. Therefore, AutoQUEST also identifies potential of improving the interaction design of a user interface." -"22638" "1351168234764" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/div[1]" "307,908" -"22638" "1351168234766" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168235012" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168282773" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/div[2]/form(id=modifypage)/div[0]" "81,715" -"22638" "1351168282775" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168282875" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168285408" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onfocus" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/textarea(id=text)" -"22638" "1351168285412" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/div[0]" "942,2" -"22638" "1351168286141" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onscroll" "/html[0]/body[0]" "0,94" -"22638" "1351168287555" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]" "993,591" -"22638" "1351168287739" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]" "993,591" -"22638" "1351168308483" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]" "643,629" -"22638" "1351168367771" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]" "971,630" -"22638" "1351168367979" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]" "971,630" -"22638" "1351168399459" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]" "1043,609" -"22638" "1351168403418" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]" "501,633" -"22638" "1351168486426" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onchange" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/fieldset[0]/p[0]/div[1]/div[0]/textarea(id=text)" "[[TracNav(TOC|nocollapse)]] = Usability Analysis = AutoQUEST provides support for analysing the usability of a software. For this, it can be provided with recorded or manually created usage sessions. AutoQUEST transforms them into task trees and analyses them for known usability problems. As an example, a user may click three buttons of a user interface always in the same order. As she has to click three buttons, this is less efficient than clicking only one button that comprises the functionality of clicking the three buttons. AutoQUEST detects this and proposes to combine the three buttons to one. The following sections provide more details. == Generating Usage Models == The first step of AutoQUESTs usability analysis is the creation of usage models. Usage models can describe the interactions of a user performed on a GUI as well as calls to an API. The simplest usage model is a sequence of elementary actions. An action is, e.g., clicking with a mouse or pressing a key on the keyboard. A combination of several actions form a task. As an example, the task of entering a word into a textfield is a combination of actions, such as clicking on the textfield and pressing and releasing keys. Tasks and actions can be combined to form a higher level task. For example, the task of filling out a form presented by a software is made up of several tasks for entering values into textfields and a final click on a confirmation button. Furthermore, the task of filling out the form can be part of another higher level task. Therefore, we organize the tasks in task trees. A task tree is a structure for a task that a user or another system performs with a software. It decomposes a task into subtasks, which can be further subdivided. Each task and its subtasks are represented as nodes in the task tree. The leaf nodes of a task tree represent the actions a user must perform to fulfill the overall task. The subtasks of a parent task are set into temporal relationship. This defines the order in which they must be executed to fulfill the parent task. The input for generating task trees in AutoQUEST are sequences of elementary actions. Those can be manually defined or recorded using the monitors provided by AutoQUEST. AutoQUEST then combines actions that logically belong together into tasks. For example, it creates a task for all actions that took place in the same panel of a GUI. In a next step, AutoQUEST identifies iterations of tasks. Finally, AutoQUEST identifies selections between different tasks that a user can choose from at a specific point of using a software. The result is a condensed task tree, that shows all possible action combinations. The task tree model is not fully correct, as the analysed sequences do not contain all possible actions. However, it provides sufficient information to perform a usability analysis for the concrete action sequence that was analysed. == Generating Interface Models == For its subsequent usability analysis, AutoQUEST requires a model of the user interface. This is determined based for the action sequences. The action sequences contain the actions that took place as well as the interface elements that were used. The latter one are extracted and combined to an interface model. == Analysing Usability == To assess the usability of a software, AutoQUEST first analyses the generated task trees. Those show initial usability issues. As an example, a task tree should not contain too many iterations, as users should not be forced to iterate something. Furthermore, a task should not be split up into too many subtasks that have to be executed in exactly one sequence. Users usually have problems in performing more than 7 steps in a specific order to achieve a goal. In a next step, the usability analysis also includes the interface model. As an example, AutoQUEST may detect, that most actions of the user are done on text fields. This may be OK for very specific applications, but usually, it is much more easy for users to enter data using GUI elements like date choosers, combo boxes, etc. Therefore, AutoQUEST also identifies potential of improving the interaction design of a user interface. Finally, AutoQUEST analyses task and interface element combinations. It searches for repetitions of similar or equal action and task sequences that are executed using the same interface elements. If it finds one, it proposes to combine the action or task sequence into one action or task by providing an interface element that when being used executes the sequence internally. This can be combined with the automatic detection and recording of macros." -"22638" "1351168486507" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/form(id=edit)/div[1]" "297,903" -"22638" "1351168486508" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168486770" "CoreLibrary/UsabilityAnalysis (edit) – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis?action=edit" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168491251" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/div[0]/div(id=wikipage)/div[0]/ul[0]/ul[1]/li[1]/a[0]" "51,174" -"22638" "1351168491253" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168491384" "CoreLibrary/UsabilityAnalysis – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsabilityAnalysis" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" -"22638" "1351168492570" "CoreLibrary/UsageBasedTesting – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsageBasedTesting" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onclick" "/html[0]/body[0]/div(id=main)/div(id=content)/div[0]/div(id=wikipage)/div[0]/ul[0]/ul[1]/li[2]/a[0]" "52,183" -"22638" "1351168492571" "CoreLibrary/UsageBasedTesting – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsageBasedTesting" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onbeforeunload" "/html[0]/body[0]" -"22638" "1351168492680" "CoreLibrary/UsageBasedTesting – AutoQUEST" "http://autoquest.informatik.uni-goettingen.de/trac/wiki/CoreLibrary/UsageBasedTesting" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.4 (KHTML, like Gecko) Chrome/22.0.1229.94 Safari/537.4" "onpagehide" "/html[0]/body[0]" Index: unk/autoquest-plugin-html/data/guimappings/guimapping-html-dummy.txt =================================================================== --- /trunk/autoquest-plugin-html/data/guimappings/guimapping-html-dummy.txt (revision 1068) +++ (revision ) @@ -1,14 +1,0 @@ -document = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -head = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -title = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -script = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -style = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -link = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -meta = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -iframe = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -input_hidden = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -option = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -tt = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -br = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -colgroup = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement -col = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement Index: /trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt =================================================================== --- /trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt (revision 1068) +++ /trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt (revision 1069) @@ -30,4 +30,5 @@ div = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel dl = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel +document = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLDocument dt = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText @@ -90,5 +91,4 @@ p = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel -page = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPage # param = pre = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/AbstractDefaultLogParser.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/AbstractDefaultLogParser.java (revision 1069) +++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/AbstractDefaultLogParser.java (revision 1069) @@ -0,0 +1,432 @@ +// Copyright 2012 Georg-August-Universität Göttingen, Germany +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package de.ugoe.cs.autoquest.plugin.html; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.DefaultHandler; + +import de.ugoe.cs.autoquest.eventcore.Event; +import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree; +import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; +import de.ugoe.cs.util.console.Console; + +/** + *

+ * This class provides the functionality to parse XML log files generated monitors of + * AutoQUEST. The result of parsing a file is a collection of event sequences and a GUI model. + * This class must be extended by implementing a subclass and the abstract method to complete + * the implementation. + *

+ * + * @author Patrick Harms + * @version 1.0 + * + */ +public abstract class AbstractDefaultLogParser extends DefaultHandler { + + /** + *

+ * Collection of event sequences that is contained in the parsed log file. + *

+ */ + private Collection> sequences; + + /** + *

+ * Internal handle to the parsed GUI structure, stored in a GUIElementTree + *

+ */ + private GUIElementTree guiElementTree; + + /** + *

+ * Id of the GUI element currently being parsed. + *

+ */ + private String currentGUIElementId; + + /** + *

+ * the buffer for GUI elements already parsed but not processed yet (because e.g. the parent + * GUI element has not been parsed yet) + *

+ */ + private List guiElementBuffer; + + /** + *

+ * Internal handle to type of the event currently being parsed. + *

+ */ + private String currentEventType; + + /** + *

+ * the buffer for events already parsed but not processed yet (because e.g. the target + * GUI element has not been parsed yet) + *

+ */ + private List eventBuffer; + + /** + *

+ * Internal handle to the parameters of the event currently being entity. + *

+ */ + private Map currentParameters; + + /** + *

+ * Internal handle to the sequence currently being parsed. + *

+ */ + private List currentSequence; + + /** + *

+ * Constructor. Creates a new logParser. + *

+ */ + public AbstractDefaultLogParser() { + sequences = new LinkedList>(); + guiElementTree = new GUIElementTree(); + guiElementBuffer = new LinkedList(); + eventBuffer = new LinkedList(); + currentSequence = new LinkedList(); + } + + /** + *

+ * Parses a log file written by the HTMLMonitor and creates a collection of event sequences. + *

+ * + * @param filename + * name and path of the log file + */ + public void parseFile(String filename) { + if (filename == null) { + throw new IllegalArgumentException("filename must not be null"); + } + + parseFile(new File(filename)); + } + + /** + *

+ * Parses a log file written by the HTMLMonitor and creates a collection of event sequences. + *

+ * + * @param file + * file to be parsed + */ + public void parseFile(File file) { + if (file == null) { + throw new IllegalArgumentException("file must not be null"); + } + SAXParserFactory spf = SAXParserFactory.newInstance(); + spf.setValidating(true); + SAXParser saxParser = null; + InputSource inputSource = null; + try { + saxParser = spf.newSAXParser(); + inputSource = + new InputSource(new InputStreamReader(new FileInputStream(file), "UTF-8")); + } + catch (UnsupportedEncodingException e) { + Console.printerrln("Error parsing file " + file.getName()); + Console.logException(e); + return; + } + catch (ParserConfigurationException e) { + Console.printerrln("Error parsing file " + file.getName()); + Console.logException(e); + return; + } + catch (SAXException e) { + Console.printerrln("Error parsing file " + file.getName()); + Console.logException(e); + } + catch (FileNotFoundException e) { + Console.printerrln("Error parsing file " + file.getName()); + Console.logException(e); + } + if (inputSource != null) { + inputSource.setSystemId("file://" + file.getAbsolutePath()); + try { + if (saxParser == null) { + throw new RuntimeException("SaxParser creation failed"); + } + saxParser.parse(inputSource, this); + } + catch (SAXParseException e) { + Console.printerrln("Failure parsing file in line " + e.getLineNumber() + + ", column " + e.getColumnNumber() + "."); + Console.logException(e); + } + catch (SAXException e) { + Console.printerrln("Error parsing file " + file.getName()); + Console.logException(e); + return; + } + catch (IOException e) { + Console.printerrln("Error parsing file " + file.getName()); + Console.logException(e); + return; + } + } + } + + /** + *

+ * Returns a collection of event sequences that was obtained from parsing log files. + *

+ * + * @return + */ + public Collection> getSequences() { + return sequences; + } + + /** + *

+ * Returns the GUI model that is obtained from parsing log files. + *

+ * + * @return GUIModel + */ + public GUIModel getGuiModel() { + return guiElementTree.getGUIModel(); + } + + /* + * (non-Javadoc) + * + * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, + * java.lang.String, org.xml.sax.Attributes) + */ + @Override + public void startElement(String uri, String localName, String qName, Attributes atts) + throws SAXException + { + if (qName.equals("session")) { + // do nothing + } + else if (qName.equals("component")) { + currentGUIElementId = atts.getValue("id"); + currentParameters = new HashMap(); + } + else if (qName.equals("event")) { + currentEventType = atts.getValue("type"); + currentParameters = new HashMap(); + } + else if (qName.equals("param")) { + String paramName = atts.getValue("name"); + if ((currentGUIElementId != null) || (currentEventType != null)) { + currentParameters.put(paramName, atts.getValue("value")); + } + else { + throw new SAXException("param tag found where it should not be."); + } + } + else { + throw new SAXException("unknown tag found: " + qName); + } + + } + + /* + * (non-Javadoc) + * + * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, + * java.lang.String) + */ + @Override + public void endElement(String uri, String localName, String qName) throws SAXException { + if (qName.equals("session") && (eventBuffer != null)) { + eventBuffer.add(new BufferEntry("sessionSwitch", null)); + processEvents(); + } + else if (qName.equals("component") && (currentGUIElementId != null)) { + guiElementBuffer.add(new BufferEntry(currentGUIElementId, currentParameters)); + + processGUIElements(); + + currentGUIElementId = null; + currentParameters = null; + } + else if (qName.equals("event") && (currentEventType != null)) { + eventBuffer.add(new BufferEntry(currentEventType, currentParameters)); + + processEvents(); + + currentEventType = null; + currentParameters = null; + } + } + + /** + *

+ * TODO: comment + *

+ * + * @param id + * @param parameters + * @return + */ + protected abstract boolean handleGUIElement(String id, Map parameters) + throws SAXException; + + /** + *

+ * TODO: comment + *

+ * + * @param id + * @param parameters + * @return + */ + protected abstract boolean handleEvent(String type, Map parameters) + throws SAXException; + + /** + *

+ * TODO: comment + *

+ * + * @return + */ + protected GUIElementTree getGUIElementTree() { + return guiElementTree; + } + + /** + *

+ * TODO: comment + *

+ * + * @param event + */ + protected void addToSequence(Event event) { + currentSequence.add(event); + } + + /** + *

+ * TODO: comment + *

+ * + */ + private void processGUIElements() throws SAXException { + int processedElements = 0; + boolean processedElement; + + do { + processedElement = false; + // search for the next GUI element that can be processed + for (int i = 0; i < guiElementBuffer.size(); i++) { + BufferEntry entry = guiElementBuffer.get(i); + processedElement = handleGUIElement(entry.id, entry.parameters); + if (processedElement) { + guiElementBuffer.remove(i); + processedElements++; + break; + } + } + } + while (processedElement); + + if (processedElements > 0) { + processEvents(); + } + } + + /** + *

+ * TODO: comment + *

+ * + */ + private void processEvents() throws SAXException { + boolean processedEvent; + + do { + processedEvent = false; + // check, if the next event can be processed + if (eventBuffer.size() > 0) { + BufferEntry entry = eventBuffer.get(0); + + if ((entry != null) && (entry.id != null) && (entry.parameters != null)) { + processedEvent = handleEvent(entry.id, entry.parameters); + if (processedEvent) { + eventBuffer.remove(0); + } + } + else { + // the entry signals a session switch. Close the current session and start the + // next one + if (currentSequence.size() > 0) { + sequences.add(currentSequence); + currentSequence = new LinkedList(); + eventBuffer.remove(0); + processedEvent = true; + } + } + } + } + while (processedEvent); + } + + /** + *

+ * TODO document + *

+ */ + private static class BufferEntry { + + /** */ + private String id; + + /** */ + private Map parameters; + + /** + * + */ + private BufferEntry(String id, Map parameters) { + this.id = id; + this.parameters = parameters; + } + } + +} Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java (revision 1068) +++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java (revision 1069) @@ -15,407 +15,271 @@ package de.ugoe.cs.autoquest.plugin.html; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.helpers.DefaultHandler; import de.ugoe.cs.autoquest.eventcore.Event; import de.ugoe.cs.autoquest.eventcore.IEventType; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree; import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; import de.ugoe.cs.autoquest.plugin.html.eventcore.HTMLEventTypeFactory; +import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLDocumentSpec; import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement; import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElementSpec; import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageElementSpec; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageSpec; import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLServerSpec; -import de.ugoe.cs.util.console.Console; /** *

* This class provides the functionality to parse XML log files generated by the HTMLMonitor of - * autoquest. The result of parsing a file is a collection of event sequences. + * AutoQUEST. The result of parsing a file is a collection of event sequences and a GUI model *

* - * @author Fabian Glaser + * @author Fabian Glaser, Patrick Harms * @version 1.0 * */ -public class HTMLLogParser extends DefaultHandler { +public class HTMLLogParser extends AbstractDefaultLogParser { + + /** + * + */ + private Pattern htmlElementPattern = + Pattern.compile("(\\w+)(\\[(\\d+)\\]|\\(htmlId=([\\w-]+)\\))"); + + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.plugin.html.AbstractDefaultLogParser#handleGUIElement(java.lang.String, java.util.Map) + */ + @Override + protected boolean handleGUIElement(String id, Map parameters) + throws SAXException + { + HTMLGUIElementSpec specification = null; + + String parentId = parameters.get("parent"); + IGUIElement parent = super.getGUIElementTree().find(parentId); + + if (parameters.containsKey("host")) { + // this is a server specification + int port = 80; + String portStr = parameters.get(port); + + if (portStr != null) { + port = Integer.parseInt(portStr); + } + + specification = new HTMLServerSpec(parameters.get("host"), port); + } + else if (parameters.containsKey("path")) { + // this is a document specification + + if (parent != null) { + if (!(parent.getSpecification() instanceof HTMLServerSpec)) { + throw new SAXException + ("invalid log: parent GUI element of a document is not of type server"); + } + + specification = new HTMLDocumentSpec + ((HTMLServerSpec) parent.getSpecification(), parameters.get("path"), + parameters.get("query"), parameters.get("title")); + } + else if (parentId == null) { + throw new SAXException("invalid log: a document has no parent id"); + } + } + else if (parameters.containsKey("tagname")) { + String tagName = parameters.get("tagname"); + + if (!tagNameMustBeConsidered(tagName)) { + return true; + } + + if (parent != null) { + IGUIElement document = parent; + + while ((document != null) && + (!(document.getSpecification() instanceof HTMLDocumentSpec))) + { + document = document.getParent(); + } + + if (document == null) { + throw new SAXException + ("invalid log: parent hierarchy of a page element does not contain a " + + "document"); + } + + int index = -1; + String indexStr = parameters.get("index"); + + if ((indexStr != null) && (!"".equals(indexStr))) { + index = Integer.parseInt(indexStr); + } + + specification = new HTMLPageElementSpec + ((HTMLDocumentSpec) document.getSpecification(), tagName, + parameters.get("htmlid"), index); + } + else if (parentId == null) { + throw new SAXException("invalid log: a page element has no parent id"); + } + } + else { + throw new SAXException("invalid log: unknown GUI element"); + } + + if (specification != null) { + super.getGUIElementTree().add(id, parentId, specification); + return true; + } + else { + return false; + } + } + + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.plugin.html.AbstractDefaultLogParser#handleEvent(java.lang.String, java.util.Map) + */ + @Override + protected boolean handleEvent(String type, Map parameters) throws SAXException { + String targetId = parameters.get("target"); + + if (targetId == null) { + String targetDocument = parameters.get("targetDocument"); + String targetDOMPath = parameters.get("targetDOMPath"); + + if ((targetDocument == null) || (targetDOMPath == null)) { + throw new SAXException("event has no target defined"); + } + + targetId = determineTargetId(targetDocument, targetDOMPath); + + if (targetId == null) { + // the target id can not be determined yet + return false; + } + } + + IGUIElement target = super.getGUIElementTree().find(targetId); + + if (target == null) { + // event not processable yet + return false; + } + + IEventType eventType = + HTMLEventTypeFactory.getInstance().getEventType(type, parameters, target); + + Event event = new Event(eventType, target); + + String timestampStr = parameters.get("timestamp"); + + if (timestampStr != null) { + event.setTimestamp(Long.parseLong(timestampStr)); + } + + ((HTMLGUIElement) event.getTarget()).markUsed(); + + super.addToSequence(event); + + return true; + } + /** *

- * Constructor. Creates a new HTMLLogParser. + * TODO: comment *

- */ - public HTMLLogParser() { - sequences = new LinkedList>(); + * + * @param targetDocument + * @param targetDOMPath + * @return + */ + private String determineTargetId(String targetDocument, String targetDOMPath) + throws SAXException + { + IGUIElement document = super.getGUIElementTree().find(targetDocument); + + if (document == null) { + return null; + } + + if (!(document.getSpecification() instanceof HTMLDocumentSpec)) { + throw new SAXException("an id that should refer to an HTML document refers to" + + "something else"); + } + + GUIModel model = super.getGUIElementTree().getGUIModel(); + IGUIElement child = document; + String[] pathElements = targetDOMPath.split("/"); + int pathIndex = 0; + + HTMLPageElementSpec compareSpec; + String tagName; + int index; + String htmlId; + + while ((pathIndex < pathElements.length) && (child != null)) { + if ((pathElements[pathIndex] != null) && (!"".equals(pathElements[pathIndex]))) { + Matcher matcher = htmlElementPattern.matcher(pathElements[pathIndex]); + if (!matcher.matches()) { + throw new SAXException + ("could not parse target DOM path element " + pathElements[pathIndex]); + } + + tagName = matcher.group(1); + String indexStr = matcher.group(3); + htmlId = matcher.group(4); + + index = -1; + if ((indexStr != null) && (!"".equals(indexStr))) { + index = Integer.parseInt(indexStr); + } + + compareSpec = new HTMLPageElementSpec + ((HTMLDocumentSpec) document.getSpecification(), tagName, htmlId, index); + + List children = model.getChildren(child); + child = null; + + for (IGUIElement candidate : children) { + if (compareSpec.getSimilarity(candidate.getSpecification())) { + child = candidate; + break; + } + } + } + + pathIndex++; + } + + if (child != null) { + return super.getGUIElementTree().find(child); + } + else { + return null; + } } /** *

- * Collection of event sequences that is contained in the parsed log file. + * checks if tags with the provided name must be handled in the GUI model. As an example, + * it is not necessary to handle "head" tags and anything included in them. *

- */ - private Collection> sequences; - - /** - *

- * Internal handle to the parsed GUI structure, stored in a GUIElementTree - *

- */ - private GUIElementTree currentGUIElementTree; - - /** - *

- * Path of the GUI element currently being parsed. - *

- */ - private String currentGUIElementPath; - - /** - *

- * Path of the parent of the GUI element currently being parsed. - *

- */ - private String currentParentPath; - - /** - *

- * Source of the GUI element currently being parsed. - *

- */ - private String currentEventSource; - - /** - *

- * Timestamp of the event currently being parsed. - *

- */ - private Long currentEventTimestamp; - - /** - *

- * Internal handle to the parameters of the event currently being parsed. - *

- */ - private Map currentEventParameters; - - /** - *

- * Internal handle to the parameters of the GUI element currently being parsed. - *

- */ - private Map currentGUIElementParameters; - /** - *

- * Internal handle to the sequence currently being parsed. - *

- */ - private List currentSequence; - - /** - *

- * Internal handle to type of the event currently being parsed. - *

- */ - private String currentEventType; - - /** - *

- * Class of the GUI element currently being parsed. - *

- */ - private String currentGUIElementClass; - - /** - *

- * Index of the GUI element currently being parsed. - *

- */ - private String currentGUIElementIndex; - - /** - *

- * internal handle to the GUI element of the previous event to be potentially reused for the - * current - *

- */ - private IGUIElement lastGUIElement; - - /** - *

- * internal handle to the server specification currently being used. - *

- */ - private HTMLServerSpec currentServerSpec; - - /** - *

- * Parses a log file written by the HTMLMonitor and creates a collection of event sequences. - *

- * - * @param filename - * name and path of the log file - */ - public void parseFile(String filename) { - if (filename == null) { - throw new IllegalArgumentException("filename must not be null"); - } - - parseFile(new File(filename)); - } - - /** - *

- * Parses a log file written by the HTMLMonitor and creates a collection of event sequences. - *

- * - * @param file - * file to be parsed - */ - public void parseFile(File file) { - if (file == null) { - throw new IllegalArgumentException("file must not be null"); - } - SAXParserFactory spf = SAXParserFactory.newInstance(); - spf.setValidating(true); - SAXParser saxParser = null; - InputSource inputSource = null; - try { - saxParser = spf.newSAXParser(); - inputSource = - new InputSource(new InputStreamReader(new FileInputStream(file), "UTF-8")); - } - catch (UnsupportedEncodingException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - return; - } - catch (ParserConfigurationException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - return; - } - catch (SAXException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - } - catch (FileNotFoundException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - } - if (inputSource != null) { - inputSource.setSystemId("file://" + file.getAbsolutePath()); - try { - if (saxParser == null) { - throw new RuntimeException("SaxParser creation failed"); - } - saxParser.parse(inputSource, this); - } - catch (SAXParseException e) { - Console.printerrln("Failure parsing file in line " + e.getLineNumber() + - ", column " + e.getColumnNumber() + "."); - Console.logException(e); - } - catch (SAXException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - return; - } - catch (IOException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - return; - } - } - } - - /* - * (non-Javadoc) - * - * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, - * java.lang.String, org.xml.sax.Attributes) - */ - @Override - public void startElement(String uri, String localName, String qName, Attributes atts) - throws SAXException - { - if (qName.equals("session")) { - currentSequence = new LinkedList(); - if (currentGUIElementTree == null) - currentGUIElementTree = new GUIElementTree(); - } - else if (qName.equals("component")) { - currentGUIElementPath = atts.getValue("path"); - currentGUIElementParameters = new HashMap(); - } - else if (qName.equals("event")) { - currentEventType = atts.getValue("type"); - currentEventParameters = new HashMap(); - } - else if (qName.equals("param")) { - String paramName = atts.getValue("name"); - if (currentGUIElementPath != null) { - if ("parent".equals(paramName)) { - currentParentPath = atts.getValue("value"); - } - if ("class".equals(paramName)) { - currentGUIElementClass = atts.getValue("value"); - } - if ("index".equals(paramName)) { - currentGUIElementIndex = atts.getValue("value"); - } - currentGUIElementParameters.put(paramName, atts.getValue("value")); - } - else if (currentEventType != null) { - if ("target".equals(paramName)) { - currentEventSource = atts.getValue("value"); - } - if ("timestamp".equals(paramName)) { - currentEventTimestamp = Long.parseLong(atts.getValue("value")); - } - currentEventParameters.put(paramName, atts.getValue("value")); - } - else { - throw new SAXException("param tag found where it should not be."); - } - } - else { - throw new SAXException("unknown tag found: " + qName); - } - - } - - /* - * (non-Javadoc) - * - * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, - * java.lang.String) - */ - @Override - public void endElement(String uri, String localName, String qName) throws SAXException { - if (qName.equals("session")) { - if (currentSequence != null && !currentSequence.isEmpty()) { - sequences.add(currentSequence); - } - currentSequence = null; - } - else if (qName.equals("component") && currentGUIElementPath != null) { - HTMLGUIElementSpec guiElementSpec = - getGUIElementSpec(currentGUIElementClass, currentGUIElementParameters); - currentGUIElementTree.add(currentGUIElementPath, currentParentPath, guiElementSpec); - - currentParentPath = null; - currentGUIElementPath = null; - currentGUIElementParameters = null; - } - else if (qName.equals("event")) { - IGUIElement currentGUIElement; - currentGUIElement = currentGUIElementTree.find(currentEventSource); - - IEventType eventType = - HTMLEventTypeFactory.getInstance().getEventType(currentEventType, - currentEventParameters, - currentGUIElement); - Event event = - new Event(eventType, (currentGUIElement == null ? lastGUIElement - : currentGUIElement)); - - event.setTimestamp(currentEventTimestamp); - HTMLGUIElement currentEventTarget = (HTMLGUIElement) event.getTarget(); - currentEventTarget.markUsed(); - currentSequence.add(event); - - currentEventSource = null; - currentEventTimestamp = -1l; - currentEventParameters = null; - currentEventType = null; - - if (currentGUIElement != null) { - lastGUIElement = currentGUIElement; - } - - currentGUIElement = null; - } - } - - /** - *

- * Returns a collection of event sequences that was obtained from parsing log files. - *

- * + * + * @param tagName * @return */ - public Collection> getSequences() { - return sequences; - } - - /** - *

- * Returns the GUI model that is obtained from parsing log files. - *

- * - * @return GUIModel - */ - public GUIModel getGuiModel() { - return currentGUIElementTree.getGUIModel(); - } - - /** - * Returns the HTMLGUIElementSpecification for a GUI Element described - * by its class name and its parameters. - * @param guiElementClass - * @param guiElementParameters - * @return - */ - private HTMLGUIElementSpec getGUIElementSpec(String guiElementClass, - Map guiElementParameters) - { - HTMLGUIElementSpec specification = null; - if ("server".equals(guiElementClass)) { - // TODO: add correct port handling - specification = new HTMLServerSpec(guiElementParameters.get("htmlId"), 0); - currentServerSpec = (HTMLServerSpec) specification; - } - - else { - String id = guiElementParameters.get("htmlId"); - if (id == null) { - HTMLPageElementSpec parentSpec = - (HTMLPageElementSpec) currentGUIElementTree.find(currentParentPath) - .getSpecification(); - id = parentSpec.getPage().getPagePath(); - } - - int index = -1; - String indexStr = guiElementParameters.get("index"); - - if ((indexStr != null) && (!"".equals(indexStr))) { - index = Integer.parseInt(indexStr); - } - String title = guiElementParameters.get("title"); - HTMLPageSpec page = new HTMLPageSpec(currentServerSpec, id, title); - specification = new HTMLPageElementSpec(page, guiElementClass, id, index); - } - - return specification; - } + private boolean tagNameMustBeConsidered(String tagName) { + return + !"head".equals(tagName) && !"title".equals(tagName) && !"script".equals(tagName) && + !"style".equals(tagName) && !"link".equals(tagName) && !"meta".equals(tagName) && + !"iframe".equals(tagName) && !"input_hidden".equals(tagName) && + !"option".equals(tagName) && !"tt".equals(tagName) && !"br".equals(tagName) && + !"colgroup".equals(tagName) && !"col".equals(tagName); + + } + } Index: unk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/NewHTMLLogParser.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/NewHTMLLogParser.java (revision 1068) +++ (revision ) @@ -1,421 +1,0 @@ -// Copyright 2012 Georg-August-Universität Göttingen, Germany -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package de.ugoe.cs.autoquest.plugin.html; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.helpers.DefaultHandler; - -import de.ugoe.cs.autoquest.eventcore.Event; -import de.ugoe.cs.autoquest.eventcore.IEventType; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; -import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; -import de.ugoe.cs.autoquest.plugin.html.eventcore.HTMLEventTypeFactory; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElementSpec; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageElementSpec; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageSpec; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLServerSpec; -import de.ugoe.cs.util.console.Console; - -/** - *

- * This class provides the functionality to parse XML log files generated by the HTMLMonitor of - * autoquest. The result of parsing a file is a collection of event sequences. - *

- * - * @author Fabian Glaser - * @version 1.0 - * - */ -public class NewHTMLLogParser extends DefaultHandler { - /** - *

- * Constructor. Creates a new HTMLLogParser. - *

- */ - public NewHTMLLogParser() { - sequences = new LinkedList>(); - } - - /** - *

- * Collection of event sequences that is contained in the parsed log file. - *

- */ - private Collection> sequences; - - /** - *

- * Internal handle to the parsed GUI structure, stored in a GUIElementTree - *

- */ - private GUIElementTree currentGUIElementTree; - - /** - *

- * Path of the GUI element currently being parsed. - *

- */ - private String currentGUIElementPath; - - /** - *

- * Path of the parent of the GUI element currently being parsed. - *

- */ - private String currentParentPath; - - /** - *

- * Source of the GUI element currently being parsed. - *

- */ - private String currentEventSource; - - /** - *

- * Timestamp of the event currently being parsed. - *

- */ - private Long currentEventTimestamp; - - /** - *

- * Internal handle to the parameters of the event currently being parsed. - *

- */ - private Map currentEventParameters; - - /** - *

- * Internal handle to the parameters of the GUI element currently being parsed. - *

- */ - private Map currentGUIElementParameters; - /** - *

- * Internal handle to the sequence currently being parsed. - *

- */ - private List currentSequence; - - /** - *

- * Internal handle to type of the event currently being parsed. - *

- */ - private String currentEventType; - - /** - *

- * Class of the GUI element currently being parsed. - *

- */ - private String currentGUIElementClass; - - /** - *

- * Index of the GUI element currently being parsed. - *

- */ - private String currentGUIElementIndex; - - /** - *

- * internal handle to the GUI element of the previous event to be potentially reused for the - * current - *

- */ - private IGUIElement lastGUIElement; - - /** - *

- * internal handle to the server specification currently being used. - *

- */ - private HTMLServerSpec currentServerSpec; - - /** - *

- * Parses a log file written by the HTMLMonitor and creates a collection of event sequences. - *

- * - * @param filename - * name and path of the log file - */ - public void parseFile(String filename) { - if (filename == null) { - throw new IllegalArgumentException("filename must not be null"); - } - - parseFile(new File(filename)); - } - - /** - *

- * Parses a log file written by the HTMLMonitor and creates a collection of event sequences. - *

- * - * @param file - * file to be parsed - */ - public void parseFile(File file) { - if (file == null) { - throw new IllegalArgumentException("file must not be null"); - } - SAXParserFactory spf = SAXParserFactory.newInstance(); - spf.setValidating(true); - SAXParser saxParser = null; - InputSource inputSource = null; - try { - saxParser = spf.newSAXParser(); - inputSource = - new InputSource(new InputStreamReader(new FileInputStream(file), "UTF-8")); - } - catch (UnsupportedEncodingException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - return; - } - catch (ParserConfigurationException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - return; - } - catch (SAXException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - } - catch (FileNotFoundException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - } - if (inputSource != null) { - inputSource.setSystemId("file://" + file.getAbsolutePath()); - try { - if (saxParser == null) { - throw new RuntimeException("SaxParser creation failed"); - } - saxParser.parse(inputSource, this); - } - catch (SAXParseException e) { - Console.printerrln("Failure parsing file in line " + e.getLineNumber() + - ", column " + e.getColumnNumber() + "."); - Console.logException(e); - } - catch (SAXException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - return; - } - catch (IOException e) { - Console.printerr("Error parsing file " + file.getName()); - Console.logException(e); - return; - } - } - } - - /* - * (non-Javadoc) - * - * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, - * java.lang.String, org.xml.sax.Attributes) - */ - @Override - public void startElement(String uri, String localName, String qName, Attributes atts) - throws SAXException - { - if (qName.equals("session")) { - currentSequence = new LinkedList(); - if (currentGUIElementTree == null) - currentGUIElementTree = new GUIElementTree(); - } - else if (qName.equals("component")) { - currentGUIElementPath = atts.getValue("path"); - currentGUIElementParameters = new HashMap(); - } - else if (qName.equals("event")) { - currentEventType = atts.getValue("type"); - currentEventParameters = new HashMap(); - } - else if (qName.equals("param")) { - String paramName = atts.getValue("name"); - if (currentGUIElementPath != null) { - if ("parent".equals(paramName)) { - currentParentPath = atts.getValue("value"); - } - if ("class".equals(paramName)) { - currentGUIElementClass = atts.getValue("value"); - } - if ("index".equals(paramName)) { - currentGUIElementIndex = atts.getValue("value"); - } - currentGUIElementParameters.put(paramName, atts.getValue("value")); - } - else if (currentEventType != null) { - if ("target".equals(paramName)) { - currentEventSource = atts.getValue("value"); - } - if ("timestamp".equals(paramName)) { - currentEventTimestamp = Long.parseLong(atts.getValue("value")); - } - currentEventParameters.put(paramName, atts.getValue("value")); - } - else { - throw new SAXException("param tag found where it should not be."); - } - } - else { - throw new SAXException("unknown tag found: " + qName); - } - - } - - /* - * (non-Javadoc) - * - * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, - * java.lang.String) - */ - @Override - public void endElement(String uri, String localName, String qName) throws SAXException { - if (qName.equals("session")) { - if (currentSequence != null && !currentSequence.isEmpty()) { - sequences.add(currentSequence); - } - currentSequence = null; - } - else if (qName.equals("component") && currentGUIElementPath != null) { - HTMLGUIElementSpec guiElementSpec = - getGUIElementSpec(currentGUIElementClass, currentGUIElementParameters); - currentGUIElementTree.add(currentGUIElementPath, currentParentPath, guiElementSpec); - - currentParentPath = null; - currentGUIElementPath = null; - currentGUIElementParameters = null; - } - else if (qName.equals("event")) { - IGUIElement currentGUIElement; - currentGUIElement = currentGUIElementTree.find(currentEventSource); - - IEventType eventType = - HTMLEventTypeFactory.getInstance().getEventType(currentEventType, - currentEventParameters, - currentGUIElement); - Event event = - new Event(eventType, (currentGUIElement == null ? lastGUIElement - : currentGUIElement)); - - event.setTimestamp(currentEventTimestamp); - HTMLGUIElement currentEventTarget = (HTMLGUIElement) event.getTarget(); - currentEventTarget.markUsed(); - currentSequence.add(event); - - currentEventSource = null; - currentEventTimestamp = -1l; - currentEventParameters = null; - currentEventType = null; - - if (currentGUIElement != null) { - lastGUIElement = currentGUIElement; - } - - currentGUIElement = null; - } - } - - /** - *

- * Returns a collection of event sequences that was obtained from parsing log files. - *

- * - * @return - */ - public Collection> getSequences() { - return sequences; - } - - /** - *

- * Returns the GUI model that is obtained from parsing log files. - *

- * - * @return GUIModel - */ - public GUIModel getGuiModel() { - return currentGUIElementTree.getGUIModel(); - } - - /** - * Returns the HTMLGUIElementSpecification for a GUI Element described - * by its class name and its parameters. - * @param guiElementClass - * @param guiElementParameters - * @return - */ - private HTMLGUIElementSpec getGUIElementSpec(String guiElementClass, - Map guiElementParameters) - { - HTMLGUIElementSpec specification = null; - if ("server".equals(guiElementClass)) { - // TODO: add correct port handling - specification = new HTMLServerSpec(guiElementParameters.get("htmlId"), 0); - currentServerSpec = (HTMLServerSpec) specification; - } - - else { - String id = guiElementParameters.get("htmlId"); - if (id == null) { - HTMLPageElementSpec parentSpec = - (HTMLPageElementSpec) currentGUIElementTree.find(currentParentPath) - .getSpecification(); - id = parentSpec.getPage().getPagePath(); - } - - int index = -1; - String indexStr = guiElementParameters.get("index"); - - if ((indexStr != null) && (!"".equals(indexStr))) { - index = Integer.parseInt(indexStr); - } - String title = guiElementParameters.get("title"); - HTMLPageSpec page = new HTMLPageSpec(currentServerSpec, id, title); - specification = new HTMLPageElementSpec(page, guiElementClass, id, index); - } - - return specification; - } -} Index: unk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/OldHTMLLogParser.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/OldHTMLLogParser.java (revision 1068) +++ (revision ) @@ -1,448 +1,0 @@ -// Copyright 2012 Georg-August-Universität Göttingen, Germany -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package de.ugoe.cs.autoquest.plugin.html; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.logging.Level; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import de.ugoe.cs.autoquest.eventcore.Event; -import de.ugoe.cs.autoquest.eventcore.gui.DialogClose; -import de.ugoe.cs.autoquest.eventcore.gui.DialogOpen; -import de.ugoe.cs.autoquest.eventcore.gui.IInteraction; -import de.ugoe.cs.autoquest.eventcore.gui.KeyboardFocusChange; -import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonInteraction; -import de.ugoe.cs.autoquest.eventcore.gui.MouseClick; -import de.ugoe.cs.autoquest.eventcore.gui.Scroll; -import de.ugoe.cs.autoquest.eventcore.gui.TextInput; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException; -import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; -import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; -import de.ugoe.cs.autoquest.eventcore.guimodel.ITextArea; -import de.ugoe.cs.autoquest.eventcore.guimodel.ITextField; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageElementSpec; -import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPageSpec; -import de.ugoe.cs.util.FileTools; -import de.ugoe.cs.util.console.Console; - -/** - *

- * TODO comment - *

- * - * @author Patrick Harms - */ -public class OldHTMLLogParser { - - /** - *

- * Name and path of the robot filter. - *

- */ - private static final String ROBOTFILTERFILE = "data/robots/robotfilter.txt"; - - /** - *

- * Field that contains a regular expression that matches all robots - * contained in {@link #ROBOTFILTERFILE}. - *

- */ - private String robotRegex = null; - - /** - * - */ - private Pattern htmlElementPattern = Pattern.compile("(\\w+)(\\[(\\d+)\\]|\\(id=([\\w-]+)\\))"); - - /** - * - */ - private List> sequences = new ArrayList>(); - - /** - * - */ - private GUIModel guiModel = new GUIModel(); - - /** - *

- * TODO: comment - *

- * - * @param source - */ - public void parseFile(String source) throws IllegalArgumentException { - if (source == null) { - throw new IllegalArgumentException("source must not be null"); - } - - parseFile(new File(source)); - } - - /** - *

- * TODO: comment - *

- * - * @param source - */ - public void parseFile(File source) throws IllegalArgumentException { - if (source == null) { - throw new IllegalArgumentException("source must not be null"); - } - else if (!source.exists()) { - throw new IllegalArgumentException("source file does not exist"); - } - else if (!source.isFile()) { - throw new IllegalArgumentException("source is not a file"); - } - - BufferedReader reader = null; - - try { - reader = - new BufferedReader(new InputStreamReader(new FileInputStream(source), "UTF-8")); - - loadRobotRegex(); - - List sequence = new ArrayList(); - - int lineCounter = 0; - String line = reader.readLine(); - while ((line != null) && (!"".equals(line))) { - lineCounter++; - String[] values = line.substring(1, line.length() - 1).split("\" \""); - - String clientId = values[0]; - long timestamp = Long.parseLong(values[1]); - String title = values[2]; - String uriString = values[3]; - String agent = values[4]; - String eventName = values[5]; - String htmlElementPath = values[6]; - - List eventParameters = null; - if (values.length > 7) { - eventParameters = new ArrayList(); - - for (int i = 7; i < values.length; i++) { - eventParameters.add(values[i]); - } - } - - if (isRobot(agent)) { - // do not handle sessions of robots - Console.println("ignoring robot session: " + agent); - break; - } - - - try { - URL url = new URL(uriString); - IGUIElement guiElement = getGUIElement(url, title, htmlElementPath); - IInteraction interaction = - getInteraction(eventName, guiElement, eventParameters); - - if (interaction != null) { - Event event = - createEvent(clientId, interaction, guiElement, timestamp, agent); - sequence.add(event); - } - } - catch (MalformedURLException e) { - Console.traceln(Level.FINE, "Ignored line " + lineCounter + ": " + - e.getMessage()); - } - - line = reader.readLine(); - } - - Console.traceln(Level.INFO, "read user sequence with " + sequence.size() + - " events from " + source); - - sequences.add(sequence); - } - catch (Exception e) { - Console.printerrln("could not parse file " + source + ": " + e); - e.printStackTrace(); - } - } - - /** - *

- * TODO: comment - *

- * - * @return - */ - public Collection> getSequences() { - return sequences; - } - - /** - *

- * TODO: comment - *

- * - * @return - */ - public GUIModel getGuiModel() { - return guiModel; - } - - /** - *

- * Reads {@link #ROBOTFILTERFILE} and creates a regular expression that - * matches all the robots defined in the file. The regular expression is - * stored in the field {@link #robotRegex}. - *

- * - * @throws IOException - * thrown if there is a problem reading the robot filter - * @throws FileNotFoundException - * thrown if the robot filter is not found - */ - private void loadRobotRegex() throws IOException, FileNotFoundException { - String[] lines = FileTools.getLinesFromFile(ROBOTFILTERFILE); - StringBuilder regex = new StringBuilder(); - for (int i = 0; i < lines.length; i++) { - regex.append("(.*" + lines[i] + ".*)"); - if (i != lines.length - 1) { - regex.append('|'); - } - } - robotRegex = regex.toString(); - } - - /** - *

- * TODO: comment - *

- * - * @param htmlElementPath - * @return - * @throws GUIModelException - * @throws - */ - private IGUIElement getGUIElement(URL url, String title, String htmlElementPath) - throws GUIModelException - { - String[] pathElements = htmlElementPath.split("/"); - List guiElementPath = new ArrayList(); - - HTMLPageSpec page = new HTMLPageSpec(url, title); - - guiElementPath.add(page.getServer()); - guiElementPath.add(page); - - for (String pathElement : pathElements) { - if ((pathElement != null) && (!"".equals(pathElement))) { - Matcher matcher = htmlElementPattern.matcher(pathElement); - if (!matcher.matches()) { - throw new IllegalArgumentException("could not parse HTML element " + pathElement); - } - - String type = matcher.group(1); - String indexStr = matcher.group(3); - String id = matcher.group(4); - - int index = -1; - - if ((indexStr != null) && (!"".equals(indexStr))) { - index = Integer.parseInt(indexStr); - } - - guiElementPath.add(new HTMLPageElementSpec(page, type, id, index)); - } - } - - return guiModel.integratePath(guiElementPath, GUIElementFactory.getInstance()); - } - - /** - *

- * TODO: comment - *

- * - * @param eventName - * @param guiElement - * @param eventParameters - * @return - */ - private IInteraction getInteraction(String eventName, - IGUIElement guiElement, - List eventParameters) - { - IInteraction result = null; - - if ("onclick".equals(eventName)) { - int[] coordinates = - getCoordinateParameter(eventName, eventParameters, 0, "click coordinates"); - result = new MouseClick - (MouseButtonInteraction.Button.LEFT, coordinates[0], coordinates[1]); - } - else if ("onfocus".equals(eventName)) { - result = new KeyboardFocusChange(); - } - else if ("onscroll".equals(eventName)) { - int[] coordinates = - getCoordinateParameter(eventName, eventParameters, 0, "click coordinates"); - result = new Scroll(coordinates[0], coordinates[1]); - } - else if ("onchange".equals(eventName)) { - String value = getStringParameter(eventName, eventParameters, 0, "selected value"); - - if ((guiElement instanceof ITextArea) || (guiElement instanceof ITextField)) { - result = new TextInput(value, null); - } - else { - throw new IllegalArgumentException("can not handle onchange events on GUI " + - "elements of type " + guiElement.getClass()); - } - } - else if ("onload".equals(eventName)) { - result = new DialogOpen(); - } - else if ("onunload".equals(eventName)) { - result = new DialogClose(); - } - else if ("onbeforeunload".equals(eventName) || - "onpagehide".equals(eventName) || - "onpageshow".equals(eventName)) - { - Console.traceln(Level.FINE, "Ignored event name \"" + eventName + "\""); - } - else { - throw new IllegalArgumentException("unknown event name: \"" + eventName + "\""); - } - - return result; - } - - /** - *

- * TODO: comment - *

- * - * @param clientId - * @param interaction - * @param guiElement - * @param timestamp - * @param agent - * @return - */ - private Event createEvent(String clientId, - IInteraction interaction, - IGUIElement guiElement, - long timestamp, - String agent) - { - Event event = new Event(interaction, guiElement); - event.setParameter("clientId", clientId); - event.setParameter("agent", agent); - - event.setTimestamp(timestamp); - - return event; - } - - /** - *

- * TODO: comment - *

- * - * @param eventName - * @param eventParameters - * @param i - * @param string - * @return - */ - private String getStringParameter(String eventName, - List eventParameters, - int parameterIndex, - String parameterDesc) - throws IllegalArgumentException - { - String value = - eventParameters.size() > parameterIndex ? eventParameters.get(parameterIndex) : null; - - if (value == null) { - throw new IllegalArgumentException - (eventName + " event does not provide the " + parameterDesc); - } - - return value; - } - - /** - *

- * TODO: comment - *

- * - * @param eventName - * @param eventParameters - * @return - */ - private int[] getCoordinateParameter(String eventName, - List eventParameters, - int parameterIndex, - String parameterDesc) - { - String value = - getStringParameter(eventName, eventParameters, parameterIndex, parameterDesc); - - String[] intStrs = value.split(","); - - if ((intStrs == null) || (intStrs.length != 2)) { - throw new IllegalArgumentException("the " + parameterDesc + " of an " + eventName + - " event does not provide two correct coordinates"); - } - - try { - return new int[] { Integer.parseInt(intStrs[0]), Integer.parseInt(intStrs[1]) }; - } - catch (NumberFormatException e) { - throw new IllegalArgumentException("the coordinates provided as " + parameterDesc + - " of an " + eventName + " event are no numbers"); - } - } - - /** - *

- * Checks whether an agent is a robot. - *

- * - * @param agent - * agent that is checked - * @return true, if the agent is a robot; false otherwise - */ - private boolean isRobot(String agent) { - return agent.matches(robotRegex); - } - -} Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java (revision 1068) +++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java (revision 1069) @@ -23,4 +23,5 @@ import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonInteraction; import de.ugoe.cs.autoquest.eventcore.gui.MouseClick; +import de.ugoe.cs.autoquest.eventcore.gui.MouseDoubleClick; import de.ugoe.cs.autoquest.eventcore.gui.Scroll; import de.ugoe.cs.autoquest.eventcore.gui.TextInput; @@ -76,11 +77,18 @@ if ("onscroll".equals(eventName)) { - int[] coordinates = getCoordinateParameter(eventName, eventParameters); + int[] coordinates = + getCoordinateParameter("scrollX", "scrollY", eventName, eventParameters); + result = new Scroll(coordinates[0], coordinates[1]); } else if ("onclick".equals(eventName)) { - int[] coordinates = getCoordinateParameter(eventName, eventParameters); + int[] coordinates = getCoordinateParameter("X", "Y", eventName, eventParameters); result = new MouseClick(MouseButtonInteraction.Button.LEFT, coordinates[0], coordinates[1]); + } + else if ("ondblclick".equals(eventName)) { + int[] coordinates = getCoordinateParameter("X", "Y", eventName, eventParameters); + result = new MouseDoubleClick + (MouseButtonInteraction.Button.LEFT, coordinates[0], coordinates[1]); } else if ("onchange".equals(eventName)) { @@ -118,13 +126,19 @@ * @return */ - private int[] getCoordinateParameter(String eventName, Map eventParameters) { - String xCoord = eventParameters.get("X"); + private int[] getCoordinateParameter(String xParamName, + String yParamName, + String eventName, + Map eventParameters) + { + String xCoord = eventParameters.get(xParamName); if (xCoord == null) { - throw new IllegalArgumentException("eventParameters do not contain X coordinate."); + throw new IllegalArgumentException + ("eventParameters do not contain " + xParamName + " coordinate."); } - String yCoord = eventParameters.get("Y"); + String yCoord = eventParameters.get(yParamName); if (yCoord == null) { - throw new IllegalArgumentException("eventParameters do not contain Y coordinate."); + throw new IllegalArgumentException + ("eventParameters do not contain " + yParamName + " coordinate."); } @@ -134,5 +148,5 @@ } catch (NumberFormatException e) { - throw new IllegalArgumentException("the coordinates provided" + " of an " + eventName + + throw new IllegalArgumentException("the coordinates provided by an " + eventName + " event are no numbers"); } Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocument.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocument.java (revision 1069) +++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocument.java (revision 1069) @@ -0,0 +1,96 @@ +// Copyright 2012 Georg-August-Universität Göttingen, Germany +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package de.ugoe.cs.autoquest.plugin.html.guimodel; + +import de.ugoe.cs.autoquest.eventcore.guimodel.IDialog; + +/** + *

+ * TODO comment + *

+ * + * @author Patrick Harms + */ +public class HTMLDocument extends HTMLGUIElement implements IDialog { + + /** */ + private static final long serialVersionUID = 1L; + + /** + *

+ * TODO: comment + *

+ * + * @param specification + * @param parent + */ + public HTMLDocument(HTMLDocumentSpec specification, HTMLServer parent) { + super(specification, parent); + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Document(" + getPath() + ", \"" + getTitle() + "\")"; + } + + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement#getElementDescriptor() + */ + @Override + protected String getElementDescriptor() { + return "Document"; + } + + /** + *

+ * TODO: comment + *

+ * + * @return + */ + HTMLServerSpec getServer() { + return ((HTMLDocumentSpec) super.getSpecification()).getServer(); + } + + /** + *

+ * TODO: comment + *

+ * + * @return + */ + String getPath() { + return ((HTMLDocumentSpec) super.getSpecification()).getPath(); + } + + /** + *

+ * TODO: comment + *

+ * + * @return + */ + String getTitle() { + return ((HTMLDocumentSpec) super.getSpecification()).getTitle(); + } + +} Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocumentSpec.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocumentSpec.java (revision 1069) +++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocumentSpec.java (revision 1069) @@ -0,0 +1,140 @@ +// Copyright 2012 Georg-August-Universität Göttingen, Germany +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package de.ugoe.cs.autoquest.plugin.html.guimodel; + +import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; + +/** + *

+ * TODO comment + *

+ * + * @author Patrick Harms + */ +public class HTMLDocumentSpec extends HTMLGUIElementSpec implements IGUIElementSpec { + + /** */ + private static final long serialVersionUID = 1L; + + /** */ + private HTMLServerSpec server; + + /** */ + private String path; + + /** */ + private String query; + + /** */ + private String title; + + /** + *

+ * TODO: comment + *

+ * + * @param server + * @param pagePath + * @param pageTitle + */ + public HTMLDocumentSpec(HTMLServerSpec server, String path, String query, String title) { + super("document"); + + if (server == null) { + throw new IllegalArgumentException("server must not be null"); + } + else if (path == null) { + throw new IllegalArgumentException("pagePath must not be null"); + } + + this.server = server; + this.path = path; + this.query = query; + this.title = title; + } + + /* (non-Javadoc) + * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec#getSimilarity(IGUIElementSpec) + */ + @Override + public boolean getSimilarity(IGUIElementSpec other) { + if (other instanceof HTMLDocumentSpec) { + HTMLDocumentSpec otherSpec = (HTMLDocumentSpec) other; + + if (!super.getSimilarity(otherSpec)) { + return false; + } + else if (!server.getSimilarity(otherSpec.server)) { + return false; + } + else if (!path.equals(otherSpec.path)) { + return false; + } + else if (query != null ? !query.equals(otherSpec.query) : otherSpec.query != null) { + return false; + } + else { + return (title != null ? title.equals(otherSpec.title) : otherSpec.title == null); + } + } + + return false; + } + + /** + *

+ * TODO: comment + *

+ * + * @return + */ + public HTMLServerSpec getServer() { + return server; + } + + /** + *

+ * TODO: comment + *

+ * + * @return + */ + String getPath() { + return path; + } + + /** + *

+ * TODO: comment + *

+ * + * @return + */ + String getQuery() { + return query; + } + + /** + *

+ * TODO: comment + *

+ * + * @return + */ + String getTitle() { + return title; + } + +} Index: unk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPage.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPage.java (revision 1068) +++ (revision ) @@ -1,96 +1,0 @@ -// Copyright 2012 Georg-August-Universität Göttingen, Germany -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package de.ugoe.cs.autoquest.plugin.html.guimodel; - -import de.ugoe.cs.autoquest.eventcore.guimodel.IDialog; - -/** - *

- * TODO comment - *

- * - * @author Patrick Harms - */ -public class HTMLPage extends HTMLGUIElement implements IDialog { - - /** */ - private static final long serialVersionUID = 1L; - - /** - *

- * TODO: comment - *

- * - * @param specification - * @param parent - */ - public HTMLPage(HTMLPageSpec specification, HTMLServer parent) { - super(specification, parent); - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Page(" + getPagePath() + ", \"" + getPageTitle() + "\")"; - } - - /* - * (non-Javadoc) - * - * @see de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement#getElementDescriptor() - */ - @Override - protected String getElementDescriptor() { - return "Page"; - } - - /** - *

- * TODO: comment - *

- * - * @return - */ - HTMLServerSpec getServer() { - return ((HTMLPageSpec) super.getSpecification()).getServer(); - } - - /** - *

- * TODO: comment - *

- * - * @return - */ - String getPagePath() { - return ((HTMLPageSpec) super.getSpecification()).getPagePath(); - } - - /** - *

- * TODO: comment - *

- * - * @return - */ - String getPageTitle() { - return ((HTMLPageSpec) super.getSpecification()).getPageTitle(); - } - -} Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElement.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElement.java (revision 1068) +++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElement.java (revision 1069) @@ -47,5 +47,5 @@ * @param parent */ - public HTMLPageElement(HTMLPageElementSpec specification, HTMLPage parent) { + public HTMLPageElement(HTMLPageElementSpec specification, HTMLDocument parent) { super(specification, parent); } @@ -58,11 +58,11 @@ @Override public String toString() { - String str = getTag(); + String str = getTagName(); - if ((getTagId() != null) && (!"".equals(getTagId()))) { - str += "(id=\"" + getTagId() + "\")"; + if ((getHtmlId() != null) && (!"".equals(getHtmlId()))) { + str += "(id=\"" + getHtmlId() + "\")"; } else { - str += "[" + getTagIndex() + "]"; + str += "[" + getIndex() + "]"; } @@ -77,5 +77,5 @@ @Override protected String getElementDescriptor() { - return getTag(); + return getTagName(); } @@ -87,5 +87,5 @@ * @return */ - HTMLPageSpec getPage() { + HTMLDocumentSpec getPage() { return ((HTMLPageElementSpec) super.getSpecification()).getPage(); } @@ -98,6 +98,6 @@ * @return */ - String getTag() { - return ((HTMLPageElementSpec) super.getSpecification()).getTag(); + String getTagName() { + return ((HTMLPageElementSpec) super.getSpecification()).getTagName(); } @@ -109,6 +109,6 @@ * @return */ - String getTagId() { - return ((HTMLPageElementSpec) super.getSpecification()).getTagId(); + String getHtmlId() { + return ((HTMLPageElementSpec) super.getSpecification()).getHtmlId(); } @@ -120,6 +120,6 @@ * @return */ - int getTagIndex() { - return ((HTMLPageElementSpec) super.getSpecification()).getTagIndex(); + int getIndex() { + return ((HTMLPageElementSpec) super.getSpecification()).getIndex(); } Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElementSpec.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElementSpec.java (revision 1068) +++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElementSpec.java (revision 1069) @@ -30,11 +30,11 @@ /** */ - private HTMLPageSpec page; + private HTMLDocumentSpec page; /** */ - private String tag; + private String tagName; /** */ - private String id; + private String htmlId; /** */ @@ -50,14 +50,14 @@ * @param id */ - public HTMLPageElementSpec(HTMLPageSpec page, String tag, String id, int index) { - super(tag); + public HTMLPageElementSpec(HTMLDocumentSpec page, String tagName, String htmlId, int index) { + super(tagName); if (page == null) { throw new IllegalArgumentException("page must not be null"); } - else if (tag == null) { + else if (tagName == null) { throw new IllegalArgumentException("tag must not be null"); } - else if ((id == null) && (index < 0)) { + else if ((htmlId == null) && (index < 0)) { throw new IllegalArgumentException ("either id must not be null or the index must be greater or equal to 0"); @@ -65,6 +65,6 @@ this.page = page; - this.tag = tag; - this.id = id; + this.tagName = tagName; + this.htmlId = htmlId; this.index = index; } @@ -84,10 +84,10 @@ return false; } - else if (!tag.equals(otherSpec.tag)) { + else if (!tagName.equals(otherSpec.tagName)) { return false; } - if (id != null) { - return id.equals(otherSpec.id); + if (htmlId != null) { + return htmlId.equals(otherSpec.htmlId); } else if (index >= 0) { @@ -106,5 +106,5 @@ * @return */ - public HTMLPageSpec getPage() { + HTMLDocumentSpec getPage() { return page; } @@ -117,6 +117,6 @@ * @return */ - String getTag() { - return tag; + String getTagName() { + return tagName; } @@ -128,6 +128,6 @@ * @return */ - String getTagId() { - return id; + String getHtmlId() { + return htmlId; } @@ -139,5 +139,5 @@ * @return */ - int getTagIndex() { + int getIndex() { return index; } Index: unk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageSpec.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageSpec.java (revision 1068) +++ (revision ) @@ -1,151 +1,0 @@ -// Copyright 2012 Georg-August-Universität Göttingen, Germany -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package de.ugoe.cs.autoquest.plugin.html.guimodel; - -import java.net.URL; - -import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; - -/** - *

- * TODO comment - *

- * - * @author Patrick Harms - */ -public class HTMLPageSpec extends HTMLGUIElementSpec implements IGUIElementSpec { - - /** */ - private static final long serialVersionUID = 1L; - - /** */ - private HTMLServerSpec server; - - /** */ - private String pagePath; - - /** */ - private String pageTitle; - - /** - *

- * TODO: comment - *

- * - * @param server - * @param pagePath - * @param pageTitle - */ - public HTMLPageSpec(HTMLServerSpec server, String pagePath, String pageTitle) { - super("page"); - - if (server == null) { - throw new IllegalArgumentException("server must not be null"); - } - else if (pagePath == null) { - throw new IllegalArgumentException("pagePath must not be null"); - } -// else if (pageTitle == null) { -// throw new IllegalArgumentException("pageTitle must not be null"); -// } - - this.server = server; - this.pagePath = pagePath; - this.pageTitle = pageTitle; - } - - /** - *

- * TODO: comment - *

- * - * @param server - * @param pagePath - * @param pageTitle - */ - public HTMLPageSpec(URL pageURL, String pageTitle) { - super("page"); - - if (pageURL == null) { - throw new IllegalArgumentException("pageURL must not be null"); - } - else if (pageTitle == null) { - throw new IllegalArgumentException("pageTitle must not be null"); - } - - this.server = new HTMLServerSpec(pageURL); - this.pagePath = pageURL.getPath(); - this.pageTitle = pageTitle; - } - - /* (non-Javadoc) - * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec#getSimilarity(IGUIElementSpec) - */ - @Override - public boolean getSimilarity(IGUIElementSpec other) { - if (other instanceof HTMLPageSpec) { - HTMLPageSpec otherSpec = (HTMLPageSpec) other; - - if (!super.getSimilarity(otherSpec)) { - return false; - } - else if (!server.getSimilarity(otherSpec.server)) { - return false; - } - else if (!pagePath.equals(otherSpec.pagePath)) { - return false; - } - else { - return pageTitle.equals(otherSpec.pageTitle); - } - } - - return false; - } - - /** - *

- * TODO: comment - *

- * - * @return - */ - public HTMLServerSpec getServer() { - return server; - } - - /** - *

- * TODO: comment - *

- * - * @return - */ - public String getPagePath() { - return pagePath; - } - - /** - *

- * TODO: comment - *

- * - * @return - */ - String getPageTitle() { - return pageTitle; - } - -} Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLServerSpec.java =================================================================== --- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLServerSpec.java (revision 1068) +++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLServerSpec.java (revision 1069) @@ -14,6 +14,4 @@ package de.ugoe.cs.autoquest.plugin.html.guimodel; - -import java.net.URL; import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; @@ -58,22 +56,4 @@ this.host = host; this.port = port; - } - - /** - *

- * TODO: comment - *

- * - * @param pageURL - */ - public HTMLServerSpec(URL pageURL) { - super("server"); - - if (pageURL == null) { - throw new IllegalArgumentException("page URL must not be null"); - } - - this.host = pageURL.getHost(); - this.port = pageURL.getPort(); }