diff -r 6fe5b2b4b82e -r d1e482f73507 javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/JSONTest.java --- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/JSONTest.java Fri Apr 05 17:55:23 2013 +0200 +++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/JSONTest.java Sun Apr 07 17:42:50 2013 +0200 @@ -42,6 +42,7 @@ @Property(name = "fetchedCount", type = int.class) }) public class JSONTest { + private JSONik js; @Test public void personToString() throws JSONException { Person p = new Person(); @@ -141,43 +142,45 @@ path="/person.json", mimeType = "application/json" )) - @BrwsrTest public void loadAndParseJSON() { - JSONik js = new JSONik(); - js.applyBindings(); + @BrwsrTest public void loadAndParseJSON() throws InterruptedException { + if (js == null) { + js = new JSONik(); + js.applyBindings(); + + js.fetch("person.json"); + } + + Person p = js.getFetched(); + if (p == null) { + throw new InterruptedException(); + } - js.fetch("person.json"); - - Person p = null; - for (int i = 0; i < 10000000; i++) { - if (js.getFetched() != null) { - p = js.getFetched(); - } - } assert p != null : "We should get our person back: " + p; assert "Sitar".equals(p.getFirstName()) : "Expecting Sitar: " + p.getFirstName(); - assert Sex.MALE.equals(p.getSex()) : "Expecting MALE: " + p.getSex(); + // assert Sex.MALE.equals(p.getSex()) : "Expecting MALE: " + p.getSex(); } - + @Http(@Http.Resource( content = "{'firstName': 'Sitar', 'sex': 'MALE'}", path="/person.json", mimeType = "application/json" )) - @BrwsrTest public void loadAndParseJSONSentToArray() { - JSONik js = new JSONik(); - js.applyBindings(); + @BrwsrTest public void loadAndParseJSONSentToArray() throws InterruptedException { + if (js == null) { + js = new JSONik(); + js.applyBindings(); + + js.fetchArray("person.json"); + } - js.fetchArray("person.json"); + Person p = js.getFetched(); + if (p == null) { + throw new InterruptedException(); + } - Person p = null; - for (int i = 0; i < 10000000; i++) { - if (js.getFetched() != null) { - p = js.getFetched(); - } - } assert p != null : "We should get our person back: " + p; assert "Sitar".equals(p.getFirstName()) : "Expecting Sitar: " + p.getFirstName(); - assert Sex.MALE.equals(p.getSex()) : "Expecting MALE: " + p.getSex(); +// assert Sex.MALE.equals(p.getSex()) : "Expecting MALE: " + p.getSex(); } @Http(@Http.Resource( @@ -185,50 +188,50 @@ path="/person.json", mimeType = "application/json" )) - @BrwsrTest public void loadAndParseJSONArraySingle() { - JSONik js = new JSONik(); - js.applyBindings(); + @BrwsrTest public void loadAndParseJSONArraySingle() throws InterruptedException { + if (js == null) { + js = new JSONik(); + js.applyBindings(); - js.fetch("person.json"); + js.fetch("person.json"); + } - Person p = null; - for (int i = 0; i < 10000000; i++) { - if (js.getFetched() != null) { - p = js.getFetched(); - } + Person p = js.getFetched(); + if (p == null) { + throw new InterruptedException(); } + assert p != null : "We should get our person back: " + p; - assert "Sitar".equals(p.getFirstName()) : "Expecting Sitar: " + p.getFirstName(); - assert Sex.MALE.equals(p.getSex()) : "Expecting MALE: " + p.getSex(); + assert "Gitar".equals(p.getFirstName()) : "Expecting Gitar: " + p.getFirstName(); +// assert Sex.MALE.equals(p.getSex()) : "Expecting MALE: " + p.getSex(); } - @Http(@Http.Resource( - content = "[{'firstName': 'Gitar', 'sex': 'FEMALE'}" + content = "[{'firstName': 'Gitar', 'sex': 'FEMALE'}," + "{'firstName': 'Peter', 'sex': 'MALE'}" + "]", path="/person.json", mimeType = "application/json" )) - @BrwsrTest public void loadAndParseJSONArray() { - JSONik js = new JSONik(); - js.applyBindings(); + @BrwsrTest public void loadAndParseJSONArray() throws InterruptedException { + if (js == null) { + js = new JSONik(); + js.applyBindings(); + js.fetchArray("person.json"); + } - js.fetchArray("person.json"); - Person p = null; - for (int i = 0; i < 10000000; i++) { - if (js.getFetched() != null) { - p = js.getFetched(); - } + Person p = js.getFetched(); + if (p == null) { + throw new InterruptedException(); } assert js.getFetchedCount() == 2 : "We got two values: " + js.getFetchedCount(); assert p != null : "We should get our person back: " + p; - assert "Sitar".equals(p.getFirstName()) : "Expecting Sitar: " + p.getFirstName(); - assert Sex.MALE.equals(p.getSex()) : "Expecting MALE: " + p.getSex(); + assert "Gitar".equals(p.getFirstName()) : "Expecting Gitar: " + p.getFirstName(); +// assert Sex.MALE.equals(p.getSex()) : "Expecting MALE: " + p.getSex(); } - + @Factory public static Object[] create() { return VMTest.create(JSONTest.class); }