From 48ca51999936297f88f9541cca60f5453b970f10 Mon Sep 17 00:00:00 2001
From: yuki <yuki@bdf3b611-c98c-6041-8292-703d9c9adbe7>
Date: Mon, 1 Feb 2010 15:22:32 +0000
Subject: [PATCH] =?utf8?q?=E5=85=AC=E5=BC=8F=E5=8B=95=E7=94=BB=E3=81=AE?=
 =?utf8?q?=E8=91=97=E8=80=85=E5=8F=96=E5=BE=97(null=E3=81=AB=E3=81=AA?=
 =?utf8?q?=E3=82=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://192.168.11.7/svn/repository/NicoBrowser/branches/dev20100201_comment_download@278 bdf3b611-c98c-6041-8292-703d9c9adbe7
---
 src/nicobrowser/util/Util.java           |  6 +++++-
 test/nicobrowser/NicoHttpClientTest.java | 11 ++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/nicobrowser/util/Util.java b/src/nicobrowser/util/Util.java
index c313202..ddf6e77 100644
--- a/src/nicobrowser/util/Util.java
+++ b/src/nicobrowser/util/Util.java
@@ -66,6 +66,10 @@ public class Util {
      * @return ユーザ名. 取得できなければnull.
      */
     public static String getUserName(InputStream is) {
-        return ui.getUserName(is);
+        String userName = ui.getUserName(is);
+        if ("".equals(userName)) {
+            userName = null;
+        }
+        return userName;
     }
 }
diff --git a/test/nicobrowser/NicoHttpClientTest.java b/test/nicobrowser/NicoHttpClientTest.java
index 059304a..23fa797 100644
--- a/test/nicobrowser/NicoHttpClientTest.java
+++ b/test/nicobrowser/NicoHttpClientTest.java
@@ -30,6 +30,7 @@ public class NicoHttpClientTest {
     static final String OK_MAIL = "niconico.senyou@live.jp";
     static final String OK_PASS = "piyopiyo";
     static final String OK_LIST_NO = "3693055";
+    static final String OFFICIAL_VIDEO = "so8799877";
     private NicoHttpClient instance;
 
     public NicoHttpClientTest() {
@@ -159,7 +160,6 @@ public class NicoHttpClientTest {
     public void getVideoInfo_Official() throws URISyntaxException, HttpException, InterruptedException, IOException {
         System.out.println("getVideoInfo_Official");
         instance.login(OK_MAIL, OK_PASS);
-        final String OFFICIAL_VIDEO = "so8799877";
         VideoInfo vi = instance.getVideoInfo(OFFICIAL_VIDEO);
         assertNotSame(OFFICIAL_VIDEO, vi.getRealVideoId());
     }
@@ -206,6 +206,15 @@ public class NicoHttpClientTest {
     }
 
     @Test
+    public void getFlvFile_Official() throws IOException, URISyntaxException, HttpException, InterruptedException {
+        // 公式動画(ビデオIDが実際と異なる)のダウンロード
+        instance.login(OK_MAIL, OK_PASS);
+        GetFlvResult result = instance.getFlvFile(OFFICIAL_VIDEO);
+        assertNotSame(Status.GET_INFO, result.getStatus());
+        assertNull("公式動画からは著者は取得できない", result.getAuthor());
+    }
+
+    @Test
     public void search() throws URISyntaxException, InterruptedException, HttpException, IOException {
         System.out.println("search");
         instance.login(OK_MAIL, OK_PASS);
-- 
2.11.0