Browse Source

Pull request #16976: REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法

Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0

* commit 'a125b40d18b40bc4b89017d3619b4e96d78ab4be':
  REPORT-148096 整体代码已重构,删除无效单测
  REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法
release/11.0
Leo.Qin-覃宇攀 1 month ago
parent
commit
cf51c366b4
  1. 14
      designer-base/src/test/java/com/fr/design/mainframe/JTemplateNameHelperTest.java
  2. 10
      designer-base/src/test/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePaneTest.java
  3. 60
      designer-realize/src/test/java/com/fr/design/mainframe/socketio/DesignerSocketIOTest.java

14
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());

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

60
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);
}
}
Loading…
Cancel
Save