# HG changeset patch # User Jaroslav Tulach # Date 1367857262 -7200 # Node ID 8af592baceb7afcfa4a7c2085eee000259e42cf3 # Parent fc4fc1633445655828381da6207ce3826303b50c# Parent 24b95d90955a0334881a77ccc703f13eadac1916 Merge with another head on elements diff -r fc4fc1633445 -r 8af592baceb7 javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ElementGeneratorTest.java --- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ElementGeneratorTest.java Thu May 02 14:56:25 2013 +0200 +++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ElementGeneratorTest.java Mon May 06 18:21:02 2013 +0200 @@ -18,13 +18,20 @@ package org.apidesign.bck2brwsr.htmlpage; import java.util.Map; -import static org.testng.Assert.*; +import org.apidesign.bck2brwsr.core.JavaScriptBody; +import org.apidesign.bck2brwsr.htmlpage.api.Page; +import org.apidesign.bck2brwsr.vmtest.BrwsrTest; +import org.apidesign.bck2brwsr.vmtest.HtmlFragment; +import org.apidesign.bck2brwsr.vmtest.VMTest; +import static org.testng.Assert.assertEquals; +import org.testng.annotations.Factory; import org.testng.annotations.Test; /** * * @author Jan Horvath */ +@Page(xhtml = "Elements.html") public class ElementGeneratorTest { @Test public void testGetAttributes() { @@ -32,4 +39,25 @@ Map attrs = gen.getAttributes("input"); assertEquals(attrs.get("width"), "Integer", "Expected type of width attribute is Integer"); } + + @HtmlFragment( + "" + + "\n" + ) + @BrwsrTest public void testInnerHTML() { + Elements e = new Elements(); + e.mySpan.setText("inserted text"); + String in = getInnerHTML("inserted"); + assert "inserted text".equals(in) : "Inserted element was not found"; + } + + @JavaScriptBody(args = { "id" }, body = + "var e = window.document.getElementById(id);\n " + + "return e.innerHTML;" + ) + private static native String getInnerHTML(String id); + + @Factory public static Object[] create() { + return VMTest.create(ElementGeneratorTest.class); + } } diff -r fc4fc1633445 -r 8af592baceb7 javaquery/api/src/test/resources/org/apidesign/bck2brwsr/htmlpage/Elements.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/javaquery/api/src/test/resources/org/apidesign/bck2brwsr/htmlpage/Elements.html Mon May 06 18:21:02 2013 +0200 @@ -0,0 +1,31 @@ + + + + + + Elements + + + + empty + + +