From f2a60fa635ea442e2b14fc18110ccc98606b0c8d Mon Sep 17 00:00:00 2001
From: Hixie <github.com@spam.hixie.ch>
Date: Fri, 24 Jul 2015 14:42:36 -0700
Subject: [PATCH] Fix test breakage (stocks test imports stocks app differently
 than a recent checkin expected).

---
 sky/sdk/example/stocks/lib/main.dart       |  6 ++----
 sky/sdk/example/stocks/lib/stock_data.dart | 10 +++++++---
 sky/sdk/lib/editing/input.dart             |  4 ++--
 sky/sdk/lib/widgets/radio.dart             |  4 ++--
 sky/sdk/lib/widgets/toggleable.dart        |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/sky/sdk/example/stocks/lib/main.dart b/sky/sdk/example/stocks/lib/main.dart
index 8fcba1829..d8c653baa 100644
--- a/sky/sdk/example/stocks/lib/main.dart
+++ b/sky/sdk/example/stocks/lib/main.dart
@@ -4,7 +4,6 @@
 
 library stocks;
 
-import 'dart:convert';
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 
@@ -17,8 +16,6 @@ import 'package:sky/widgets/theme.dart';
 import 'package:sky/widgets/widget.dart';
 import 'package:sky/widgets/task_description.dart';
 import 'package:sky/rendering/box.dart';
-import 'package:sky/mojo/net/fetch.dart';
-import 'package:sky/mojo/asset_bundle.dart';
 import 'package:sky/editing/input.dart';
 import 'package:sky/widgets/drawer.dart';
 import 'package:sky/widgets/drawer_divider.dart';
@@ -49,8 +46,9 @@ import 'package:sky/widgets/switch.dart';
 //TODO(jimsimon): Is this needed?
 export 'package:sky/widgets/popup_menu.dart' show PopupMenuStatus;
 
+import 'stock_data.dart';
+
 part 'stock_arrow.dart';
-part 'stock_data.dart';
 part 'stock_home.dart';
 part 'stock_list.dart';
 part 'stock_menu.dart';
diff --git a/sky/sdk/example/stocks/lib/stock_data.dart b/sky/sdk/example/stocks/lib/stock_data.dart
index 75e0d085b..00c9db0fe 100644
--- a/sky/sdk/example/stocks/lib/stock_data.dart
+++ b/sky/sdk/example/stocks/lib/stock_data.dart
@@ -2,14 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of stocks;
-
 // Snapshot from http://www.nasdaq.com/screening/company-list.aspx
 // Fetched 2/23/2014.
 // "Symbol","Name","LastSale","MarketCap","IPOyear","Sector","industry","Summary Quote",
 // Data in stock_data.json
 
-final Random _rng = new Random();
+import 'dart:convert';
+import 'dart:math' as math;
+
+import 'package:sky/mojo/asset_bundle.dart';
+import 'package:sky/mojo/net/fetch.dart';
+
+final math.Random _rng = new math.Random();
 
 class Stock {
   String symbol;
diff --git a/sky/sdk/lib/editing/input.dart b/sky/sdk/lib/editing/input.dart
index 0f0e3e521..e9f806034 100644
--- a/sky/sdk/lib/editing/input.dart
+++ b/sky/sdk/lib/editing/input.dart
@@ -10,7 +10,7 @@ import 'package:sky/widgets/basic.dart';
 import 'package:sky/widgets/focus.dart';
 import 'package:sky/widgets/theme.dart';
 
-typedef void ValueChanged(value);
+typedef void StringValueChanged(String value);
 
 // TODO(eseidel): This isn't right, it's 16px on the bottom:
 // http://www.google.com/design/spec/components/text-fields.html#text-fields-single-line-text-field
@@ -25,7 +25,7 @@ class Input extends StatefulComponent {
   }): super(key: key);
 
   String placeholder;
-  ValueChanged onChanged;
+  StringValueChanged onChanged;
 
   String _value = '';
   EditableString _editableValue;
diff --git a/sky/sdk/lib/widgets/radio.dart b/sky/sdk/lib/widgets/radio.dart
index 16e8f69f4..1a77d5120 100644
--- a/sky/sdk/lib/widgets/radio.dart
+++ b/sky/sdk/lib/widgets/radio.dart
@@ -12,7 +12,7 @@ import 'package:sky/widgets/theme.dart';
 const sky.Color _kLightOffColor = const sky.Color(0x8A000000);
 const sky.Color _kDarkOffColor = const sky.Color(0xB2FFFFFF);
 
-typedef void ValueChanged(value);
+typedef RadioValueChanged(Object value);
 
 class Radio extends ButtonBase {
 
@@ -25,7 +25,7 @@ class Radio extends ButtonBase {
 
   Object value;
   Object groupValue;
-  ValueChanged onChanged;
+  RadioValueChanged onChanged;
 
   void syncFields(Radio source) {
     value = source.value;
diff --git a/sky/sdk/lib/widgets/toggleable.dart b/sky/sdk/lib/widgets/toggleable.dart
index 61ceab4c6..4e1966274 100644
--- a/sky/sdk/lib/widgets/toggleable.dart
+++ b/sky/sdk/lib/widgets/toggleable.dart
@@ -10,7 +10,7 @@ import 'package:sky/animation/curves.dart';
 import 'package:sky/widgets/animated_component.dart';
 import 'package:sky/widgets/basic.dart';
 
-typedef void ValueChanged(value);
+typedef void ValueChanged(bool value);
 
 const Duration _kCheckDuration = const Duration(milliseconds: 200);
 
-- 
GitLab