This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/develop by this push:
new 1e0f519 follow up for pull request #501
1e0f519 is described below
commit 1e0f519bd49aaef48bc53332af8b395016150664
Author: Ian Luo <[email protected]>
AuthorDate: Thu Sep 19 17:48:13 2019 +0800
follow up for pull request #501
---
.../java/org/apache/dubbo/admin/common/util/Constants.java | 2 +-
.../dubbo/admin/controller/ConditionRoutesControllerTest.java | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
index adb1b7c..0f1c803 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/util/Constants.java
@@ -28,7 +28,7 @@ public class Constants {
public static final String DEFAULT_ROOT = "dubbo";
public static final String PATH_SEPARATOR = "/";
public static final String GROUP_KEY = "group";
- public static final String CONFIG_KEY = "config/dubbo";
+ public static final String CONFIG_KEY = "config" + PATH_SEPARATOR +
"dubbo";
public static final String DUBBO_PROPERTY = "dubbo.properties";
public static final String PROVIDER_SIDE = "provider";
public static final String CONSUMER_SIDE = "consumer";
diff --git
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/ConditionRoutesControllerTest.java
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/ConditionRoutesControllerTest.java
index 6cd7359..cff192d 100644
---
a/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/ConditionRoutesControllerTest.java
+++
b/dubbo-admin-server/src/test/java/org/apache/dubbo/admin/controller/ConditionRoutesControllerTest.java
@@ -37,8 +37,15 @@ import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
public class ConditionRoutesControllerTest extends
AbstractSpringIntegrationTest {