[servicecomb-java-chassis] branch master updated: [SCB-1206] sort schemas in inspector ui

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 80b9895  [SCB-1206] sort schemas in inspector ui
80b9895 is described below

commit 80b98956aa39ae19c6dda317c700dcaf29a4f6fc
Author: wujimin <wu...@huawei.com>
AuthorDate: Tue Mar 19 11:11:56 2019 +0800

    [SCB-1206] sort schemas in inspector ui
---
 .../resources/webroot/static/schemas/schemas.js    |  1 +
 .../internal/TestInspectorBootListener.java        | 38 ++++++++++------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/inspector/src/main/resources/webroot/static/schemas/schemas.js b/inspector/src/main/resources/webroot/static/schemas/schemas.js
index eff92b9..7cad3b9 100644
--- a/inspector/src/main/resources/webroot/static/schemas/schemas.js
+++ b/inspector/src/main/resources/webroot/static/schemas/schemas.js
@@ -30,6 +30,7 @@ function initSchemas() {
 }
 
 function initSchemasTree(schemas) {
+  schemas = schemas.sort();
   var eleSchemas = document.getElementById("schemas");
   var childrenContent = "<tree-children>";
   for (var idx in schemas) {
diff --git a/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorBootListener.java b/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorBootListener.java
index 239060b..0b9867d 100644
--- a/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorBootListener.java
+++ b/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorBootListener.java
@@ -25,8 +25,6 @@ import org.apache.servicecomb.core.BootListener.EventType;
 import org.apache.servicecomb.core.definition.schema.ProducerSchemaFactory;
 import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
 import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
-import org.apache.servicecomb.inspector.internal.InspectorBootListener;
-import org.apache.servicecomb.inspector.internal.InspectorConfig;
 import org.apache.servicecomb.serviceregistry.RegistryUtils;
 import org.apache.servicecomb.serviceregistry.ServiceRegistry;
 import org.junit.AfterClass;
@@ -64,16 +62,16 @@ public class TestInspectorBootListener {
     BootEvent event = new BootEvent();
     InspectorBootListener listener = new InspectorBootListener();
 
-    LogCollector logCollector = new LogCollector();
-    for (EventType eventType : EventType.values()) {
-      if (!EventType.AFTER_TRANSPORT.equals(eventType)) {
-        event.setEventType(eventType);
-        listener.onBootEvent(event);
+    try (LogCollector logCollector = new LogCollector()) {
+      for (EventType eventType : EventType.values()) {
+        if (!EventType.AFTER_TRANSPORT.equals(eventType)) {
+          event.setEventType(eventType);
+          listener.onBootEvent(event);
+        }
       }
-    }
-    logCollector.teardown();
 
-    Assert.assertTrue(logCollector.getEvents().isEmpty());
+      Assert.assertTrue(logCollector.getEvents().isEmpty());
+    }
   }
 
   @Test
@@ -82,11 +80,11 @@ public class TestInspectorBootListener {
     BootEvent event = new BootEvent();
     event.setEventType(EventType.AFTER_TRANSPORT);
 
-    LogCollector logCollector = new LogCollector();
-    new InspectorBootListener().onBootEvent(event);
-    logCollector.teardown();
+    try (LogCollector logCollector = new LogCollector()) {
+      new InspectorBootListener().onBootEvent(event);
 
-    Assert.assertEquals("inspector is not enabled.", logCollector.getLastEvents().getMessage());
+      Assert.assertEquals("inspector is not enabled.", logCollector.getLastEvents().getMessage());
+    }
   }
 
   @Test
@@ -102,12 +100,12 @@ public class TestInspectorBootListener {
     BootEvent event = new BootEvent();
     event.setEventType(EventType.AFTER_TRANSPORT);
 
-    LogCollector logCollector = new LogCollector();
-    InspectorBootListener listener = new InspectorBootListener();
-    Deencapsulation.setField(listener, "producerSchemaFactory", producerSchemaFactory);
-    listener.onBootEvent(event);
-    logCollector.teardown();
+    try (LogCollector logCollector = new LogCollector()) {
+      InspectorBootListener listener = new InspectorBootListener();
+      Deencapsulation.setField(listener, "producerSchemaFactory", producerSchemaFactory);
+      listener.onBootEvent(event);
 
-    Assert.assertEquals("inspector is enabled.", logCollector.getLastEvents().getMessage());
+      Assert.assertEquals("inspector is enabled.", logCollector.getLastEvents().getMessage());
+    }
   }
 }