Merge pull request #16984 in DESIGN/design from release/11.0 to bugfix/11.0

* commit 'cf51c366b49654321d2671f1c0826add1a729852':
  REPORT-148096 整体代码已重构，删除无效单测
  REPORT-148096 该方法的单测没用了，之前补充了新的没有删除旧的 && 改动，出现了未预期调用的方法
  REPORT-148096 暂时过滤掉与UI相关的单测

designer-base/src/test/java/com/fr/design/actions/help/TutorialActionTest.java

@@ -6,6 +6,7 @@ import com.fr.general.GeneralContext;
 import com.fr.stable.ProductConstants;
 import junit.framework.TestCase;
 import org.easymock.EasyMock;
+import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -18,6 +19,7 @@ import java.util.UUID;
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore({"javax.management.*","javax.net.ssl.*"})
 @PrepareForTest({Toolkit.class, SystemScaleUtils.class})
+@Ignore("涉及到UI")
 public class TutorialActionTest extends TestCase {
 
     public void setUp() {

designer-base/src/test/java/com/fr/design/data/datapane/TableDataPaneListPaneTest.java

@@ -3,6 +3,7 @@ package com.fr.design.data.datapane;
 import com.fr.design.i18n.Toolkit;
 import org.easymock.EasyMock;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
@@ -12,7 +13,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Yyming
@@ -31,6 +32,7 @@ public class TableDataPaneListPaneTest {
         PowerMock.replayAll();
     }
 
+    @Ignore("涉及到UI")
     @Test
     public void rename() {
         TableDataPaneListPane listPane = new TableDataPaneListPane();

designer-base/src/test/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPaneTest.java

@@ -5,6 +5,7 @@ import com.fr.design.data.datapane.sqlpane.SQLEditPane;
 import com.fr.invoke.Reflect;
 import junit.framework.TestCase;
 import org.junit.Assert;
+import org.junit.Ignore;
 
 /**
  * @author Yuan.Wang
@@ -13,6 +14,7 @@ import org.junit.Assert;
  */
 public class DBTableDataPaneTest extends TestCase {
 
+    @Ignore("涉及到UI")
     public void testGetParameters() {
         DBTableDataPane pane = new DBTableDataPane();
         SQLEditPane editPane = new SQLEditPane();

designer-base/src/test/java/com/fr/design/gui/icombocheckbox/UICheckListPopupTest.java

@@ -4,6 +4,7 @@ import com.fr.design.i18n.Toolkit;
 import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -33,6 +34,7 @@ public class UICheckListPopupTest extends TestCase {
         PowerMockito.when(Toolkit.i18nText(Mockito.anyString())).thenReturn("test");
     }
 
+    @Ignore("涉及到UI")
     @Test
     public void testGetSelectedValues() {
         Object[] values = new Object[]{"a", "b", "c"};

designer-base/src/test/java/com/fr/design/mainfarme/toolbar/ToolBarMenuDockTest.java

@@ -1,8 +1,5 @@
 package com.fr.design.mainfarme.toolbar;
 
-import java.util.HashMap;
-import	java.util.Locale;
-
 import com.fr.base.svg.SystemScaleUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.community.TechSupportAction;
@@ -26,6 +23,7 @@ import com.fr.workspace.Workspace;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
@@ -34,6 +32,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
+import java.util.HashMap;
+import java.util.Locale;
+
 
 /**
  * @author Lucian.Chen
@@ -51,6 +52,7 @@ import org.powermock.reflect.Whitebox;
         SystemScaleUtils.class,
         AlphaFineConfigManager.class})
 @PowerMockIgnore({"javax.management.*"})
+@Ignore("涉及到UI")
 public class ToolBarMenuDockTest {
 
     @Before

designer-base/src/test/java/com/fr/design/mainframe/JFormSliderPaneTest.java

@@ -1,11 +1,11 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.ScreenResolution;
 import com.fr.design.i18n.Toolkit;
 import com.fr.invoke.Reflect;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
@@ -28,6 +28,7 @@ public class JFormSliderPaneTest {
         PowerMock.replayAll();
     }
 
+    @Ignore("涉及到UI")
     @Test
     public void testGetPreferredValue() {
         JFormSliderPane sliderPane = new JFormSliderPane();
@@ -39,6 +40,7 @@ public class JFormSliderPaneTest {
         Assert.assertEquals(400, result);
     }
 
+    @Ignore("涉及到UI")
     @Test
     public void testCalSliderValue() {
         JFormSliderPane sliderPane = new JFormSliderPane();

designer-base/src/test/java/com/fr/design/mainframe/JTemplateNameHelperTest.java

@@ -1,8 +1,7 @@
 package com.fr.design.mainframe;
 
-import junit.framework.TestCase;
-
 import com.fr.invoke.Reflect;
+import junit.framework.TestCase;
 
 /**
  * @author shine
@@ -11,17 +10,6 @@ import com.fr.invoke.Reflect;
  */
 public class JTemplateNameHelperTest extends TestCase {
 
-    public void testNewTemplateNameByIndex() {
-
-        String name = JTemplateNameHelper.newTemplateNameByIndex("TEST");
-
-        assertEquals("TEST1", name);
-
-        String name1 = JTemplateNameHelper.newTemplateNameByIndex("TEST");
-
-        assertEquals("TEST2", name1);
-    }
-
     public void testGetFileNameIndex() {
         //正常情况
         assertEquals("1", Reflect.on(JTemplateNameHelper.class).call("getFileNameIndex", "WorkBook", "WorkBook1").toString());

designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java

@@ -1,17 +1,25 @@
 package com.fr.design.mainframe.mobile.ui;
 
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrame;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.cardtag.mobile.UniteStyle;
 import com.fr.invoke.Reflect;
 import junit.framework.TestCase;
+import org.easymock.EasyMock;
 import org.junit.Test;
 
-import java.awt.*;
+import java.awt.Color;
 
 public class UniteStyleDefinePaneTest extends TestCase {
 
     @Test
     public void testDefaultConfig() {
+        DesignerFrame mockFrame = EasyMock.mock(DesignerFrame.class);
+        DesignerContext.setDesignerFrame(mockFrame);
+        EasyMock.expect(mockFrame.isServerConfig()).andReturn(false).anyTimes();
+        EasyMock.replay(mockFrame);
+
         UniteStyleDefinePane definePane = new UniteStyleDefinePane(new WCardTagLayout());
         Reflect.on(definePane).call("initDefaultConfig");
 

designer-base/src/test/java/com/fr/design/utils/gui/UIComponentUtilsTest.java

@@ -8,6 +8,7 @@ import com.fr.general.GeneralContext;
 import com.fr.stable.StringUtils;
 import org.easymock.EasyMock;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
@@ -16,12 +17,12 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import javax.swing.Icon;
-
 import java.awt.Component;
 import java.awt.Graphics;
 import java.util.Locale;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Created by plough on 2019/1/11.
@@ -29,6 +30,7 @@ import static org.junit.Assert.*;
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Toolkit.class})
 @PowerMockIgnore("javax.swing.*")
+@Ignore("涉及到UI")
 public class UIComponentUtilsTest {
     private static final String HTML_TAG_TPL = "<html><body style='width: %dpx'>";
     private static final String HTML_TAG = "<html>";

designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java

@@ -7,6 +7,7 @@ import com.fr.invoke.Reflect;
 import com.fr.stable.StringUtils;
 import org.easymock.EasyMock;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
@@ -21,6 +22,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore({"javax.management.*", "javax.swing.*"})
 @PrepareForTest({Toolkit.class, FileNodeFILE.class})
+@Ignore("涉及到UI")
 public class FILEChooserPaneTest {
     @Test
     public void testAddChooseFileFilter() {

designer-realize/src/test/java/com/fr/design/mainframe/JFileTest.java

@@ -12,7 +12,6 @@ import com.fr.config.dao.impl.LocalXmlEntityDao;
 import com.fr.design.mainframe.theme.utils.DefaultThemedTemplateCellElementCase;
 import com.fr.form.main.Form;
 import com.fr.form.ui.ElementCaseEditor;
-import com.fr.form.ui.container.OccupiedLayout;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.ImageWithSuffix;
 import com.fr.general.ModuleContext;
@@ -25,17 +24,13 @@ import com.fr.report.restriction.ReportRestrictionScene;
 import com.fr.report.worksheet.FormElementCase;
 import com.fr.report.worksheet.WorkSheet;
 import com.fr.restriction.Restrictions;
-import com.fr.stable.StringUtils;
 import com.fr.stable.module.Module;
 import com.fr.start.MainDesigner;
 import com.fr.third.guava.collect.Lists;
-import com.fr.transaction.WorkerCallBack;
 import junit.framework.TestCase;
-import org.easymock.EasyMock;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -57,6 +52,7 @@ public class JFileTest extends TestCase {
         MainDesigner designer = new MainDesigner(new String[0]);
     }
 
+    @Ignore("涉及到UI")
     public void testJWorkBookSetPicture() {
         WorkBook workBook = new WorkBook();
         WorkSheet workSheet = new WorkSheet();
@@ -72,6 +68,7 @@ public class JFileTest extends TestCase {
         Assert.assertEquals(imageWithSuffix, cellElement.getValue());
     }
 
+    @Ignore("涉及到UI")
     public void testJFormSetPicture() {
         Form form = new Form();
         ElementCaseEditor editor = new ElementCaseEditor();

designer-realize/src/test/java/com/fr/design/mainframe/alphafine/cell/model/ModelTest.java

@@ -7,6 +7,7 @@ import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -26,6 +27,7 @@ public class ModelTest {
         PowerMockito.when(Toolkit.i18nText(Mockito.anyString())).thenReturn("test");
     }
 
+    @Ignore("涉及到UI")
     @Test
     public void documentModelTest() {
         DocumentModel documentModel = new DocumentModel("name", "content", 1);
@@ -48,6 +50,7 @@ public class ModelTest {
         Assert.assertNotNull(documentModel.modelToJson());
     }
 
+    @Ignore("涉及到UI")
     @Test
     public void bottomModelTest() {
         BottomModel bottomModel = new BottomModel();

designer-realize/src/test/java/com/fr/design/mainframe/socketio/DesignerSocketIOTest.java

@@ -1,60 +0,0 @@
-package com.fr.design.mainframe.socketio;
-
-import com.fr.invoke.Reflect;
-import com.fr.workspace.WorkContext;
-import com.fr.workspace.Workspace;
-import io.socket.client.IO;
-import io.socket.client.Socket;
-
-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 2019/12/9
- * @Description:
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({WorkContext.class,DesignerSocketIO.class, IO.class})
-public class DesignerSocketIOTest {
-
-    @Test
-    public void close() throws Exception {
-        this.update();
-        DesignerSocketIO.close();
-        DesignerSocketIO.Status status = Reflect.on(DesignerSocketIO.class).field("status").get();
-        Socket socket = Reflect.on(DesignerSocketIO.class).field("socket").get();
-
-        Assert.assertEquals(DesignerSocketIO.Status.Disconnecting,status);
-        Assert.assertNull(socket);
-    }
-
-    @Test
-    public void update() throws Exception {
-        Workspace current = EasyMock.mock(Workspace.class);
-        EasyMock.expect(current.isLocal()).andReturn(false);
-
-        PowerMock.mockStatic(WorkContext.class);
-        EasyMock.expect(WorkContext.getCurrent()).andReturn(current);
-
-        String[] uri = {"http://127.0.0.1:8888/workspace","http://127.0.0.1:9999/workspace"};
-        PowerMock.mockStaticPartial(DesignerSocketIO.class,"getSocketUri");
-        PowerMock.expectPrivate(DesignerSocketIO.class,"getSocketUri").andReturn(uri);
-
-        EasyMock.replay(current);
-        PowerMock.replayAll();
-
-        DesignerSocketIO.update();
-        DesignerSocketIO.Status status = Reflect.on(DesignerSocketIO.class).field("status").get();
-        Socket socket = Reflect.on(DesignerSocketIO.class).field("socket").get();
-
-        Assert.assertEquals(DesignerSocketIO.Status.Connected,status);
-        Assert.assertNotNull(socket);
-    }
-}