Skip to content

Commit

Permalink
Cleaned up imports (unused and missing) and tweaked test (Ch.2 to 6)
Browse files Browse the repository at this point in the history
 - Cleaned up imports, unused and missing (Ch.2 to 6).
 - Adjusted called to Recipe constructor in main_test (Ch.5&6).
 - Chose not to touch Chapter 7 code given that there are other pending
changes for it.
  • Loading branch information
chalin committed Jan 28, 2014
1 parent 2f448fc commit fdb7efa
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 10 deletions.
1 change: 0 additions & 1 deletion Chapter_02/test/main_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ library main_test;

import 'package:unittest/unittest.dart';
import 'package:di/di.dart';
import 'package:di/dynamic_injector.dart';
import 'package:angular/angular.dart';
import 'package:angular/mock/module.dart';

Expand Down
3 changes: 2 additions & 1 deletion Chapter_03/test/main_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ library main_test;

import 'package:unittest/unittest.dart';
import 'package:di/di.dart';
import 'package:di/dynamic_injector.dart';
import 'package:angular/angular.dart';
import 'package:angular/mock/module.dart';
import 'package:angular_dart_demo/recipe_book.dart';
import 'package:angular_dart_demo/rating/rating_component.dart';

import '../web/main.dart';

Expand Down
3 changes: 2 additions & 1 deletion Chapter_04/test/main_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ library main_test;

import 'package:unittest/unittest.dart';
import 'package:di/di.dart';
import 'package:di/dynamic_injector.dart';
import 'package:angular/angular.dart';
import 'package:angular/mock/module.dart';
import 'package:angular_dart_demo/recipe_book.dart';
import 'package:angular_dart_demo/rating/rating_component.dart';

import '../web/main.dart';

Expand Down
9 changes: 6 additions & 3 deletions Chapter_05/test/main_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ library main_test;

import 'package:unittest/unittest.dart';
import 'package:di/di.dart';
import 'package:di/dynamic_injector.dart';
import 'package:angular/angular.dart';
import 'package:angular/mock/module.dart';
import 'package:angular_dart_demo/recipe_book.dart';
import 'package:angular_dart_demo/recipe.dart';
import 'package:angular_dart_demo/filter/category_filter.dart';
import 'package:angular_dart_demo/rating/rating_component.dart';

import '../web/main.dart';

Expand Down Expand Up @@ -73,8 +76,8 @@ main() {

group('categoryFilter', () {
test('should return subset', inject((CategoryFilter filter) {
var r1 = new Recipe(null, 'C1', null, null, null);
var r2 = new Recipe(null, 'C2', null, null, null);
var r1 = new Recipe(null, 'C1', null, null, null, null, null);
var r2 = new Recipe(null, 'C2', null, null, null, null, null);
var list = [r1, r2];
var map = {"C1": false, "C2": true};
expect(filter(list, map), equals([r2]));
Expand Down
1 change: 0 additions & 1 deletion Chapter_06/lib/component/search_recipe_component.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
library search_recipe_component;

import '../service/recipe.dart';
import 'package:angular/angular.dart';

@NgComponent(
Expand Down
8 changes: 6 additions & 2 deletions Chapter_06/test/main_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import 'package:unittest/unittest.dart';
import 'package:di/di.dart';
import 'package:angular/angular.dart';
import 'package:angular/mock/module.dart';
import 'package:angular_dart_demo/recipe_book.dart';
import 'package:angular_dart_demo/filter/category_filter.dart';
import 'package:angular_dart_demo/rating/rating_component.dart';
import 'package:angular_dart_demo/service/recipe.dart';

import '../web/main.dart';

Expand Down Expand Up @@ -73,8 +77,8 @@ main() {

group('categoryFilter', () {
test('should return subset', inject((CategoryFilter filter) {
var r1 = new Recipe(null, null, 'C1', null, null, null);
var r2 = new Recipe(null, null, 'C2', null, null, null);
var r1 = new Recipe(null, null, 'C1', null, null, null, null);
var r2 = new Recipe(null, null, 'C2', null, null, null, null);
var list = [r1, r2];
var map = {"C1": false, "C2": true};
expect(filter(list, map), equals([r2]));
Expand Down
1 change: 0 additions & 1 deletion Chapter_06/web/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import 'package:angular_dart_demo/filter/category_filter.dart';
import 'package:angular_dart_demo/rating/rating_component.dart';
import 'package:angular_dart_demo/tooltip/tooltip_directive.dart';
import 'package:angular_dart_demo/service/query_service.dart';
import 'package:angular_dart_demo/service/recipe.dart';
import 'package:angular_dart_demo/routing/recipe_book_router.dart';
import 'package:angular_dart_demo/component/view_recipe_component.dart';
import 'package:angular_dart_demo/component/search_recipe_component.dart';
Expand Down

0 comments on commit fdb7efa

Please sign in to comment.