Add StatusCommandNanigaja

3 files changed, 14 insertions, 5 deletions

diff --git a/SmileEssenceTest/src/net/lacolaco/smileessence/command/CommandsTest.java b/SmileEssenceTest/src/net/lacolaco/smileessence/command/CommandsTest.java
index 52795ed2..6bec1835 100644
--- a/SmileEssenceTest/src/net/lacolaco/smileessence/command/CommandsTest.java
+++ b/SmileEssenceTest/src/net/lacolaco/smileessence/command/CommandsTest.java
@@ -33,6 +33,7 @@ import net.lacolaco.smileessence.command.event.EventCommandReply;
 import net.lacolaco.smileessence.command.message.MessageCommand;
 import net.lacolaco.smileessence.command.message.MessageCommandReply;
 import net.lacolaco.smileessence.command.status.StatusCommand;
+import net.lacolaco.smileessence.command.status.StatusCommandNanigaja;
 import net.lacolaco.smileessence.command.status.StatusCommandReply;
 import net.lacolaco.smileessence.command.user.UserCommand;
 import net.lacolaco.smileessence.command.user.UserCommandReply;
@@ -78,6 +79,8 @@ public class CommandsTest extends ActivityInstrumentationTestCase2<MainActivity>
         assertEquals(status.getId(), PostState.getState().getInReplyToStatusID());
         assertEquals(status.getUser().getScreenName(), PostState.getState().getInReplyToScreenName());
         assertEquals(status.getText(), PostState.getState().getInReplyToText());
+        StatusCommandNanigaja nanigaja = new StatusCommandNanigaja(activity, status, account);
+        assertEquals("@laco0416_2 な～にがテスト #test http://t.co/nd7Bzal2EU http://t.co/yANfRHC4KWじゃ", StatusCommandNanigaja.build(activity, status, account));
     }
 
     public void testUserCommand() throws Exception
diff --git a/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/TweetBuilderTest.java b/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/TweetBuilderTest.java
index 8f60d6c2..f8ddd1bb 100644
--- a/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/TweetBuilderTest.java
+++ b/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/TweetBuilderTest.java
@@ -52,8 +52,8 @@ public class TweetBuilderTest extends InstrumentationTestCase
         builder.appendText(" #test");
         assertEquals("@laco0416 test #test", builder.buildText());
         builder.setInReplyToStatusID(status.getInReplyToStatusId());
-        assertEquals(status.getInReplyToStatusId(), builder.toStatusUpdate().getInReplyToStatusId());
+        assertEquals(status.getInReplyToStatusId(), builder.build().getInReplyToStatusId());
         builder.setMediaPath("");
-        assertNotNull(builder.toStatusUpdate());
+        assertNotNull(builder.build());
     }
 }
diff --git a/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/task/UpdateStatusTaskTest.java b/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/task/UpdateStatusTaskTest.java
index f3b2a7f2..13b02a0c 100644
--- a/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/task/UpdateStatusTaskTest.java
+++ b/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/task/UpdateStatusTaskTest.java
@@ -24,7 +24,8 @@
 
 package net.lacolaco.smileessence.twitter.task;
 
-import android.test.InstrumentationTestCase;
+import android.test.ActivityInstrumentationTestCase2;
+import net.lacolaco.smileessence.activity.MainActivity;
 import net.lacolaco.smileessence.twitter.TwitterApi;
 import net.lacolaco.smileessence.util.TwitterMock;
 import twitter4j.StatusUpdate;
@@ -33,11 +34,16 @@ import twitter4j.Twitter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-public class UpdateStatusTaskTest extends InstrumentationTestCase
+public class UpdateStatusTaskTest extends ActivityInstrumentationTestCase2<MainActivity>
 {
 
     Twitter twitter;
 
+    public UpdateStatusTaskTest()
+    {
+        super(MainActivity.class);
+    }
+
     @Override
     public void setUp() throws Exception
     {
@@ -48,7 +54,7 @@ public class UpdateStatusTaskTest extends InstrumentationTestCase
     public void testUpdateStatus() throws Exception
     {
         StatusUpdate update = new StatusUpdate(String.format("UpdateStatusTest %s", new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date())));
-        UpdateStatusTask task = new UpdateStatusTask(twitter, update);
+        TweetTask task = new TweetTask(twitter, update, getActivity());
         task.execute();
         assertEquals(update.getStatus(), task.get().getText());
     }