fanruan
/
design
6
1
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Pull request #17002: REPORT-148138 单测修复，由于资源同名导致覆盖，出现单测错误，通过修改资源解决。 

Merge in DESIGN/design from ~BRIAN.LUO/design:release/11.0 to release/11.0

* commit '92c87cb4e9041eef9907a88b3cf6bdf1b71bc0b4':
  REPORT-148138 单测修复，由于资源同名导致覆盖，出现单测错误，通过修改资源解决。
release/11.0
Brian.Luo-罗旭 2 days ago
parent
cf51c366b4 92c87cb4e9
commit
d6d66f7a34
3 changed files with 58 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      designer-base/src/test/java/com/fr/design/javascript/jsapi/JSAPITreeHelperTest.java
  2. 31
      designer-base/src/test/resources/com/fr/design/javascript/jsapi/category.json
  3. 27
      designer-base/src/test/resources/com/fr/design/javascript/jsapi/jsapi.json

4
designer-base/src/test/java/com/fr/design/javascript/jsapi/JSAPITreeHelperTest.java
Unescape View File

@ -13,7 +13,7 @@ public class JSAPITreeHelperTest extends TestCase {
assertTrue(names.contains( "getToolbar"));
assertTrue(names.contains( "changeFormat"));
List<String> allNames = JSAPITreeHelper.getAllNames();
assertEquals(allNames.size(),16);
assertEquals(allNames.size(),104);
}
public void testGetDirectCategory(){
@ -26,6 +26,6 @@ public class JSAPITreeHelperTest extends TestCase {
public void testCreateJSAPITree(){
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode();
JSAPITreeHelper.createJSAPITree(rootNode);
assertEquals(2,rootNode.getChildCount());
assertEquals(3,rootNode.getChildCount());
}
}

31
designer-base/src/test/resources/com/fr/design/javascript/jsapi/category.json
Unescape View File

@ -2,16 +2,45 @@
"Fine-Design_JSAPI_Public_Module": {
"Fine-Design_JSAPI_Public_Module_Global": {
"Fine-Design_JSAPI_Public_Module_Global_Universal": {},
"Fine-Design_JSAPI_Public_Module_Global_FR": {},
"Fine-Design_JSAPI_Public_Module_Global_FS": {},
"Fine-Design_JSAPI_Public_Module_Global_Mobile": {}
},
"Fine-Design_JSAPI_Public_Module_Widget": {
"Fine-Design_JSAPI_Public_Module_Date_Widget_Peculiar": {}
"Fine-Design_JSAPI_Public_Module_Widget_Get": {},
"Fine-Design_JSAPI_Public_Module_Widget_Universal": {},
"Fine-Design_JSAPI_Public_Module_Date_Widget_Peculiar": {},
"Fine-Design_JSAPI_Public_Module_Button_Widget_Peculiar": {},
"Fine-Design_JSAPI_Public_Module_Combobox_Widget_Peculiar": {}
},
"Fine-Design_JSAPI_Public_Module_Table": {
"Fine-Design_JSAPI_Public_Module_Table_Marquee": {},
"Fine-Design_JSAPI_Public_Module_Table_Scrollbar": {},
"Fine-Design_JSAPI_Public_Module_Table_Cell_Style": {},
"Fine-Design_JSAPI_Public_Module_Table_Row_Height_Col_Width": {},
"Fine-Design_JSAPI_Public_Module_Table_Cell_Value": {},
"Fine-Design_JSAPI_Public_Module_Table_Cell_Radius": {}
},
"Fine-Design_JSAPI_Public_Module_Toolbar": {
"Fine-Design_JSAPI_Public_Module_Toolbar_Email_Button": {}
},
"Fine-Design_JSAPI_Public_Module_Report_Page": {
"Fine-Design_JSAPI_Public_Module_Report_Page_Jump": {},
"Fine-Design_JSAPI_Public_Module_Report_Page_Number_Get": {}
},
"Fine-Design_JSAPI_Public_Module_Report_Export": {}
},
"Fine-Design_JSAPI_Cpt": {
"Fine-Design_JSAPI_Cpt_Page_Preview": {
"Fine-Design_JSAPI_Cpt_Page_Preview_Folding_Tree": {}
},
"Fine-Design_JSAPI_Cpt_Write_Preview": {},
"Fine-Design_JSAPI_Cpt_View_Preview": {
"Fine-Design_JSAPI_Cpt_View_Preview_Report_Location": {}
}
},
"Fine-Design_JSAPI_Form": {
"Fine-Design_JSAPI_Form_Component_Get": {},
"Fine-Design_JSAPI_Form_Component_Tab": {}
}
}

