Revision: 6030 Author: [email protected] Date: Fri Aug 28 14:08:33 2009 Log: Adds more detailed assertions to RunAsyncMetricsIntegrationTest.
Review by: jlabanca (desk check) http://code.google.com/p/google-web-toolkit/source/detail?r=6030 Modified: /trunk/user/test/com/google/gwt/dev/jjs/test/RunAsyncMetricsIntegrationTest.java ======================================= --- /trunk/user/test/com/google/gwt/dev/jjs/test/RunAsyncMetricsIntegrationTest.java Thu Aug 20 11:38:19 2009 +++ /trunk/user/test/com/google/gwt/dev/jjs/test/RunAsyncMetricsIntegrationTest.java Fri Aug 28 14:08:33 2009 @@ -164,7 +164,7 @@ private void checkMetricsWithCodeSplitting() { int lastMillis; { - LightweightMetricsEvent event = lwmObserver.events.remove(); + LightweightMetricsEvent event = nextEvent("leftoversDownload-begin"); assertEquals(getJunitModuleName(), event.getModuleName()); assertEquals("leftoversDownload", event.getEvtGroup()); assertEquals("begin", event.getType()); @@ -173,7 +173,7 @@ lastMillis = event.getMillis(); } { - LightweightMetricsEvent event = lwmObserver.events.remove(); + LightweightMetricsEvent event = nextEvent("leftoversDownload-end"); assertEquals(getJunitModuleName(), event.getModuleName()); assertEquals("leftoversDownload", event.getEvtGroup()); assertEquals("end", event.getType()); @@ -182,7 +182,7 @@ lastMillis = event.getMillis(); } { - LightweightMetricsEvent event = lwmObserver.events.remove(); + LightweightMetricsEvent event = nextEvent("download1-begin"); assertEquals(getJunitModuleName(), event.getModuleName()); assertEquals("download1", event.getEvtGroup()); assertEquals("begin", event.getType()); @@ -191,7 +191,7 @@ lastMillis = event.getMillis(); } { - LightweightMetricsEvent event = lwmObserver.events.remove(); + LightweightMetricsEvent event = nextEvent("download1-end"); assertEquals(getJunitModuleName(), event.getModuleName()); assertEquals("download1", event.getEvtGroup()); assertEquals("end", event.getType()); @@ -200,7 +200,7 @@ lastMillis = event.getMillis(); } { - LightweightMetricsEvent event = lwmObserver.events.remove(); + LightweightMetricsEvent event = nextEvent("runCallbacks1-begin"); assertEquals(getJunitModuleName(), event.getModuleName()); assertEquals("runCallbacks1", event.getEvtGroup()); assertEquals("begin", event.getType()); @@ -208,7 +208,7 @@ lastMillis = event.getMillis(); } { - LightweightMetricsEvent event = lwmObserver.events.remove(); + LightweightMetricsEvent event = nextEvent("runCallbacks1-end"); assertEquals(getJunitModuleName(), event.getModuleName()); assertEquals("runCallbacks1", event.getEvtGroup()); assertEquals("end", event.getType()); @@ -216,6 +216,15 @@ lastMillis = event.getMillis(); } } + + /** + * Remove the next event from {...@link #lwmObserver}. If there are no more + * events, fail with the specified message. + */ + private LightweightMetricsEvent nextEvent(String description) { + assertTrue("Missing event: " + description, !lwmObserver.events.isEmpty()); + return lwmObserver.events.remove(); + } /** * Check the LWM assuming no code splitting happened. @@ -224,7 +233,7 @@ int lastMillis; { - LightweightMetricsEvent event = lwmObserver.events.remove(); + LightweightMetricsEvent event = nextEvent("noDownloadNeeded-begin"); assertEquals(getJunitModuleName(), event.getModuleName()); assertEquals("noDownloadNeeded", event.getEvtGroup()); assertEquals("begin", event.getType()); @@ -232,7 +241,7 @@ lastMillis = event.getMillis(); } { - LightweightMetricsEvent event = lwmObserver.events.remove(); + LightweightMetricsEvent event = nextEvent("noDownloadNeeded-end"); assertEquals(getJunitModuleName(), event.getModuleName()); assertEquals("noDownloadNeeded", event.getEvtGroup()); assertEquals("end", event.getType()); --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
