Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java

@@ -7,6 +7,7 @@ import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.AssistUtils;
+import com.fr.stable.EncodeConstants;
 import com.fr.stable.StringUtils;
 import org.apache.commons.codec.digest.DigestUtils;
 
@@ -14,6 +15,7 @@ import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLEncoder;
 
 /**
  * Created by alex.sung on 2018/8/3.
@@ -85,7 +87,7 @@ public class RobotModel extends AlphaCellModel {
     @Override
     public void doAction() {
         try {
-            Desktop.getDesktop().browse(new URI(AlphaFineConstants.ALPHA_PREVIEW + super.getName()));
+            Desktop.getDesktop().browse(new URI(AlphaFineConstants.ALPHA_PREVIEW + URLEncoder.encode(super.getName(), EncodeConstants.ENCODING_UTF_8)));
         } catch (IOException e) {
             FineLoggerFactory.getLogger().error(e.getMessage());
         } catch (URISyntaxException e) {

designer-realize/src/test/java/com.fr/design/mainframe/alphafine/cell/model/ModelTest.java

@@ -0,0 +1,94 @@
+package com.fr.design.mainframe.alphafine.cell.model;
+
+import com.fr.design.mainframe.alphafine.AlphaFineConstants;
+import com.fr.design.mainframe.alphafine.CellType;
+import com.fr.json.JSONException;
+import com.fr.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ModelTest {
+    @Test
+    public void documentModelTest() {
+        DocumentModel documentModel = new DocumentModel("name", "content", 1);
+        Assert.assertEquals("name", documentModel.getName());
+        Assert.assertEquals("content", documentModel.getContent());
+        Assert.assertEquals(1, documentModel.getDocumentId());
+        Assert.assertEquals(AlphaFineConstants.DOCUMENT_DOC_URL + documentModel.getDocumentId() + ".html", documentModel.getDocumentUrl());
+        Assert.assertEquals(AlphaFineConstants.DOCUMENT_INFORMATION_URL + documentModel.getDocumentId(), documentModel.getInformationUrl());
+        Assert.assertEquals(documentModel.getStoreInformation(), documentModel.getInformationUrl());
+        Assert.assertEquals(CellType.DOCUMENT, documentModel.getType());
+        Assert.assertEquals(true, documentModel.hasAction());
+        Assert.assertEquals(true, documentModel.isNeedToSendToServer());
+
+        documentModel.setDescription("test");
+        Assert.assertEquals("test", documentModel.getDescription());
+
+        DocumentModel another = new DocumentModel("another", "another", 1);
+        documentModel.doAction();
+        Assert.assertTrue(another.equals(documentModel));
+        Assert.assertNotNull(documentModel.modelToJson());
+    }
+
+    @Test
+    public void bottomModelTest() {
+        BottomModel bottomModel = new BottomModel();
+        Assert.assertEquals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Internet_Forum"), bottomModel.getGoToWeb());
+        Assert.assertEquals(CellType.BOTTOM, bottomModel.getType());
+        try {
+            Assert.assertEquals(JSONObject.EMPTY, bottomModel.modelToJson());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        Assert.assertEquals(true, bottomModel.hasAction());
+        bottomModel.doAction();
+
+    }
+
+    @Test
+    public void fileModelTest() {
+        FileModel fileModel = new FileModel("name", "test\\\\");
+        Assert.assertEquals(CellType.FILE, fileModel.getType());
+        Assert.assertNotNull(fileModel.modelToJson());
+        FileModel anotherFileModel = new FileModel("anotherFileModel", "test\\\\");
+        Assert.assertTrue(anotherFileModel.equals(fileModel));
+    }
+
+    @Test
+    public void moreModelTest() {
+        MoreModel moreModel = new MoreModel("name");
+        Assert.assertTrue(!moreModel.hasAction());
+        Assert.assertTrue(!moreModel.isNeedToSendToServer());
+        Assert.assertEquals(CellType.MORE, moreModel.getType());
+    }
+
+    @Test
+    public void noResultModelTest() {
+        NoResultModel noResultModel = new NoResultModel("test");
+        Assert.assertTrue(!noResultModel.hasAction());
+        Assert.assertTrue(!noResultModel.isNeedToSendToServer());
+        Assert.assertEquals(CellType.NO_RESULT, noResultModel.getType());
+    }
+
+    @Test
+    public void pluginModelTest() {
+        PluginModel pluginModel = new PluginModel("name", "content", "url", "version", "jartime", "link", "pluginId", CellType.PLUGIN, 10000, 1);
+        Assert.assertTrue(pluginModel.hasAction());
+        Assert.assertTrue(pluginModel.isNeedToSendToServer());
+        Assert.assertEquals(CellType.PLUGIN, pluginModel.getType());
+        Assert.assertNotNull(pluginModel.modelToJson());
+    }
+
+    @Test
+    public void robotModelTest(){
+        RobotModel robotModel = new RobotModel("title","content");
+        Assert.assertTrue(robotModel.hasAction());
+        Assert.assertTrue(robotModel.isNeedToSendToServer());
+        Assert.assertEquals(CellType.ROBOT, robotModel.getType());
+        try {
+            Assert.assertNotNull(robotModel.modelToJson());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+}

designer-realize/src/test/java/com.fr/design/mainframe/alphafine/search/manager/impl/SearchManegerTest.java

@@ -0,0 +1,80 @@
+package com.fr.design.mainframe.alphafine.search.manager.impl;
+
+import com.fr.design.mainframe.alphafine.AlphaFineHelper;
+import com.fr.design.mainframe.alphafine.CellType;
+import com.fr.design.mainframe.alphafine.model.SearchResult;
+import com.fr.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SearchManegerTest {
+    SimilarSearchManeger similarSearchManeger;
+    ComplementAdviceManager complementAdviceManager;
+    DocumentSearchManager documentSearchManager;
+    PluginSearchManager pluginSearchManager;
+    RecommendSearchManager recommendSearchManager;
+    RecentSearchManager recentSearchManager;
+    ActionSearchManager actionSearchManager;
+    FileSearchManager fileSearchManager;
+    SegmentationManager segmentationManager;
+
+    @Before
+    public void setUp() {
+        recentSearchManager = RecentSearchManager.getInstance();
+        recommendSearchManager = RecommendSearchManager.getInstance();
+        similarSearchManeger = SimilarSearchManeger.getInstance();
+        complementAdviceManager = ComplementAdviceManager.getInstance();
+        documentSearchManager = DocumentSearchManager.getInstance();
+        pluginSearchManager = PluginSearchManager.getInstance();
+        actionSearchManager = ActionSearchManager.getInstance();
+        fileSearchManager = FileSearchManager.getInstance();
+        segmentationManager = SegmentationManager.getInstance();
+    }
+
+    @Test
+    public void getSearchResultTest() {
+
+        //检测网络情况
+        Assert.assertTrue(AlphaFineHelper.isNetworkOk());
+
+        //正常搜索情况
+        SearchResult lessModelList;
+        lessModelList = recentSearchManager.getLessSearchResult(new String[]{"数据集"});
+        Assert.assertNotNull(lessModelList);
+
+        lessModelList = similarSearchManeger.getLessSearchResult(new String[]{"数据集"});
+        Assert.assertEquals(lessModelList.get(1).getType(), CellType.ROBOT);
+
+        lessModelList = complementAdviceManager.getAllSearchResult(new String[]{"数据集"});
+        Assert.assertEquals(lessModelList.get(1).getType(), CellType.ROBOT);
+
+        //返回MoreSearchResult
+        SearchResult moreModelList;
+        moreModelList = similarSearchManeger.getMoreSearchResult("数据集");
+        Assert.assertNotNull(moreModelList);
+
+        moreModelList = recommendSearchManager.getMoreSearchResult("数据集");
+        Assert.assertNotNull(moreModelList);
+    }
+
+    @Test
+    public void getModelFromCloudTest() {
+        Assert.assertNotNull(SimilarSearchManeger.getModelFromCloud(new JSONObject()));
+        Assert.assertNotNull(DocumentSearchManager.getModelFromCloud(new JSONObject()));
+        Assert.assertNotNull(PluginSearchManager.getModelFromCloud(new JSONObject()));
+    }
+
+    @Test
+    public void isNeedSegmentationTest() {
+        Assert.assertEquals(segmentationManager.isNeedSegmentation("多维数据集"), true);
+    }
+
+    @Test
+    public void startSegmentationTest() {
+        String[] result = {"结果报表", "结果", "报表"};
+        Assert.assertEquals(segmentationManager.startSegmentation("结果报表"), result);
+
+    }
+
+}