Merge pull request #1475 in DESIGN/design from ~MAKSIM/design:release/10.0 to release/10.0

* commit 'b9e13fbef351a6282f25c71e596c4f940cafc957':
  测试
  去除UI测试
  格式
  提交单元测试，防止空指针

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -27,6 +27,7 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.rpc.Result;
 import com.fr.stable.AssistUtils;
 import com.fr.stable.EnvChangedListener;
+import com.fr.stable.StringUtils;
 import com.fr.start.server.ServerTray;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
@@ -267,6 +268,9 @@ public class EnvChangeEntrance {
             try {
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                 Calendar calendar = Calendar.getInstance();
+                if(StringUtils.isEmpty(selectedEnv.getRemindTime())){
+                    return true;
+                }
                 //获取记录的时间
                 Date remindTime = format.parse(selectedEnv.getRemindTime());
                 calendar.setTime(remindTime);
@@ -330,7 +334,7 @@ public class EnvChangeEntrance {
             return noExistServiceSet;
         } catch (Exception e){
             FineLoggerFactory.getLogger().error(e.getMessage(),e);
-            return null;
+            return noExistServiceSet;
         }
     }
 

designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java

@@ -0,0 +1,58 @@
+package com.fr.design;
+
+import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceType;
+import com.fr.design.write.submit.CheckServiceDialog;
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+/**
+ * @author: Maksim
+ * @Date: Created in 2020/3/5
+ * @Description:
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({FunctionalHttpRequest.class,EnvChangeEntrance.class,CheckServiceDialog.class})
+public class EnvChangeEntranceTest {
+
+    @Test
+    public void showServiceDialog() throws Exception {
+        try {
+            EnvChangeEntrance entrance = EnvChangeEntrance.getInstance();
+            DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class);
+            WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.class);
+
+            String remoteBranch = "Build#persist-2020.02.15.01.01.12.12";
+            EasyMock.expect(selectedEnv.getConnection()).andReturn(connectionInfo);
+            EasyMock.expect(selectedEnv.getType()).andReturn(DesignerWorkspaceType.Remote);
+            EasyMock.expect(selectedEnv.getRemindTime()).andReturn(null);
+
+            FunctionalHttpRequest request = EasyMock.mock(FunctionalHttpRequest.class);
+            EasyMock.expect(request.getServiceList()).andReturn(null);
+
+            PowerMock.expectNew(FunctionalHttpRequest.class, connectionInfo).andReturn(request).anyTimes();
+            EasyMock.expect(request.getServerBranch()).andReturn(remoteBranch);
+
+            CheckServiceDialog dialog = EasyMock.mock(CheckServiceDialog.class);
+            PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyObject()).andReturn(dialog);
+
+            EasyMock.replay(request);
+            EasyMock.replay(selectedEnv);
+            EasyMock.replay(connectionInfo);
+            PowerMock.replayAll();
+
+            entrance.showServiceDialog(selectedEnv);
+            Assert.assertTrue(true);
+        }catch (Exception e){
+            Assert.assertTrue(false);
+        }
+    }
+
+}