OSDN Git Service
(root)
/
applistation
/
AppliStation.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
736baf3
)
na-get-lib,新構造タスクのキャンセル処理を修正。
author
ttp
<ttp@users.sourceforge.jp>
Sat, 7 May 2011 07:46:23 +0000
(16:46 +0900)
committer
ttp
<ttp@users.sourceforge.jp>
Sat, 7 May 2011 07:46:23 +0000
(16:46 +0900)
na-get-lib/NaGet.SubCommands.SubTask/NaGetSubTask.cs
patch
|
blob
|
history
na-get-lib/NaGet.SubCommands/NaGetTaskSet2.cs
patch
|
blob
|
history
na-get-lib/NaGet.SubCommands/NaGetUpdate2.cs
patch
|
blob
|
history
test-na-get-lib/NaGetSubTaskTest.cs
patch
|
blob
|
history
test-na-get-lib/NaGetTaskSet2Test.cs
patch
|
blob
|
history
diff --git
a/na-get-lib/NaGet.SubCommands.SubTask/NaGetSubTask.cs
b/na-get-lib/NaGet.SubCommands.SubTask/NaGetSubTask.cs
index
e1de4d8
..
d580bbb
100644
(file)
--- a/
na-get-lib/NaGet.SubCommands.SubTask/NaGetSubTask.cs
+++ b/
na-get-lib/NaGet.SubCommands.SubTask/NaGetSubTask.cs
@@
-63,6
+63,7
@@
namespace NaGet.SubCommands.SubTask
{
isRunning = false;
isCancelled = true;
{
isRunning = false;
isCancelled = true;
+ isDone = true;
}
/// <summary>
}
/// <summary>
diff --git
a/na-get-lib/NaGet.SubCommands/NaGetTaskSet2.cs
b/na-get-lib/NaGet.SubCommands/NaGetTaskSet2.cs
index
eb43c19
..
3a20d18
100644
(file)
--- a/
na-get-lib/NaGet.SubCommands/NaGetTaskSet2.cs
+++ b/
na-get-lib/NaGet.SubCommands/NaGetTaskSet2.cs
@@
-104,6
+104,7
@@
namespace NaGet.SubCommands
protected virtual void NotifyCancelled()
{
isCancelled = true;
protected virtual void NotifyCancelled()
{
isCancelled = true;
+ isDone = true;
}
/// <summary>
}
/// <summary>
diff --git
a/na-get-lib/NaGet.SubCommands/NaGetUpdate2.cs
b/na-get-lib/NaGet.SubCommands/NaGetUpdate2.cs
index
59856e2
..
8de79ac
100644
(file)
--- a/
na-get-lib/NaGet.SubCommands/NaGetUpdate2.cs
+++ b/
na-get-lib/NaGet.SubCommands/NaGetUpdate2.cs
@@
-83,7
+83,7
@@
namespace NaGet.SubCommands
if (cancelCalled) {
NotifyCancelled();
if (cancelCalled) {
NotifyCancelled();
- RaiseTaskSetEvent(TaskEventType.CANCELED,
string.Empty
);
+ RaiseTaskSetEvent(TaskEventType.CANCELED,
"キャンセルされました"
);
} else {
NotifyCompleted();
RaiseTaskSetEvent(TaskEventType.COMPLETED, string.Empty);
} else {
NotifyCompleted();
RaiseTaskSetEvent(TaskEventType.COMPLETED, string.Empty);
diff --git
a/test-na-get-lib/NaGetSubTaskTest.cs
b/test-na-get-lib/NaGetSubTaskTest.cs
index
95973bb
..
5cc142b
100644
(file)
--- a/
test-na-get-lib/NaGetSubTaskTest.cs
+++ b/
test-na-get-lib/NaGetSubTaskTest.cs
@@
-36,6
+36,7
@@
namespace test_na_get_lib
Assert.IsFalse(subtask.Cancelled);
subtask.CallNotifyCancelled();
Assert.IsTrue(subtask.Cancelled);
Assert.IsFalse(subtask.Cancelled);
subtask.CallNotifyCancelled();
Assert.IsTrue(subtask.Cancelled);
+ Assert.IsTrue(subtask.Done);
}
[Test]
}
[Test]
diff --git
a/test-na-get-lib/NaGetTaskSet2Test.cs
b/test-na-get-lib/NaGetTaskSet2Test.cs
index
e27ef07
..
f2350b0
100644
(file)
--- a/
test-na-get-lib/NaGetTaskSet2Test.cs
+++ b/
test-na-get-lib/NaGetTaskSet2Test.cs
@@
-234,6
+234,7
@@
namespace test_na_get_lib
Assert.AreEqual(true, cancelRetVal);
Assert.IsTrue(task.Cancelled);
Assert.IsFalse(task.Cancelable);
Assert.AreEqual(true, cancelRetVal);
Assert.IsTrue(task.Cancelled);
Assert.IsFalse(task.Cancelable);
+ Assert.IsTrue(task.Done);
// すでにキャンセルしているものにはキャンセルはできない
Assert.IsFalse(task.Cancel());
// すでにキャンセルしているものにはキャンセルはできない
Assert.IsFalse(task.Cancel());
@@
-264,6
+265,7
@@
namespace test_na_get_lib
Assert.AreEqual(true, cancelRetVal);
Assert.IsTrue(task.Cancelled);
Assert.IsFalse(task.Cancelable);
Assert.AreEqual(true, cancelRetVal);
Assert.IsTrue(task.Cancelled);
Assert.IsFalse(task.Cancelable);
+ Assert.IsTrue(task.Done);
Assert.IsTrue(((ASubTaskForEventTest) subTasks[0]).Cancelled);
Assert.IsFalse(((ASubTaskForEventTest) subTasks[0]).Cancelable);
Assert.IsTrue(cancelBlockPassed);
Assert.IsTrue(((ASubTaskForEventTest) subTasks[0]).Cancelled);
Assert.IsFalse(((ASubTaskForEventTest) subTasks[0]).Cancelable);
Assert.IsTrue(cancelBlockPassed);