27
designer-base/src/test/resources/com/fr/design/javascript/jsapi/jsapi.json
Unescape View File

@ -1,8 +1,33 @@
{
"Fine-Design_JSAPI_Public_Module_Global_Universal": ["_g()", "getParameterContainer", "parameterCommit", "loadContentPane", "getPreviewType"],
"Fine-Design_JSAPI_Public_Module_Global_FR": [ "servletURL", "serverURL", "server", "fineServletURL", "SessionMgr.getSessionID", "showDialog", "closeDialog",
"doHyperlinkByGet", "doHyperlinkByPost", "doURLPrint", "Msg", "remoteEvaluate", "jsonEncode", "jsonDecode",
"ajax", "isEmpty", "isArray", "cellStr2ColumnRow", "columnRow2CellStr"],
"Fine-Design_JSAPI_Public_Module_Global_FS": ["signOut", "tabPane.closeActiveTab", "tabPane.addItem"],
"Fine-Design_JSAPI_Public_Module_Global_Mobile": ["location", "Mobile.getDeviceInfo"],
"Fine-Design_JSAPI_Public_Module_Widget_Get": ["this", "this.options.form", "getWidgetByName"],
"Fine-Design_JSAPI_Public_Module_Widget_Universal": ["getValue", "getText", "setValue", "visible", "invisible", "setVisible", "isVisible", "setEnable", "isEnabled",
"reset", "getType", "setWaterMark", "fireEvent", "setPopupStyle"],
"Fine-Design_JSAPI_Public_Module_Date_Widget_Peculiar":["setMaxAndMinDate"],
"Fine-Design_JSAPI_Public_Module_Button_Widget_Peculiar":["doClick"],
"Fine-Design_JSAPI_Public_Module_Combobox_Widget_Peculiar":["setName4Empty"],
"Fine-Design_JSAPI_Public_Module_Table_Marquee":["startMarquee", "stopMarquee"],
"Fine-Design_JSAPI_Public_Module_Table_Scrollbar":["setHScrollBarVisible", "setVScrollBarVisible"],
"Fine-Design_JSAPI_Public_Module_Table_Cell_Style":["addEffect"],
"Fine-Design_JSAPI_Public_Module_Table_Row_Height_Col_Width":["setRowHeight", "setColWidth"],
"Fine-Design_JSAPI_Public_Module_Table_Cell_Value":["getCellValue", "setCellValue"],
"Fine-Design_JSAPI_Public_Module_Table_Cell_Radius":["setCellRadius"],
"Fine-Design_JSAPI_Public_Module_Toolbar":["toolBarFloat", "setStyle","getToolbar"],
"Fine-Design_JSAPI_Public_Module_Toolbar_Email_Button":["changeFormat"],
"Fine-Design_JSAPI_Form_Component_Tab":["showCardByIndex", "showCardByIndex", "getShowIndex", "setTitleVisible"]
"Fine-Design_JSAPI_Public_Module_Report_Page_Jump":["gotoPreviousPage", "gotoNextPage", "gotoLastPage", "gotoFirstPage", "gotoPage"],
"Fine-Design_JSAPI_Public_Module_Report_Page_Number_Get":["getCurrentPageIndex", "getReportTotalPage", "currentPageIndex", "reportTotalPage"],
"Fine-Design_JSAPI_Public_Module_Report_Export":["exportReportToExcel", "exportReportToImage", "exportReportToPDF", "exportReportToWord"],
"Fine-Design_JSAPI_Cpt_Page_Preview_Folding_Tree":["expandNodeLayer", "collapseNodeLayer", "expandAllNodeLayer", "collapseAllNodeLayer"],
"Fine-Design_JSAPI_Cpt_Write_Preview":["getWidgetByCell", "appendReportRC", "appendReportRow",
"deleteReportRC", "deleteRows", "refreshAllSheets", "loadSheetByIndex", "loadSheetByName", "isDirtyPage",
"isAutoStash", "writeReport", "verifyAndWriteReport", "verifyReport", "importExcel", "importExcel_Clean",
"importExcel_Append", "importExcel_Cover", "stash", "clear"],
"Fine-Design_JSAPI_Cpt_View_Preview_Report_Location":["centerReport"],
"Fine-Design_JSAPI_Form_Component_Get":["getAllWidgets"],
"Fine-Design_JSAPI_Form_Component_Tab":["showCardByIndex", "getShowIndex", "setTitleVisible"]
}
Write Preview
Loading…
Cancel
Save