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");