[테스트][New] 테스트 추가/수정

app/src/test/java/kr/co/zumo/app/lifeplus/model/SuperModelTest.java

@@ -27,32 +27,33 @@ public class SuperModelTest {
   @Test
   public void memberStatus() {
     SuperModel.getInstance().setUserId("dummy");
+    SuperModel.getInstance().addMemberStatus(SuperModel.MEMBER_STATUS_BIT_LOGIN);
 
-    assertEquals(0b00, SuperModel.getInstance().getMemberStatus());
+    assertEquals(0b01, SuperModel.getInstance().getMemberStatus());
     assertEquals(true, SuperModel.getInstance().isActiveMember());
     assertEquals(false, SuperModel.getInstance().isBlockMember());
     assertEquals(false, SuperModel.getInstance().isRestMember());
 
     SuperModel.getInstance().addMemberStatus(SuperModel.MEMBER_STATUS_BIT_BLOCK);
-    assertEquals(0b01, SuperModel.getInstance().getMemberStatus());
+    assertEquals(0b11, SuperModel.getInstance().getMemberStatus());
     assertEquals(false, SuperModel.getInstance().isActiveMember());
     assertEquals(true, SuperModel.getInstance().isBlockMember());
     assertEquals(false, SuperModel.getInstance().isRestMember());
 
     SuperModel.getInstance().addMemberStatus(SuperModel.MEMBER_STATUS_BIT_REST);
-    assertEquals(0b11, SuperModel.getInstance().getMemberStatus());
+    assertEquals(0b111, SuperModel.getInstance().getMemberStatus());
     assertEquals(false, SuperModel.getInstance().isActiveMember());
     assertEquals(true, SuperModel.getInstance().isBlockMember());
     assertEquals(true, SuperModel.getInstance().isRestMember());
 
     SuperModel.getInstance().deleteMemberStatus(SuperModel.MEMBER_STATUS_BIT_BLOCK);
-    assertEquals(0b10, SuperModel.getInstance().getMemberStatus());
+    assertEquals(0b101, SuperModel.getInstance().getMemberStatus());
     assertEquals(false, SuperModel.getInstance().isActiveMember());
     assertEquals(false, SuperModel.getInstance().isBlockMember());
     assertEquals(true, SuperModel.getInstance().isRestMember());
 
     SuperModel.getInstance().deleteMemberStatus(SuperModel.MEMBER_STATUS_BIT_REST);
-    assertEquals(0b00, SuperModel.getInstance().getMemberStatus());
+    assertEquals(0b001, SuperModel.getInstance().getMemberStatus());
     assertEquals(true, SuperModel.getInstance().isActiveMember());
     assertEquals(false, SuperModel.getInstance().isBlockMember());
     assertEquals(false, SuperModel.getInstance().isRestMember());

app/src/test/java/kr/co/zumo/app/lifeplus/model/module/LoginModuleParserTest.java

@@ -46,13 +46,7 @@ public class LoginModuleParserTest {
     boolean isSuccess;
 
     result = "{\n" +
-      "  \"data\": [{\"user_no\": \"12345678900\",\n" +
-      "            \"user_name\": \"나나나\",\n" +
-      "            \"mail_id\": \"naananan@gmail.com\",\n" +
-      "            \"memr_stat_cd\": \"000\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
-      "            \"lock_stat_cd\": \"000\", \n" +               // 정상: 000, 잠김 회원: 999
-      "            \"ci_value\":\"5555555555\"}],\n" +
-      "    \"sp_rtn\": 0\n" +
+      "    \"sp_rtn\": 0\n" + // 0: 정상, -100:block, -200:휴면, -300:비회원
       " }";
 
     isSuccess = parser.parse(new Gson().fromJson(result, LoginResultBean.class));
@@ -70,13 +64,7 @@ public class LoginModuleParserTest {
     String result;
     boolean isSuccess;
     result = "{\n" +
-      "  \"data\": [{\"user_no\": \"12345678900\",\n" +
-      "            \"user_name\": \"나나나\",\n" +
-      "            \"mail_id\": \"naananan@gmail.com\",\n" +
-      "            \"memr_stat_cd\": \"200\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
-      "            \"lock_stat_cd\": \"000\", \n" +               // 정상: 000, 잠김 회원: 999
-      "            \"ci_value\":\"5555555555\"}],\n" +
-      "    \"sp_rtn\": 0\n" +
+      "    \"sp_rtn\": -200\n" + // 0: 정상, -100:block, -200:휴면, -300:비회원
       " }";
 
     isSuccess = parser.parse(new Gson().fromJson(result, LoginResultBean.class));
@@ -95,13 +83,7 @@ public class LoginModuleParserTest {
     String result;
     boolean isSuccess;
     result = "{\n" +
-      "  \"data\": [{\"user_no\": \"12345678900\",\n" +
-      "            \"user_name\": \"나나나\",\n" +
-      "            \"mail_id\": \"naananan@gmail.com\",\n" +
-      "            \"memr_stat_cd\": \"900\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
-      "            \"lock_stat_cd\": \"000\", \n" +               // 정상: 000, 잠김 회원: 999
-      "            \"ci_value\":\"5555555555\"}],\n" +
-      "    \"sp_rtn\": 0\n" +
+      "    \"sp_rtn\": -300\n" + // 0: 정상, -100:block, -200:휴면, -300:비회원
       " }";
 
     isSuccess = parser.parse(new Gson().fromJson(result, LoginResultBean.class));
@@ -120,13 +102,7 @@ public class LoginModuleParserTest {
     String result;
     boolean isSuccess;
     result = "{\n" +
-      "  \"data\": [{\"user_no\": \"12345678900\",\n" +
-      "            \"user_name\": \"나나나\",\n" +
-      "            \"mail_id\": \"naananan@gmail.com\",\n" +
-      "            \"memr_stat_cd\": \"000\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
-      "            \"lock_stat_cd\": \"999\", \n" +               // 정상: 000, 잠김 회원: 999
-      "            \"ci_value\":\"5555555555\"}],\n" +
-      "    \"sp_rtn\": 0\n" +
+      "    \"sp_rtn\": -100\n" + // 0: 정상, -100:block, -200:휴면, -300:비회원
       " }";
 
     isSuccess = parser.parse(new Gson().fromJson(result, LoginResultBean.class));
@@ -138,55 +114,6 @@ public class LoginModuleParserTest {
 
   }
 
-  @Test
-  public void parse4() {
-    LoginModuleParser parser = new LoginModuleParser(SuperModel.getInstance());
-
-    String result;
-    boolean isSuccess;
-    result = "{\n" +
-      "  \"data\": [{\"user_no\": \"12345678900\",\n" +
-      "            \"user_name\": \"나나나\",\n" +
-      "            \"mail_id\": \"naananan@gmail.com\",\n" +
-      "            \"memr_stat_cd\": \"000\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
-      "            \"lock_stat_cd\": \"000\", \n" +               // 정상: 000, 잠김 회원: 999
-      "            \"ci_value\":\"5555555555\"}],\n" +
-      "    \"sp_rtn\": -100\n" +    // temp block: -100, rest: -200
-      " }";
-
-    isSuccess = parser.parse(new Gson().fromJson(result, LoginResultBean.class));
-    assertEquals(true, isSuccess);
-    assertEquals(false, SuperModel.getInstance().isActiveMember());
-    assertEquals(true, SuperModel.getInstance().isBlockMember());
-    assertEquals(false, SuperModel.getInstance().isUnregisterMember());
-    assertEquals(false, SuperModel.getInstance().isRestMember());
-
-  }
-
-  @Test
-  public void parse5() {
-    LoginModuleParser parser = new LoginModuleParser(SuperModel.getInstance());
-
-    String result;
-    boolean isSuccess;
-    result = "{\n" +
-      "  \"data\": [{\"user_no\": \"12345678900\",\n" +
-      "            \"user_name\": \"나나나\",\n" +
-      "            \"mail_id\": \"naananan@gmail.com\",\n" +
-      "            \"memr_stat_cd\": \"000\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
-      "            \"lock_stat_cd\": \"000\", \n" +               // 정상: 000, 잠김 회원: 999
-      "            \"ci_value\":\"5555555555\"}],\n" +
-      "    \"sp_rtn\": -200\n" +    // temp block: -100, rest: -200
-      " }";
-
-    isSuccess = parser.parse(new Gson().fromJson(result, LoginResultBean.class));
-    assertEquals(true, isSuccess);
-    assertEquals(false, SuperModel.getInstance().isActiveMember());
-    assertEquals(false, SuperModel.getInstance().isBlockMember());
-    assertEquals(false, SuperModel.getInstance().isUnregisterMember());
-    assertEquals(true, SuperModel.getInstance().isRestMember());
-  }
-
   @Test
   public void parseFail() {
     LoginModuleParser parser = new LoginModuleParser(SuperModel.getInstance());
@@ -194,13 +121,7 @@ public class LoginModuleParserTest {
     String result;
     boolean isSuccess;
     result = "{\n" +
-      "  \"data\": [{\"user_no\": \"12345678900\",\n" +
-      "            \"user_name\": \"나나나\",\n" +
-      "            \"mail_id\": \"naananan@gmail.com\",\n" +
-      "            \"memr_stat_cd\": \"000\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
-      "            \"lock_stat_cd\": \"000\", \n" +               // 정상: 000, 잠김 회원: 999
-      "            \"ci_value\":\"5555555555\"}],\n" +
-      "    \"sp_rtn\": -1\n" +    // temp block: -100, rest: -200
+      "    \"sp_rtn\": -1\n" + // 0: 정상, -100:block, -200:휴면, -300:비회원
       " }";
 
     isSuccess = parser.parse(new Gson().fromJson(result, LoginResultBean.class));

app/src/test/java/kr/co/zumo/app/lifeplus/network/api/RetrofitServiceTest.java

@@ -7,8 +7,15 @@ import com.google.gson.annotations.SerializedName;
 import org.junit.Assert;
 import org.junit.Test;
 
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.CategoryRequestBean;
+import okhttp3.OkHttpClient;
+import retrofit2.http.Body;
 import retrofit2.http.POST;
 
+import static org.junit.Assert.assertNotNull;
+
 /**
  * RetrofitServiceTest
  * <pre>
@@ -23,9 +30,30 @@ public class RetrofitServiceTest {
 
   @Test
   public void retrofit() {
-//    TestApi api = RetrofitService.retrofit("https://192.168.0.1/", TestApi.class, 2000);
+    RetrofitService retrofitService = new RetrofitService() {
+      @Override
+      protected void assignSslSocketFactory(OkHttpClient.Builder httpBuilder) {
+        // nothing
+      }
+    };
+
+    TestApi api = retrofitService.retrofit("http://210.216.157.64:30080/", TestApi.class, 2000, null);
+
+    CategoryRequestBean requestBean = new CategoryRequestBean("2");
+    Single<CategoryContentsResultBean> result = api.test(requestBean);
+
+    result.subscribe(bean -> {
+        System.out.print(bean.toJson() + "\n");
+      }, e -> e.printStackTrace());
+
+    try {
+      Thread.sleep(2000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+
+    assertNotNull(api);
 
-//    assertTrue(api != null);
   }
 
   @Test
@@ -55,7 +83,7 @@ public class RetrofitServiceTest {
   }
 
   interface TestApi {
-    @POST("test/test")
-    String test();
+    @POST("mapi/categorys/contents.plus")
+    Single<CategoryContentsResultBean> test(@Body CategoryRequestBean bean);
   }
 }