Merge pull request wechaty#76 from Charles-Wu-Chen/fix-filebox-bug

Fix filebox fromjson bug and remove unused import

Author: diaozxin007

wechaty-puppet/pom.xml

@@ -104,7 +104,20 @@
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

wechaty-puppet/src/main/kotlin/io/github/wechaty/filebox/FileBox.kt

@@ -202,8 +202,8 @@ class FileBox(options: FileBoxOptions) {
 
                 FileBoxType.Url.code -> {
                     fileBox = fromUrl(
-                        jsonNode.findValue("name").asText(),
-                        jsonNode.findValue("remoteUrl").asText()
+                        jsonNode.findValue("remoteUrl").asText(),
+                        jsonNode.findValue("name").asText()
                     )
                 }
 

wechaty-puppet/src/test/kotlin/io/github/wechaty/filebox/FileBoxTest.kt

@@ -0,0 +1,21 @@
+package io.github.wechaty.filebox
+
+import junit.framework.Assert.assertEquals
+import org.junit.Test
+
+const val EXPECTED_FILEBOX_URL = "http://testurl"
+const val EXPECTED_FILEBOX_NAME = "fileboxname"
+
+class FileBoxTest {
+
+    @Test
+    fun testFileBoxFromURLShallHaveCorrectNameAndURL() {
+
+        var filebox : FileBox = FileBox.fromJson("{\"remoteUrl\":\"" + EXPECTED_FILEBOX_URL + "\"," +
+            "\"name\":\"" + EXPECTED_FILEBOX_NAME + "\"," +
+            "\"boxType\":2}")
+
+        assertEquals(EXPECTED_FILEBOX_URL, filebox.remoteUrl)
+        assertEquals(EXPECTED_FILEBOX_NAME, filebox.name)
+    }
+}

wechaty/src/main/kotlin/io/github/wechaty/user/manager/FriendshipManager.kt

@@ -1,6 +1,5 @@
 package io.github.wechaty.user.manager
 
-import com.sun.xml.internal.ws.message.PayloadElementSniffer
 import io.github.wechaty.Accessory
 import io.github.wechaty.Wechaty
 import io.github.wechaty.schemas.FriendshipPayload