From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Wed, 24 Apr 2019 05:12:48 +0000 (+0800)
Subject: 优化测试代码
X-Git-Tag: 1.0.0^2~255
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=2b6200e040ef74741e4e4d59608b442a57f34b29;p=epayment%2Ffood_payapi.git

优化测试代码
---

diff --git a/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt b/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt
index 372a67a8..24853dbe 100644
--- a/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt
+++ b/src/test/kotlin/com/supwisdom/dlpay/controller/security_controller_test.kt
@@ -5,14 +5,18 @@ import com.supwisdom.dlpay.framework.core.JwtConfig
 import com.supwisdom.dlpay.framework.util.HmacUtil
 import io.restassured.RestAssured
 import io.restassured.RestAssured.*
+import io.restassured.http.ContentType
 import io.restassured.path.json.JsonPath.from
-import org.hamcrest.Matchers.notNullValue
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.*
 import org.junit.Before
 import org.junit.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.web.server.LocalServerPort
 import org.springframework.test.context.ActiveProfiles
+import java.text.SimpleDateFormat
+import java.util.*
 
 @ActiveProfiles("devel-pg-local")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -31,24 +35,39 @@ class SecurityControllerTest : MvcBaseTest() {
         RestAssured.port = port
     }
 
-    @Test
-    fun testGetJwt() {
-        val response = given().param("appid", appid)
+    fun getJwt(id: String, secret: String): String {
+        val token = given().param("appid", id)
                 .`when`()
                 .get("/api/auth/gettoken")
                 .then()
+                .contentType(ContentType.JSON)
+                .statusCode(200)
                 .body("token", notNullValue())
-                .extract()
+                .extract().path<String>("token")
 
-        val token = from(response.body().asString()).getString("token")
-        val secret = HmacUtil.HMACSHA256(token, appsecret)
+        val tokenCrypt = HmacUtil.HMACSHA256(token, secret)
 
-        given().param("appid", appid)
-                .param("secret", secret)
+        return given().param("appid", id)
+                .param("secret", tokenCrypt)
                 .`when`()
                 .get("/api/auth/authentication")
                 .then()
+                .statusCode(200)
+                .contentType(ContentType.JSON)
                 .body("jwt", notNullValue())
+                .extract().response().let {
+                    val exp = it.path<String>("expiredAt").run {
+                        SimpleDateFormat("yyyy-MM-dd HH:mm:ss z").parse(this)
+                    }
+                    val now = Calendar.getInstance()
+                    assertThat(now.time, lessThanOrEqualTo(exp))
+                    it.path<String>("jwt")
+                }
+    }
+
+    @Test
+    fun testGetJwt() {
+        getJwt(appid, appsecret)
     }
 
     @Test
@@ -76,32 +95,31 @@ class SecurityControllerTest : MvcBaseTest() {
 
     @Test
     fun testJwtRefresh() {
-        val response = given().param("appid", appid)
+        getJwt(appid, appsecret).also { jwt ->
+            given().header(jwtConfig.header, "${jwtConfig.tokenHeader}$jwt")
+                    .`when`()
+                    .get("/api/auth/refresh")
+                    .then()
+                    .statusCode(200)
+                    .body("jwt", notNullValue())
+        }
+    }
+
+    @Test
+    fun testAuthencationFail() {
+        given().param("appid", appid)
                 .`when`()
                 .get("/api/auth/gettoken")
                 .then()
-                .statusCode(200)
                 .body("token", notNullValue())
                 .extract()
-
-        val token = from(response.body().asString()).getString("token")
-        val secret = HmacUtil.HMACSHA256(token, appsecret)
-
-        given().param("appid", appid)
-                .param("secret", secret)
-                .`when`()
-                .get("/api/auth/authentication")
-                .then()
-                .statusCode(200)
-                .body("jwt", notNullValue())
-                .extract().also {
-                    val jwt = from(it.body().asString()).getString("jwt")
-                    given().header(jwtConfig.header, "Bearer $jwt")
+                .path<String>("token").also { token ->
+                    given().param("appid", appid)
+                            .param("secret", token)
                             .`when`()
-                            .get("/api/auth/refresh")
+                            .get("/api/auth/authentication")
                             .then()
-                            .statusCode(200)
-                            .body("jwt", notNullValue())
+                            .statusCode(401)
                 }
     }