Clean up swarm tests to new API.

client/tests/client/samples/swarm/swarm_tests.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library('swarm_tests');
 
 #import('../../../../base/base.dart');
 #import('dart:html');
 #import('../../../../samples/swarm/swarmlib.dart');
 #import('../../../../testing/unittest/unittest.dart');
 #import('../../../../view/view.dart');
 #import('../../../../util/utilslib.dart');
 
-void main() {
-  new SwarmTests().run();

[Siggi Cherem (dart-lang), 2011/10/18 22:26:50]

it's so nice to get rid of this... 

[Bob Nystrom, 2011/10/18 23:10:50]

Yes!

-}
-
 // TODO(jmesserly): these would probably be easier to debug if they were written
 // in the WebKit layout test style, so we could easy compare that the DOM is
 // what we expect it to be after performing some simulated user actions.
 
-class SwarmTests extends UnitTestSuite {
-  Swarm swarm;
-  UIStateProxy state;
+void main() {
+  Swarm swarm = new Swarm();
+  UIStateProxy state = new UIStateProxy(swarm.sections);
+  swarm.state = state;
+  swarm.run();
 
-  SwarmTests() : super() {
-    swarm = new Swarm();
-    swarm.state = state = new UIStateProxy(swarm.sections);
-    swarm.run();
-  }
+  // TODO(jmesserly): should be adding the full stylesheet here
+  Dom.addStyle('''
+      .story-content {
+        -webkit-column-width: 300px;
+        -webkit-column-gap: 26px; /* 2em */
+      }''');
 
-  Element get storyNode() => swarm.frontView.storyView.node;
+  getStoryNode() => swarm.frontView.storyView.node;
 
-  View getView(Section section) {
+  getView(Section section) {
     return CollectionUtils.find(swarm.frontView.sections.childViews,
         (view) => view.section == section);
   }
 
-  Map<String, String> getHistory(Article article) {
+  getHistory(Article article) {
     final feed = article.dataSource;
     return {
       'section': CollectionUtils.find(swarm.sections,
           (s) => s.feeds.indexOf(feed, 0) >= 0).id,
       'feed': feed.id,
       'article': article.id
     };
   }
 
-  void setUpTestSuite() {
-    // TODO(jmesserly): should be adding the full stylesheet here
-    Dom.addStyle('''
-        .story-content {
-          -webkit-column-width: 300px;
-          -webkit-column-gap: 26px; /* 2em */
-        }''');
-    addTest(testBackButton);
-    addTest(testStoryView);
-    addTest(testSliderMenu);
-  }
-
-  /** Triggers the click event, like [http://api.jquery.com/click/] */
-  _click(Element element) {
-    // TODO(rnystrom): This should be on the DOM API somewhere.
-    MouseEvent event = document.createEvent('MouseEvents');
-    event.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0,
-        false, false, false, false, 0, null);
-    element.on.click.dispatch(event);
-  }
-
-  void testBackButton() {
+  test('BackButton', () {
     Expect.equals(null, swarm.frontView.storyView); // verify initial state
 
     // Make sure we've transitioned to the section
     // In the real app, this isn't needed because ConveyorView fires the
     // transition end event before we can click a story.
     SectionView section = getView(swarm.sections[0]);
     section.showSources();
 
     final item = swarm.sections[0].feeds[2].articles[1];
     state.loadFromHistory(getHistory(item));
 
     Expect.equals(item, state.currentArticle.value);
 
-    Expect.isFalse(storyNode.classes.contains(CSS.HIDDEN_STORY));
+    Expect.isFalse(getStoryNode().classes.contains(CSS.HIDDEN_STORY));
 
     state.loadFromHistory({});
 
     Expect.equals(null, state.currentArticle.value);
-    Expect.isTrue(storyNode.classes.contains(CSS.HIDDEN_STORY));
-  }
+    Expect.isTrue(getStoryNode().classes.contains(CSS.HIDDEN_STORY));
+  });
 
-  void testStoryView() {
+  test('StoryView', () {
     state.clearHistory();
 
-    Expect.isTrue(storyNode.classes.contains(CSS.HIDDEN_STORY));
+    Expect.isTrue(getStoryNode().classes.contains(CSS.HIDDEN_STORY));
 
     final dataSourceView =
         swarm.frontView.currentSection.dataSourceView.getSubview(0);
     final itemView = dataSourceView.itemsView.getSubview(0);
     // TODO(jacobr): remove  this null check. This is likely due to tests
     // running without the correct CSS to size the window so that some items
     // are visible.
     if (itemView != null) {
-      _click(itemView.node);
+      click(itemView.node);
       state.expectHistory([getHistory(itemView.item)]);
     }
-  }
+  });
 
-  void testSliderMenu() {
+  test('SliderMenu', () {
     Expect.equals(getView(swarm.sections[0]), swarm.frontView.currentSection);
 
     // Find the first slider menu item, and click on the one next after it.
-    _click(document.queryAll('.${CSS.SM_ITEM}')[1]);
+    click(document.queryAll('.${CSS.SM_ITEM}')[1]);
 
     Expect.equals(getView(swarm.sections[1]), swarm.frontView.currentSection);
 
     // Find the first menu item again and click on it.
-    _click(document.query('.${CSS.SM_ITEM}'));
+    click(document.query('.${CSS.SM_ITEM}'));
 
     Expect.equals(getView(swarm.sections[0]), swarm.frontView.currentSection);
-  }
+  });
 }
 
+/** Triggers the click event, like [http://api.jquery.com/click/] */
+click(Element element) {

[Siggi Cherem (dart-lang), 2011/10/18 22:26:50]

any reason to make this public (_click seemed ok)?

[Jennifer Messerly, 2011/10/18 22:46:01]

Agree.

But even better would be to have this in the DOM somewhere, as the TODO below
notes :)

[Bob Nystrom, 2011/10/18 23:10:50]

I made it public just because most of the other tests (and our libraries in
general) seem to not worry too much about making things private. I think private
matters a lot for a library intended to be re-used and consumed by other
programs, but maybe not so much for top-level programs or things like tests. 

+  // TODO(rnystrom): This should be on the DOM API somewhere.
+  MouseEvent event = document.createEvent('MouseEvents');
+  event.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0,
+      false, false, false, false, 0, null);
+  element.on.click.dispatch(event);
+}
+
+
 /** A proxy so we can intercept history calls */
 class UIStateProxy extends SwarmState {
   List<Map<String, String>> history;
 
   UIStateProxy(Sections dataModel) : super(dataModel) {
     clearHistory();
   }
 
   void pushToHistory() {
     history.add(toHistory());
     super.pushToHistory();
   }
 
   void clearHistory() {
     history = new List<Map<String, String>>();
   }
 
   void expectHistory(List<Map<String, String>> entries) {
     Expect.equals(entries.length, history.length);
     for (int i = 0; i < entries.length; i++) {
       Map e = entries[i];
       Map h = history[i];
       Expect.equals(e['article'], h['article']);
     }
     clearHistory();
   }
 }