hop: BaseConfig: renaming core add task functions

alexgann · Nov 24, 2012 · 8e5b9e2 · 8e5b9e2
1 parent 57f92f8
commit 8e5b9e2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/lib/hop.dart b/lib/hop.dart
@@ -32,10 +32,10 @@ void runHopCore() {
   });
 }
 
-void addTask(String name, Func1<TaskContext, bool> execFunc) {
-  _sharedConfig.addTask(name, execFunc);
+void addSyncTask(String name, Func1<TaskContext, bool> execFunc) {
+  _sharedConfig.addSync(name, execFunc);
 }
 
 void addAsyncTask(String name, TaskDefinition execFuture) {
-  _sharedConfig.addTaskAsync(name, execFuture);
+  _sharedConfig.addAsync(name, execFuture);
 }
diff --git a/lib/src/hop/base_config.dart b/lib/src/hop/base_config.dart
@@ -23,11 +23,11 @@ class BaseConfig {
     return _tasks[taskName];
   }
 
-  void addTask(String name, Func1<TaskContext, bool> func) {
+  void addSync(String name, Func1<TaskContext, bool> func) {
     _addTask(new Task.sync(name, func));
   }
 
-  void addTaskAsync(String name, TaskDefinition execFuture) {
+  void addAsync(String name, TaskDefinition execFuture) {
     _addTask(new Task.async(name, execFuture));
   }
 

diff --git a/test/hop/async_tests.dart b/test/hop/async_tests.dart
@@ -18,7 +18,7 @@ class AsyncTests {
                                      Action1<Future<bool>> completeHandler) {
     final name = 'task_name';
     final tasks = new BaseConfig();
-    tasks.addTaskAsync(name, taskFuture);
+    tasks.addAsync(name, taskFuture);
     tasks.freeze();
 
     final runner = new TestRunner(tasks, [name]);

diff --git a/test/hop/sync_tests.dart b/test/hop/sync_tests.dart
@@ -49,7 +49,7 @@ class SyncTests {
 
   static void _testBadParam() {
     final tasks = new BaseConfig();
-    tasks.addTask('good', (ctx) => true);
+    tasks.addSync('good', (ctx) => true);
     tasks.freeze();
 
     final runner = new TestRunner(tasks, ['bad']);
@@ -67,7 +67,7 @@ class SyncTests {
 
   static void _testNoParam() {
     final tasks = new BaseConfig();
-    tasks.addTask('good', (ctx) => true);
+    tasks.addSync('good', (ctx) => true);
     tasks.freeze();
 
     final runner = new TestRunner(tasks, []);
@@ -87,7 +87,7 @@ class SyncTests {
                             Action1<Future<bool>> completeHandler) {
     final name = 'task_name';
     final tasks = new BaseConfig();
-    tasks.addTask(name, task);
+    tasks.addSync(name, task);
     tasks.freeze();
 
     final runner = new TestRunner(tasks, [name]);

diff --git a/test/hop/task_list_tests.dart b/test/hop/task_list_tests.dart
@@ -4,25 +4,25 @@ class TaskListTests {
   static run() {
     test('dupe names are bad', () {
       final tasks = new BaseConfig();
-      tasks.addTask('task', (ctx) => true);
+      tasks.addSync('task', (ctx) => true);
 
-      expect(() => tasks.addTask('task', (ctx) => true), throwsArgumentError);
+      expect(() => tasks.addSync('task', (ctx) => true), throwsArgumentError);
     });
 
     test('reject bad task names', () {
       final tasks = new BaseConfig();
       final goodNames = const['a','aa','a_','a1','a_b','a_cool_test1_'];
 
       for(final n in goodNames) {
-        tasks.addTask(n, (ctx) => true);
+        tasks.addSync(n, (ctx) => true);
       }
 
       final badNames = const['', null, ' start white', '1 start num', '\rtest',
                              'end_white ', 'contains white', 'contains\$bad',
                              'test\r\test', 'UpperCase', 'camelCase'];
 
       for(final n in badNames) {
-        expect(() => tasks.addTask(n, (ctx) => true), throwsArgumentError);
+        expect(() => tasks.addSync(n, (ctx) => true), throwsArgumentError);
       }
     });
 
@@ -37,7 +37,7 @@ class TaskListTests {
       expect(() => tasks.freeze(), throws);
 
       // cannot add task when frozen
-      expect(() => tasks.addTask('task', (ctx) => true), throws);
+      expect(() => tasks.addSync('task', (ctx) => true), throws);
     });
   }
 }
diff --git a/tool/hop_runner.dart b/tool/hop_runner.dart
@@ -9,7 +9,7 @@ import '../test/harness_console.dart' as test_console;
 void main() {
   _assertKnownPath();
 
-  addTask('hello', (ctx) {
+  addSyncTask('hello', (ctx) {
     ctx.fine('Welcome to HOP!');
     return true;
   });