From ee764519ef73bbbd0236c28f096dee7ff54beda5 Mon Sep 17 00:00:00 2001
From: "Leo.Qin" <leo.qin@fanruan.com>
Date: Fri, 14 Mar 2025 10:46:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?REPORT-148096=20=E6=9A=82=E6=97=B6=E8=BF=87?=
=?UTF-8?q?=E6=BB=A4=E6=8E=89=E4=B8=8EUI=E7=9B=B8=E5=85=B3=E7=9A=84?=
=?UTF-8?q?=E5=8D=95=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/fr/design/actions/help/TutorialActionTest.java | 2 ++
.../design/data/datapane/TableDataPaneListPaneTest.java | 4 +++-
.../tabledata/tabledatapane/DBTableDataPaneTest.java | 2 ++
.../design/gui/icombocheckbox/UICheckListPopupTest.java | 2 ++
.../fr/design/mainfarme/toolbar/ToolBarMenuDockTest.java | 8 +++++---
.../com/fr/design/mainframe/JFormSliderPaneTest.java | 4 +++-
.../com/fr/design/utils/gui/UIComponentUtilsTest.java | 6 ++++--
.../src/test/java/com/fr/file/FILEChooserPaneTest.java | 2 ++
.../{com.fr => com/fr}/design/mainframe/JFileTest.java | 9 +++------
.../design/mainframe/alphafine/AlphaFineHelperTest.java | 0
.../design/mainframe/alphafine/cell/model/ModelTest.java | 3 +++
.../search/manager/impl/FileSearchManagerTest.java | 0
.../search/manager/impl/PluginSearchManagerTest.java | 0
.../fr/design/mainframe}/impl/SearchManegerTest.java | 0
.../design/mainframe}/info/JWorkBookProcessInfoTest.java | 0
15 files changed, 29 insertions(+), 13 deletions(-)
rename designer-realize/src/test/java/{com.fr => com/fr}/design/mainframe/JFileTest.java (95%)
rename designer-realize/src/test/java/{com.fr => com/fr}/design/mainframe/alphafine/AlphaFineHelperTest.java (100%)
rename designer-realize/src/test/java/{com.fr => com/fr}/design/mainframe/alphafine/cell/model/ModelTest.java (98%)
rename designer-realize/src/test/java/{com.fr => com/fr}/design/mainframe/alphafine/search/manager/impl/FileSearchManagerTest.java (100%)
rename designer-realize/src/test/java/{com.fr => com/fr}/design/mainframe/alphafine/search/manager/impl/PluginSearchManagerTest.java (100%)
rename designer-realize/src/test/java/{com.fr/design/mainframe/alphafine/search/manager => com/fr/design/mainframe}/impl/SearchManegerTest.java (100%)
rename designer-realize/src/test/java/{com.fr/design/mainframe/template => com/fr/design/mainframe}/info/JWorkBookProcessInfoTest.java (100%)
diff --git a/designer-base/src/test/java/com/fr/design/actions/help/TutorialActionTest.java b/designer-base/src/test/java/com/fr/design/actions/help/TutorialActionTest.java
index 5ae51d380f..8bf00f8387 100644
--- a/designer-base/src/test/java/com/fr/design/actions/help/TutorialActionTest.java
+++ b/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() {
diff --git a/designer-base/src/test/java/com/fr/design/data/datapane/TableDataPaneListPaneTest.java b/designer-base/src/test/java/com/fr/design/data/datapane/TableDataPaneListPaneTest.java
index 48b11be333..53e304e547 100644
--- a/designer-base/src/test/java/com/fr/design/data/datapane/TableDataPaneListPaneTest.java
+++ b/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();
diff --git a/designer-base/src/test/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPaneTest.java b/designer-base/src/test/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPaneTest.java
index e549f13461..49086f200a 100644
--- a/designer-base/src/test/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPaneTest.java
+++ b/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();
diff --git a/designer-base/src/test/java/com/fr/design/gui/icombocheckbox/UICheckListPopupTest.java b/designer-base/src/test/java/com/fr/design/gui/icombocheckbox/UICheckListPopupTest.java
index a35055c2fd..b20007a5d7 100644
--- a/designer-base/src/test/java/com/fr/design/gui/icombocheckbox/UICheckListPopupTest.java
+++ b/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"};
diff --git a/designer-base/src/test/java/com/fr/design/mainfarme/toolbar/ToolBarMenuDockTest.java b/designer-base/src/test/java/com/fr/design/mainfarme/toolbar/ToolBarMenuDockTest.java
index a198dace8f..f072d8169a 100644
--- a/designer-base/src/test/java/com/fr/design/mainfarme/toolbar/ToolBarMenuDockTest.java
+++ b/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
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/JFormSliderPaneTest.java b/designer-base/src/test/java/com/fr/design/mainframe/JFormSliderPaneTest.java
index 5853b10094..aa63028d6c 100644
--- a/designer-base/src/test/java/com/fr/design/mainframe/JFormSliderPaneTest.java
+++ b/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();
diff --git a/designer-base/src/test/java/com/fr/design/utils/gui/UIComponentUtilsTest.java b/designer-base/src/test/java/com/fr/design/utils/gui/UIComponentUtilsTest.java
index dcb21f7999..a76fa93270 100644
--- a/designer-base/src/test/java/com/fr/design/utils/gui/UIComponentUtilsTest.java
+++ b/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>";
diff --git a/designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java b/designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java
index 8db47b9c44..12e0639821 100644
--- a/designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java
+++ b/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() {
diff --git a/designer-realize/src/test/java/com.fr/design/mainframe/JFileTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/JFileTest.java
similarity index 95%
rename from designer-realize/src/test/java/com.fr/design/mainframe/JFileTest.java
rename to designer-realize/src/test/java/com/fr/design/mainframe/JFileTest.java
index 1651043f74..a1da5a0d24 100644
--- a/designer-realize/src/test/java/com.fr/design/mainframe/JFileTest.java
+++ b/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();
diff --git a/designer-realize/src/test/java/com.fr/design/mainframe/alphafine/AlphaFineHelperTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/AlphaFineHelperTest.java
similarity index 100%
rename from designer-realize/src/test/java/com.fr/design/mainframe/alphafine/AlphaFineHelperTest.java
rename to designer-realize/src/test/java/com/fr/design/mainframe/alphafine/AlphaFineHelperTest.java
diff --git a/designer-realize/src/test/java/com.fr/design/mainframe/alphafine/cell/model/ModelTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/cell/model/ModelTest.java
similarity index 98%
rename from designer-realize/src/test/java/com.fr/design/mainframe/alphafine/cell/model/ModelTest.java
rename to designer-realize/src/test/java/com/fr/design/mainframe/alphafine/cell/model/ModelTest.java
index 26cfc71684..3f9d43d418 100644
--- a/designer-realize/src/test/java/com.fr/design/mainframe/alphafine/cell/model/ModelTest.java
+++ b/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();
diff --git a/designer-realize/src/test/java/com.fr/design/mainframe/alphafine/search/manager/impl/FileSearchManagerTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManagerTest.java
similarity index 100%
rename from designer-realize/src/test/java/com.fr/design/mainframe/alphafine/search/manager/impl/FileSearchManagerTest.java
rename to designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManagerTest.java
diff --git a/designer-realize/src/test/java/com.fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManagerTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManagerTest.java
similarity index 100%
rename from designer-realize/src/test/java/com.fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManagerTest.java
rename to designer-realize/src/test/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManagerTest.java
diff --git a/designer-realize/src/test/java/com.fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/impl/SearchManegerTest.java
similarity index 100%
rename from designer-realize/src/test/java/com.fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java
rename to designer-realize/src/test/java/com/fr/design/mainframe/impl/SearchManegerTest.java
diff --git a/designer-realize/src/test/java/com.fr/design/mainframe/template/info/JWorkBookProcessInfoTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/info/JWorkBookProcessInfoTest.java
similarity index 100%
rename from designer-realize/src/test/java/com.fr/design/mainframe/template/info/JWorkBookProcessInfoTest.java
rename to designer-realize/src/test/java/com/fr/design/mainframe/info/JWorkBookProcessInfoTest.java
From 30450a5c7fb57babb7c18dee41c4cd4f81996415 Mon Sep 17 00:00:00 2001
From: "Leo.Qin" <leo.qin@fanruan.com>
Date: Fri, 14 Mar 2025 11:13:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?REPORT-148096=20=E8=AF=A5=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=E7=9A=84=E5=8D=95=E6=B5=8B=E6=B2=A1=E7=94=A8=E4=BA=86=EF=BC=8C?=
=?UTF-8?q?=E4=B9=8B=E5=89=8D=E8=A1=A5=E5=85=85=E4=BA=86=E6=96=B0=E7=9A=84?=
=?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E6=97=A7=E7=9A=84=20&&=20?=
=?UTF-8?q?=E6=94=B9=E5=8A=A8=EF=BC=8C=E5=87=BA=E7=8E=B0=E4=BA=86=E6=9C=AA?=
=?UTF-8?q?=E9=A2=84=E6=9C=9F=E8=B0=83=E7=94=A8=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../design/mainframe/JTemplateNameHelperTest.java | 14 +-------------
.../mobile/ui/UniteStyleDefinePaneTest.java | 10 +++++++++-
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/JTemplateNameHelperTest.java b/designer-base/src/test/java/com/fr/design/mainframe/JTemplateNameHelperTest.java
index 0202028480..2b7b5cbfe3 100644
--- a/designer-base/src/test/java/com/fr/design/mainframe/JTemplateNameHelperTest.java
+++ b/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());
diff --git a/designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java b/designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java
index 857a367d21..40e4d9b8db 100644
--- a/designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java
+++ b/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");
From a125b40d18b40bc4b89017d3619b4e96d78ab4be Mon Sep 17 00:00:00 2001
From: "Leo.Qin" <leo.qin@fanruan.com>
Date: Fri, 14 Mar 2025 11:25:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?REPORT-148096=20=E6=95=B4=E4=BD=93=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E5=B7=B2=E9=87=8D=E6=9E=84=EF=BC=8C=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E6=97=A0=E6=95=88=E5=8D=95=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../socketio/DesignerSocketIOTest.java | 60 -------------------
1 file changed, 60 deletions(-)
delete mode 100644 designer-realize/src/test/java/com/fr/design/mainframe/socketio/DesignerSocketIOTest.java
diff --git a/designer-realize/src/test/java/com/fr/design/mainframe/socketio/DesignerSocketIOTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/socketio/DesignerSocketIOTest.java
deleted file mode 100644
index b775f56e9d..0000000000
--- a/designer-realize/src/test/java/com/fr/design/mainframe/socketio/DesignerSocketIOTest.java
+++ /dev/null
@@ -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);
- }
-}
\ No newline at end of file