From 47be65f2c504e3e156caf8fc7a88619bb481c5b1 Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Fri, 5 Jul 2019 16:04:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-18855=20=E5=8A=A0=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com.fr/design/mainframe/JFileTest.java    | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 designer-realize/src/test/java/com.fr/design/mainframe/JFileTest.java

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
new file mode 100644
index 000000000..2d153c920
--- /dev/null
+++ b/designer-realize/src/test/java/com.fr/design/mainframe/JFileTest.java
@@ -0,0 +1,69 @@
+package com.fr.design.mainframe;
+
+import com.fr.config.dao.DaoContext;
+import com.fr.config.dao.impl.LocalClassHelperDao;
+import com.fr.config.dao.impl.LocalEntityDao;
+import com.fr.config.dao.impl.LocalXmlEntityDao;
+import com.fr.form.main.Form;
+import com.fr.form.ui.ElementCaseEditor;
+import com.fr.general.ImageWithSuffix;
+import com.fr.general.ModuleContext;
+import com.fr.main.impl.WorkBook;
+import com.fr.report.cell.DefaultTemplateCellElement;
+import com.fr.report.cell.TemplateCellElement;
+import com.fr.report.cell.cellattr.CellImage;
+import com.fr.report.restriction.CellCountRestriction;
+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.module.Module;
+import com.fr.start.Designer;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+import java.awt.image.BufferedImage;
+
+public class JFileTest extends TestCase {
+    @Override
+    protected void setUp() throws Exception {
+        DaoContext.setEntityDao(new LocalEntityDao());
+        DaoContext.setClassHelperDao(new LocalClassHelperDao());
+        DaoContext.setXmlEntityDao(new LocalXmlEntityDao());
+        Restrictions.register(ReportRestrictionScene.CELL_COUNT, new CellCountRestriction());
+        ModuleContext.startModule(Module.PAGE_MODULE);
+        ModuleContext.startModule(Module.VIEW_MODULE);
+        Designer designer = new Designer(new String[0]);
+    }
+
+    public void testJWorkBook() {
+        WorkBook workBook = new WorkBook();
+        WorkSheet workSheet = new WorkSheet();
+        workBook.addReport("sheet1", workSheet);
+        TemplateCellElement cellElement = new DefaultTemplateCellElement();
+        workSheet.addCellElement(cellElement);
+        ImageWithSuffix imageWithSuffix = ImageWithSuffix.build(new BufferedImage(100, 100, BufferedImage.TYPE_INT_ARGB), "jpg");
+        CellImage cellImage = new CellImage();
+        cellImage.setImage(imageWithSuffix);
+        JWorkBook jWorkBook = new JWorkBook(workBook, "text");
+        jWorkBook.setPictureElem(cellElement, cellImage);
+        Assert.assertEquals(imageWithSuffix, cellElement.getValue());
+    }
+
+    public void testJForm() {
+        Form form = new Form();
+        ElementCaseEditor editor = new ElementCaseEditor();
+        FormElementCase elementCase = new FormElementCase();
+        TemplateCellElement cellElement = new DefaultTemplateCellElement();
+        elementCase.addCellElement(cellElement);
+        editor.setElementCase(elementCase);
+        form.getContainer().addWidget(editor);
+        ImageWithSuffix imageWithSuffix = ImageWithSuffix.build(new BufferedImage(100, 100, BufferedImage.TYPE_INT_ARGB), "jpg");
+        CellImage cellImage = new CellImage();
+        cellImage.setImage(imageWithSuffix);
+        JForm jForm = new JForm();
+        jForm.setTarget(form);
+        jForm.setPictureElem(cellElement, cellImage);
+        Assert.assertEquals(imageWithSuffix, cellElement.getValue());
+    }
+}
\ No newline at end of file

From 8c911c3c21339fa3f95b6e6d4ea4946d4201bdae Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Fri, 5 Jul 2019 16:05:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8D=A2=E4=B8=AA=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/com.fr/design/mainframe/JFileTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 2d153c920..3b5bd1a14 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
@@ -36,7 +36,7 @@ public class JFileTest extends TestCase {
         Designer designer = new Designer(new String[0]);
     }
 
-    public void testJWorkBook() {
+    public void testJWorkBookSetPicture() {
         WorkBook workBook = new WorkBook();
         WorkSheet workSheet = new WorkSheet();
         workBook.addReport("sheet1", workSheet);
@@ -50,7 +50,7 @@ public class JFileTest extends TestCase {
         Assert.assertEquals(imageWithSuffix, cellElement.getValue());
     }
 
-    public void testJForm() {
+    public void testJFormSetPicture() {
         Form form = new Form();
         ElementCaseEditor editor = new ElementCaseEditor();
         FormElementCase elementCase = new FormElementCase();