From 30450a5c7fb57babb7c18dee41c4cd4f81996415 Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Fri, 14 Mar 2025 11:13:08 +0800 Subject: [PATCH] =?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");