From a4d4ed77ee76f1f6b2c3969e412a955a264819b7 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 29 Sep 2022 15:48:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95=E7=B1=BB?= =?UTF-8?q?=E4=B8=AD=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ibeetl/admin/test/util/test/TestEnvUtil.java | 9 ++++++--- .../web/TeacherOpenCourseQuestionLogControllerTest.java | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java b/admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java index b5d70729..50c38626 100644 --- a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java +++ b/admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java @@ -11,7 +11,7 @@ import java.util.Map; public class TestEnvUtil { /** - * 不会覆盖原有的配置，在高优先级的环境配置文件上Put + * 不会覆盖原有的配置，在高优先级的环境配置文件上进行修改 * 方便后面remove就可以放开原有的配置参数 * * @param name @@ -63,7 +63,10 @@ public class TestEnvUtil { * 删除暂存的配置变量 * @param name */ - public static void removeProperty(String name) throws Exception { - getModifiableEnvironment().remove(name); + public static void removeProperty(String... name) throws Exception { + Map modifiableEnvironment = getModifiableEnvironment(); + for (String nm : name) { + modifiableEnvironment.remove(nm); + } } } \ No newline at end of file diff --git a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java index 82a4d65c..08dfd963 100644 --- a/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java +++ b/web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogControllerTest.java @@ -68,8 +68,7 @@ class TeacherOpenCourseQuestionLogControllerTest extends BaseTest { .andReturn().getResponse().getContentAsString(); // 换回去原始的登录方式 - TestEnvUtil.removeProperty("user.id"); - TestEnvUtil.removeProperty("user.orgId"); + TestEnvUtil.removeProperty("user.id", "user.orgId"); System.out.println(result); }