From 9303769fca84dc256071af3a4df8b38840fd5e99 Mon Sep 17 00:00:00 2001 From: Jumper Chen Date: Fri, 20 Dec 2024 15:27:12 +0800 Subject: [PATCH] ZK-5824: separate fragment widget into an independent library or another jar --- package-lock.json | 8 +- zkdoc/release-note | 2 + .../org/zkoss/zktest/test2/B86_ZK_4014VM.java | 26 ----- .../zktest/test2/F85_ZK_3681_Command_VM.java | 23 ---- .../test2/F85_ZK_3681_Databinding_VM.java | 52 --------- .../zkoss/zktest/test2/F85_ZK_3681_Issue.java | 47 -------- .../zktest/test2/F85_ZK_3681_Shadow_VM.java | 27 ----- .../test2/F85_ZK_3681_Validator_VM.java | 102 ----------------- zktest/src/main/webapp/test2/B85-ZK-3840.zul | 35 ------ zktest/src/main/webapp/test2/B86-ZK-3996.zul | 35 ------ zktest/src/main/webapp/test2/B86-ZK-4014.zul | 34 ------ zktest/src/main/webapp/test2/B86-ZK-4025.zul | 49 --------- zktest/src/main/webapp/test2/B86-ZK-4031.zul | 65 ----------- .../main/webapp/test2/F85-ZK-3681-Command.zul | 29 ----- .../webapp/test2/F85-ZK-3681-Component.zul | 57 ---------- .../webapp/test2/F85-ZK-3681-Databinding.zul | 38 ------- .../webapp/test2/F85-ZK-3681-Jsvalidator.zul | 42 ------- .../main/webapp/test2/F85-ZK-3681-Shadow.zul | 40 ------- .../test2/F85-ZK-3681-Validator-Form.zul | 43 -------- .../webapp/test2/F85-ZK-3681-Validator.zul | 38 ------- zktest/src/main/webapp/test2/F85-ZK-3780.zul | 23 ---- .../src/main/webapp/test2/config.properties | 13 --- .../zktest/zats/test2/B86_ZK_3996Test.java | 32 ------ .../zktest/zats/test2/B86_ZK_4014Test.java | 18 --- .../zktest/zats/test2/B86_ZK_4025Test.java | 33 ------ .../zktest/zats/test2/B86_ZK_4031Test.java | 18 --- .../zats/test2/F85_ZK_3681_CommandTest.java | 33 ------ .../zats/test2/F85_ZK_3681_ComponentTest.java | 59 ---------- .../test2/F85_ZK_3681_DatabindingTest.java | 104 ------------------ .../test2/F85_ZK_3681_JsvalidatorTest.java | 45 -------- .../zats/test2/F85_ZK_3681_ShadowTest.java | 19 ---- .../zats/test2/F85_ZK_3681_TestCase.java | 16 --- .../zats/test2/F85_ZK_3681_ValidatorTest.java | 33 ------ .../test2/F85_ZK_3681_Validator_FormTest.java | 40 ------- .../zktest/zats/test2/F85_ZK_3780Test.java | 33 ------ zul/src/main/resources/metainfo/xml/zul.xsd | 42 ------- 36 files changed, 7 insertions(+), 1346 deletions(-) delete mode 100644 zktest/src/main/java/org/zkoss/zktest/test2/B86_ZK_4014VM.java delete mode 100644 zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Command_VM.java delete mode 100644 zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Databinding_VM.java delete mode 100644 zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Issue.java delete mode 100644 zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Shadow_VM.java delete mode 100644 zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Validator_VM.java delete mode 100644 zktest/src/main/webapp/test2/B85-ZK-3840.zul delete mode 100644 zktest/src/main/webapp/test2/B86-ZK-3996.zul delete mode 100644 zktest/src/main/webapp/test2/B86-ZK-4014.zul delete mode 100644 zktest/src/main/webapp/test2/B86-ZK-4025.zul delete mode 100644 zktest/src/main/webapp/test2/B86-ZK-4031.zul delete mode 100644 zktest/src/main/webapp/test2/F85-ZK-3681-Command.zul delete mode 100644 zktest/src/main/webapp/test2/F85-ZK-3681-Component.zul delete mode 100644 zktest/src/main/webapp/test2/F85-ZK-3681-Databinding.zul delete mode 100644 zktest/src/main/webapp/test2/F85-ZK-3681-Jsvalidator.zul delete mode 100644 zktest/src/main/webapp/test2/F85-ZK-3681-Shadow.zul delete mode 100644 zktest/src/main/webapp/test2/F85-ZK-3681-Validator-Form.zul delete mode 100644 zktest/src/main/webapp/test2/F85-ZK-3681-Validator.zul delete mode 100644 zktest/src/main/webapp/test2/F85-ZK-3780.zul delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_3996Test.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4014Test.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4025Test.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4031Test.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_CommandTest.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ComponentTest.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_DatabindingTest.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_JsvalidatorTest.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ShadowTest.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_TestCase.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ValidatorTest.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_Validator_FormTest.java delete mode 100644 zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3780Test.java diff --git a/package-lock.json b/package-lock.json index cd4ff8cbd3d..9f05d4f7625 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5828,6 +5828,7 @@ "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -11615,9 +11616,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -11625,6 +11626,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, diff --git a/zkdoc/release-note b/zkdoc/release-note index 0744013286f..7c5c8a45cca 100644 --- a/zkdoc/release-note +++ b/zkdoc/release-note @@ -1,9 +1,11 @@ ZK 10.2.0 * Features + ZK-5824: separate fragment widget into an independent library or another jar * Bugs * Upgrade Notes + + Remove the Fragment component from the zkmax.jar and use the new Client MVVM (client-bind.jar) library instead. -------- ZK 10.1.0 diff --git a/zktest/src/main/java/org/zkoss/zktest/test2/B86_ZK_4014VM.java b/zktest/src/main/java/org/zkoss/zktest/test2/B86_ZK_4014VM.java deleted file mode 100644 index e200e0cde31..00000000000 --- a/zktest/src/main/java/org/zkoss/zktest/test2/B86_ZK_4014VM.java +++ /dev/null @@ -1,26 +0,0 @@ -/* B86_ZK_4014VM.java - - Purpose: - - Description: - - History: - Thu Aug 02 17:49:05 CST 2018, Created by rudyhuang - -Copyright (C) 2018 Potix Corporation. All Rights Reserved. -*/ -package org.zkoss.zktest.test2; - -import org.zkoss.zul.ListModel; -import org.zkoss.zul.ListModelList; - -/** - * @author rudyhuang - */ -public class B86_ZK_4014VM { - public ListModel getModel() { - return new ListModelList<>(new String[] { - "test1", "test2", "test3", "test4" - }); - } -} diff --git a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Command_VM.java b/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Command_VM.java deleted file mode 100644 index 7d6608c97f1..00000000000 --- a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Command_VM.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zkoss.zktest.test2; - -import org.zkoss.bind.annotation.BindingParam; -import org.zkoss.bind.annotation.Command; -import org.zkoss.bind.annotation.NotifyChange; - -public class F85_ZK_3681_Command_VM { - private String status; - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - @Command - @NotifyChange("status") - public void onCheck(@BindingParam("checked") boolean checked) { - status = checked ? "Checked" : "Not checked"; - } -} diff --git a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Databinding_VM.java b/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Databinding_VM.java deleted file mode 100644 index 18f3189f454..00000000000 --- a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Databinding_VM.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.zkoss.zktest.test2; - -import java.math.BigInteger; - -import org.zkoss.bind.annotation.BindingParam; -import org.zkoss.bind.annotation.GlobalCommand; -import org.zkoss.zk.ui.util.Clients; - -public class F85_ZK_3681_Databinding_VM { - private String name = "ZK"; - private int money = 0; - private BigInteger assets = BigInteger.valueOf(0L); - private F85_ZK_3681_Issue issue = new F85_ZK_3681_Issue(false, "ZK-1234", "Test"); - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public int getMoney() { - return money; - } - - public void setMoney(int money) { - this.money = money; - } - - public BigInteger getAssets() { - return assets; - } - - public void setAssets(BigInteger assets) { - this.assets = assets; - } - - public F85_ZK_3681_Issue getIssue() { - return issue; - } - - public void setIssue(F85_ZK_3681_Issue issue) { - this.issue = issue; - } - - @GlobalCommand - public void callGlobal(@BindingParam("text") String text, - @BindingParam("num") int num) { - Clients.log("You called @GlobalCommand. text=" + text + ",num=" + num); - } -} diff --git a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Issue.java b/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Issue.java deleted file mode 100644 index c0746f1928e..00000000000 --- a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Issue.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zkoss.zktest.test2; - -import java.io.Serializable; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - -public class F85_ZK_3681_Issue implements Serializable { - private boolean isDone; - private String id; - private String description; - - public F85_ZK_3681_Issue() { - this(false, "", ""); - } - - public F85_ZK_3681_Issue(boolean isDone, String id, String description) { - this.isDone = isDone; - this.id = id; - this.description = description; - } - - public boolean isDone() { - return isDone; - } - - public void setDone(boolean done) { - isDone = done; - } - - @Pattern(regexp = "^[A-Z]+-\\d+$", message = "ID is invalid.") - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - @Size(min = 3, message = "Description is too short (minimum is 3 characters)") - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} diff --git a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Shadow_VM.java b/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Shadow_VM.java deleted file mode 100644 index 082bd171d71..00000000000 --- a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Shadow_VM.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.zkoss.zktest.test2; - -import java.util.ArrayList; -import java.util.List; - -import org.zkoss.bind.annotation.Init; - -public class F85_ZK_3681_Shadow_VM { - private List issues = new ArrayList(); - - public List getIssues() { - return issues; - } - - @Init - public void init() { - issues.add(newIssue(true, "ZK-3300", "Zhtml components support MVVM")); - issues.add(newIssue(false, "ZK-3521", "Missing Spinner Error message if number out of bound")); - issues.add(newIssue(true, "ZK-3525", "implement frozen alternative")); - issues.add(newIssue(false, "ZK-3663", "ZK doesn't render 's child components in a zhtml")); - issues.add(newIssue(false, "ZK-3679", "a custom checked exception is wrapped as OperationException")); - } - - private F85_ZK_3681_Issue newIssue(boolean isDone, String id, String desc) { - return new F85_ZK_3681_Issue(isDone, id, desc); - } -} diff --git a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Validator_VM.java b/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Validator_VM.java deleted file mode 100644 index 829c98a403b..00000000000 --- a/zktest/src/main/java/org/zkoss/zktest/test2/F85_ZK_3681_Validator_VM.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.zkoss.zktest.test2; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; - -import org.zkoss.bind.ValidationContext; -import org.zkoss.bind.Validator; -import org.zkoss.bind.annotation.Command; -import org.zkoss.bind.annotation.NotifyChange; -import org.zkoss.bind.validator.AbstractValidator; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Page; -import org.zkoss.zk.ui.sys.ComponentCtrl; -import org.zkoss.zul.Label; - -public class F85_ZK_3681_Validator_VM implements Serializable { - private static final Validator REGEX_VALIDATOR = new RegExValidator(); - - private F85_ZK_3681_Issue selected = new F85_ZK_3681_Issue( - true, "ZK-3274", "Allow infinite CometServerPush.retry.count"); - - public F85_ZK_3681_Issue getSelected() { - return selected; - } - - public void setSelected(F85_ZK_3681_Issue selected) { - this.selected = selected; - } - - public Validator getRegexValidator() { - return REGEX_VALIDATOR; - } - - @Command - @NotifyChange("selected") - public void save() { - // Do nothing just a trigger - } - - private static class RegExValidator extends AbstractValidator { - public void validate(ValidationContext ctx) { - String regex = (String) ctx.getValidatorArg("regex"); - String key = (String) ctx.getValidatorArg("key"); - Object value = ctx.getProperty().getValue(); - if (value == null || !value.toString().matches(regex)) { - addInvalidMessage(ctx, key, "Invalid: " + value); - } - } - } - - byte[] _bytes; - public void doSerialize(Component comp, Label msg) { - try { - doSerialize0(comp); - doDeserialize0(comp, msg); - } catch (Exception x) { - x.printStackTrace(); - msg.setValue("error :" + x.getClass() + "," + x.getMessage()); - } - } - - private void doSerialize0(Component comp) throws Exception { - Page pg = comp.getPage(); - ((ComponentCtrl) comp).sessionWillPassivate(pg); // simulate - ByteArrayOutputStream oaos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(oaos); - oos.writeObject(comp); - oos.close(); - oaos.close(); - _bytes = oaos.toByteArray(); - } - - private void doDeserialize0(Component comp, Label msg) throws Exception { - ByteArrayInputStream oaos = new ByteArrayInputStream(_bytes); - ObjectInputStream oos = new ObjectInputStream(oaos); - - Component newcomp = (Component) oos.readObject(); - Component parent = comp.getParent(); - Component ref = comp.getNextSibling(); - comp.detach(); - oos.close(); - oaos.close(); - parent.insertBefore(newcomp, ref); - // for loading component back. - ((ComponentCtrl) newcomp).sessionDidActivate(newcomp.getPage()); // simulate - msg.setValue("done deserialize: " + _bytes.length); - } - - public void doClone(Component comp) { - replaceComponent(comp, (Component) comp.clone()); - } - - private void replaceComponent(Component oc, Component nc) { - Component parent = oc.getParent(); - Component ref = oc.getNextSibling(); - oc.detach(); - parent.insertBefore(nc, ref); - } -} diff --git a/zktest/src/main/webapp/test2/B85-ZK-3840.zul b/zktest/src/main/webapp/test2/B85-ZK-3840.zul deleted file mode 100644 index 4190edcfd4c..00000000000 --- a/zktest/src/main/webapp/test2/B85-ZK-3840.zul +++ /dev/null @@ -1,35 +0,0 @@ - - - - - -
hflex div
- Fragment content(fr1) - - -
vflex div
- Fragment content - - - ]]> - '_' in string fails - ]]> - '+' in string fails - ]]> - '-' in string fails - ]]> - '@' in string fails - ]]> - '好' in string fails - ]]> - data=aaa, data2=aaa - ]]> - data='aaa', data2=aaa - ]]> - data=aaa, data2='aaa' - ]]> - data='aaa', data2='aaa' - ]]> - diff --git a/zktest/src/main/webapp/test2/B86-ZK-4031.zul b/zktest/src/main/webapp/test2/B86-ZK-4031.zul deleted file mode 100644 index cad8e761c09..00000000000 --- a/zktest/src/main/webapp/test2/B86-ZK-4031.zul +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - -
- - - - - - ]]> - - - diff --git a/zktest/src/main/webapp/test2/F85-ZK-3681-Command.zul b/zktest/src/main/webapp/test2/F85-ZK-3681-Command.zul deleted file mode 100644 index 7409f0e2e88..00000000000 --- a/zktest/src/main/webapp/test2/F85-ZK-3681-Command.zul +++ /dev/null @@ -1,29 +0,0 @@ - - - -
- - - Check this checkbox: -
- -
- - -
- ]]> - diff --git a/zktest/src/main/webapp/test2/F85-ZK-3681-Component.zul b/zktest/src/main/webapp/test2/F85-ZK-3681-Component.zul deleted file mode 100644 index 98ef3463d5d..00000000000 --- a/zktest/src/main/webapp/test2/F85-ZK-3681-Component.zul +++ /dev/null @@ -1,57 +0,0 @@ - - - - - -

Editing selected issue

-

- Issue ID: - - -

-

- Issue Description: - -

- -

Result

-

Issue ID:

-

Issue Description:

-
- ]]> - message: - - - - - -

- -

Result

-

Issue ID:

-

Issue Description:

- - ]]> - diff --git a/zktest/src/main/webapp/test2/F85-ZK-3681-Validator.zul b/zktest/src/main/webapp/test2/F85-ZK-3681-Validator.zul deleted file mode 100644 index e4aaa17f424..00000000000 --- a/zktest/src/main/webapp/test2/F85-ZK-3681-Validator.zul +++ /dev/null @@ -1,38 +0,0 @@ - - - - -

Editing selected issue

-

- Issue ID: - - -

-

- Issue Description: - -

- -

Result

-

Issue ID:

-

Issue Description:

- - ]]> - diff --git a/zktest/src/main/webapp/test2/F85-ZK-3780.zul b/zktest/src/main/webapp/test2/F85-ZK-3780.zul deleted file mode 100644 index 18c16356b94..00000000000 --- a/zktest/src/main/webapp/test2/F85-ZK-3780.zul +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/zktest/src/main/webapp/test2/config.properties b/zktest/src/main/webapp/test2/config.properties index 970aa59a9ac..8ff6e9c06bb 100644 --- a/zktest/src/main/webapp/test2/config.properties +++ b/zktest/src/main/webapp/test2/config.properties @@ -2271,7 +2271,6 @@ B85-ZK-3371.zul=A,E,Tree,TreeChildren,IE,Edge,replaceChildHTML_ ##zats##B85-ZK-3818.zul=A,E,radiogroup,indexOutOfBound ##zats##B85-ZK-3830.zul=A,E,choose,otherwise ##zats##B85-ZK-3765.zul=A,E,MVVM,AfterCompose,Binding -##ztl##B85-ZK-3840.zul=A,E,Fragment,flex ##zats##B85-ZK-3809.zul=A,E,Filedownload,URLEncoder ##ztl##B85-ZK-3589.zul=A,E,Popup,close,onFloatUp,body,scrollHeight B85-ZK-3782.zul=A,E,Scroll,Frozen,IE11,Edge,Mousewheel @@ -2383,15 +2382,12 @@ B85-ZK-4001.zul=A,E,Borderlayout,title,themes ## B86 ##ztl##B86-ZK-4008.zul=A,E,Column,flex,width -##zats##B86-ZK-3996.zul=A,E,Fragment,lexical ##ztl##B86-ZK-4015.zul=A,E,Bandbox,Popup,Modal,close ##zats##B86-ZK-4015-2.zul=A,E,Bandbox,Popup,body,close B86-ZK-3981.zul=A,E,Splitter,flex,resize,drag B86-ZK-3983.zul=A,E,Splitter,flex,resize,drag -##ztl##B86-ZK-4014.zul=A,E,Fragment,forEach ##zats##B86-ZK-4017.zul=A,E,Grid,model,DataLoader,ROD,autoSort,clear,addAll ##zats##B86-ZK-4017-listbox.zul=A,E,Listobox,model,DataLoader,ROD,autoSort,clear,addAll -##zats##B86-ZK-4025.zul=A,E,Fragment,lexical ##ztl##B86-ZK-4010.zul=A,E,Listbox,Listheader,visible,IE ##ztl##B86-ZK-4011.zul=A,E,Grid,Column,visible,IE ##ztl##B86-ZK-4011-tree.zul=A,E,Tree,Treecol,visible,IE @@ -2403,7 +2399,6 @@ B86-ZK-3997.zul=A,E,Listbox,ROD,onSize,onChildReplaced ##zats##B86-ZK-4026.zul=A,E,bind,if,test,dirtyBinding B86-ZK-4030.zul=A,E,popup,loadingOverlay,afterSize ##zats##B86-ZK-3994.zul=A,E,MeshWidget,Header,Cell,visible -##ztl##B86-ZK-4031.zul=A,E,Fragment,IE,table ##ztl##B86-ZK-3735.zul=C,E,listbox,setModel,visibleItemCount ##zats##B86-ZK-3826.zul=A,E,Datebox,Calender,year,decade ##ztl##B86-ZK-3938.zul=A,E,MeshWidget,zoomin,align @@ -3518,13 +3513,6 @@ F80-ZK-3274.zul=F80,A,E,CometServerPush,retry,infinity,properties #F85 ##ztl##F85-ZK-3525.zul=A,H,Frozen -##zats##F85-ZK-3681-Command.zul=F85,A,M,Fragment,Command -##zats##F85-ZK-3681-Component.zul=F85,A,M,Fragment -##zats##F85-ZK-3681-Databinding.zul=F85,A,M,Fragment,Databind -##zats##F85-ZK-3681-Jsvalidator.zul=F85,A,M,Fragment,Validator,JavaScript -##zats##F85-ZK-3681-Shadow.zul=F85,A,M,Fragment,Shadow -##zats##F85-ZK-3681-Validator.zul=F85,A,M,Fragment,Validator -##zats##F85-ZK-3681-Validator-Form.zul=F85,A,M,Fragment,Validator,Form ##zats##F85-ZK-3636.zul=A,E,fontawesome,iconSclass,multiple ##zats##F85-ZK-3683.zul=A,H,Splitlayout,Splitter ##zats##F85-ZK-3684.zul=B,E,Validator,JSR303 @@ -3541,7 +3529,6 @@ F85-ZK-3506.zul=A,E,KeyEvent,Mac,CommandKey,Metakey,Keystroke ##zats##F85-ZK-3520.zul=A,E,XulElement,Tooltip,Popup,Context F85-ZK-3677.zul=A,H,SourceMap,debugJS ##ztl##F85-ZK-3678,zul=A,E,iScroll,Container,window,panel,tabbox,groupbox -##zats##F85-ZK-3780.zul=A,E,Fragment,custom-tag ##ztl##F85-ZK-3778.zul=A,E,slider,slidingtext ##zats##F85-ZK-3797.zul=A,E,Zhtml,html5 ##zats##F85-ZK-3762.zul=A,E=ClassLoader diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_3996Test.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_3996Test.java deleted file mode 100644 index 4d102232f6c..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_3996Test.java +++ /dev/null @@ -1,32 +0,0 @@ -/* B86_ZK_3996Test.java - - Purpose: - - Description: - - History: - Thu Jul 26 15:19:23 CST 2018, Created by rudyhuang - -Copyright (C) 2018 Potix Corporation. All Rights Reserved. -*/ -package org.zkoss.zktest.zats.test2; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -import org.zkoss.test.webdriver.WebDriverTestCase; - -/** - * @author rudyhuang - */ -public class B86_ZK_3996Test extends WebDriverTestCase { - @Test - public void test() { - connect(); - - String errorMessage = jq("#zk_err .messagecontent").text(); - boolean hasFragmentLexicalError = errorMessage.contains("Failed to parse the content: Lexical error"); - Assertions.assertFalse(hasFragmentLexicalError, - "Fragment has a lexical error"); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4014Test.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4014Test.java deleted file mode 100644 index c2638d38cd3..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4014Test.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import org.junit.jupiter.api.Test; - -import org.zkoss.test.webdriver.WebDriverTestCase; - -public class B86_ZK_4014Test extends WebDriverTestCase { - @Test - public void test() { - connect(); - assertFalse(jq("#zk_log").exists(), "ZK log shouldn't exist"); - sleep(100); // In case of Vue.js rendering - assertEquals("0369test3test4", jq("@fragment div").text()); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4025Test.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4025Test.java deleted file mode 100644 index 62a48cc917a..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4025Test.java +++ /dev/null @@ -1,33 +0,0 @@ -/* B86_ZK_4025Test.java - - Purpose: - - Description: - - History: - Mon Aug 13 15:33:03 CST 2018, Created by rudyhuang - -Copyright (C) 2018 Potix Corporation. All Rights Reserved. -*/ -package org.zkoss.zktest.zats.test2; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -import org.zkoss.test.webdriver.WebDriverTestCase; - -/** - * @author rudyhuang - */ -public class B86_ZK_4025Test extends WebDriverTestCase { - @Test - public void test() { - connect(); - - // Yes, the same as B86_ZK_3996Test - String errorMessage = jq("#zk_err .messagecontent").text(); - boolean hasFragmentLexicalError = errorMessage.contains("Failed to parse the content: Lexical error"); - Assertions.assertFalse(hasFragmentLexicalError, - "Fragment has a lexical error"); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4031Test.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4031Test.java deleted file mode 100644 index 5d5cd135aea..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/B86_ZK_4031Test.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import org.junit.jupiter.api.Test; - -import org.zkoss.test.webdriver.WebDriverTestCase; - -public class B86_ZK_4031Test extends WebDriverTestCase { - @Test - public void test() { - connect(); - assertFalse(jq("#zk_log").exists()); - assertEquals(3, jq("tr").length()); - assertEquals(3, jq("option").length()); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_CommandTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_CommandTest.java deleted file mode 100644 index e67db84e8b6..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_CommandTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - -/** - * Created by rudyhuang on 2017/06/06. - */ -public class F85_ZK_3681_CommandTest extends F85_ZK_3681_TestCase { - @Test - public void testCommand() throws Exception { - connect(); - - check(jq(".z-fragment input[type=\"checkbox\"]")); - waitResponse(); - assertEquals("Checked", jq(".z-fragment span").html()); - } - - @Test - public void testGlobalCommand() throws Exception { - connect(); - - click(jq(".z-fragment button:eq(0)")); - waitResponse(); - assertEquals("You called @GlobalCommand. text=Hello,num=1", getZKLog()); - - closeZKLog(); - click(jq(".z-fragment button:eq(1)")); - waitResponse(); - assertEquals("You called @GlobalCommand. text=World,num=2", getZKLog()); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ComponentTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ComponentTest.java deleted file mode 100644 index 27aae081655..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ComponentTest.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.Test; - -/** - * Created by rudyhuang on 2017/06/06. - */ -public class F85_ZK_3681_ComponentTest extends F85_ZK_3681_TestCase { - @Test - public void testInvalidate() throws Exception { - connect(); - - String origId = jq(".z-fragment input[type=\"text\"]:eq(0)").val(); - click(jq("@button:eq(0)")); - waitResponse(); - - assertEquals(origId, jq(".z-fragment input[type=\"text\"]:eq(0)").val()); - } - - @Test - public void testSetSrcNonExists() throws Exception { - connect(); - - click(jq("@button:eq(1)")); - waitResponse(); - - assertEquals("Editing selected issue", jq("h1:eq(0)").text()); - assertTrue(jq("@window").exists(), "Error window not shown"); - } - - @Test - public void testSetSrc() throws Exception { - connect(); - - click(jq("@button:eq(2)")); - waitResponse(); - - assertEquals("Replaced", jq("h1").text()); - assertFalse("##-####".equals(jq("#i_id").text()), "ID not loaded"); - assertFalse("____".equals(jq("#i_desc").text()), "Description not loaded"); - } - - @Test - public void testSerializeDeserialize() throws Exception { - connect(); - - click(jq("@button:eq(3)")); - waitResponse(); - - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "zz-123"); - waitResponse(); - - assertEquals("Invalid: zz-123", jq(".z-fragment span:eq(0)").text()); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_DatabindingTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_DatabindingTest.java deleted file mode 100644 index 9ce2ac620d4..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_DatabindingTest.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.Test; - -import org.zkoss.test.webdriver.ztl.JQuery; - -/** - * Created by rudyhuang on 2017/06/05. - */ -public class F85_ZK_3681_DatabindingTest extends F85_ZK_3681_TestCase { - @Test - public void testAnnotationBind() throws Exception { - connect(); - - final JQuery textboxs = jq(".z-fragment input[type=\"text\"]"); - final String input = "{\"ZK\":11111111}"; - type(textboxs.eq(0), input); - waitResponse(); - - assertEquals(input, textboxs.eq(0).val(), "@bind error"); - assertEquals(input, textboxs.eq(1).val(), "@load error"); - assertEquals("", textboxs.eq(2).val(), "@save error"); - assertEquals(input, jq(".z-fragment span").eq(0).html(), "value error"); - } - - @Test - public void testAnnotationLoad() throws Exception { - connect(); - - final JQuery textboxs = jq(".z-fragment input[type=\"text\"]"); - final String input = "1111111111"; - type(textboxs.eq(1), input); - waitResponse(); - - assertEquals("ZK", textboxs.eq(0).val(), "@bind error"); - assertEquals(input, textboxs.eq(1).val(), "@load error"); - assertEquals("", textboxs.eq(2).val(), "@save error"); - assertEquals("ZK", jq(".z-fragment span").eq(0).html(), "value error"); - } - - @Test - public void testAnnotationSave() throws Exception { - connect(); - - final JQuery textboxs = jq(".z-fragment input[type=\"text\"]"); - final String input = "1111111111"; - type(textboxs.eq(2), input); - waitResponse(); - - assertEquals(input, textboxs.eq(0).val(), "@bind error"); - assertEquals(input, textboxs.eq(1).val(), "@load error"); - assertEquals(input, textboxs.eq(2).val(), "@save error"); - assertEquals(input, jq(".z-fragment span").eq(0).html(), "value error"); - } - - @Test - public void testDataCoercionIntOk() throws Exception { - connect(); - - type(jq(".z-fragment input[type=\"text\"]:eq(3)"), "9487"); - waitResponse(); - assertEquals("9487", jq(".z-fragment span").eq(1).html()); - } - - @Test - public void testDataCoercionIntError() throws Exception { - connect(); - - type(jq(".z-fragment input[type=\"text\"]:eq(3)"), "invalid number"); - waitResponse(); - assertEquals("0", jq(".z-fragment span").eq(1).html()); - } - - @Test - public void testDataCoercionBigIntOk() throws Exception { - connect(); - - String number = (2L * Integer.MAX_VALUE) + ""; - type(jq(".z-fragment input[type=\"text\"]:eq(4)"), number); - waitResponse(); - assertEquals(number, jq(".z-fragment span").eq(2).html()); - } - - @Test - public void testDataCoercionBigIntError() throws Exception { - connect(); - - type(jq(".z-fragment input[type=\"text\"]:eq(4)"), "invalid number"); - waitResponse(); - assertEquals("0", jq(".z-fragment span").eq(2).html()); - } - - @Test - public void testDataCoercionObjectProperty() throws Exception { - connect(); - - type(jq(".z-fragment input[type=\"text\"]:eq(5)"), "true"); - waitResponse(); - assertTrue(jq(".z-fragment span").eq(3).html().contains("\"done\": true"), "value error"); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_JsvalidatorTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_JsvalidatorTest.java deleted file mode 100644 index 14eaff4682a..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_JsvalidatorTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - -/** - * Created by rudyhuang on 2017/06/06. - */ -public class F85_ZK_3681_JsvalidatorTest extends F85_ZK_3681_TestCase { - @Test - public void testValidatorInvalid() throws Exception { - connect(); - - String origId = jq(".z-fragment span:eq(1)").html(); - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "zK-9487"); - waitResponse(); - - assertEquals("Invalid: zK-9487", jq(".z-fragment span:eq(0)").html()); - assertEquals(origId, jq(".z-fragment span:eq(1)").html()); - } - - @Test - public void testValidatorValid() throws Exception { - connect(); - - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "AK-174"); - waitResponse(); - - assertEquals("", jq(".z-fragment span:eq(0)").html()); - assertEquals("AK-174", jq(".z-fragment span:eq(1)").html()); - } - - @Test - public void testValidatorObjectNeedClone() throws Exception { - connect(); - - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "AK-174"); - waitResponse(); - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "zK-9487"); - waitResponse(); - - assertEquals("AK-174", jq(".z-fragment span:eq(1)").html()); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ShadowTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ShadowTest.java deleted file mode 100644 index e3b0b973e99..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ShadowTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - -/** - * Created by rudyhuang on 2017/06/06. - */ -public class F85_ZK_3681_ShadowTest extends F85_ZK_3681_TestCase { - @Test - public void testShadow() throws Exception { - connect(); - - assertEquals(5, jq(".z-fragment li").length()); - assertEquals(2, jq(".z-fragment input:checked").length()); - assertEquals("STRIKE", jq(".z-fragment input:checked:eq(0)").next().toElement().get("nodeName")); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_TestCase.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_TestCase.java deleted file mode 100644 index 368b022b49d..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_TestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import org.openqa.selenium.WebDriver; - -import org.zkoss.test.webdriver.WebDriverTestCase; - -/** - * Created by rudyhuang on 2017/06/06. - */ -public abstract class F85_ZK_3681_TestCase extends WebDriverTestCase { - public WebDriver connect() { - WebDriver connect = super.connect(); - waitResponse(); - return connect; - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ValidatorTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ValidatorTest.java deleted file mode 100644 index 5502c1473c1..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_ValidatorTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - -/** - * Created by rudyhuang on 2017/06/06. - */ -public class F85_ZK_3681_ValidatorTest extends F85_ZK_3681_TestCase { - @Test - public void testValidatorInvalid() throws Exception { - connect(); - - String origId = jq(".z-fragment span:eq(1)").html(); - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "zK-9487"); - waitResponse(); - - assertEquals("Invalid: zK-9487", jq(".z-fragment span:eq(0)").html()); - assertEquals(origId, jq(".z-fragment span:eq(1)").html()); - } - - @Test - public void testValidatorValid() throws Exception { - connect(); - - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "AK-174"); - waitResponse(); - - assertEquals("", jq(".z-fragment span:eq(0)").html()); - assertEquals("AK-174", jq(".z-fragment span:eq(1)").html()); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_Validator_FormTest.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_Validator_FormTest.java deleted file mode 100644 index dec3a774b26..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3681_Validator_FormTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - -/** - * Created by rudyhuang on 2017/06/06. - */ -public class F85_ZK_3681_Validator_FormTest extends F85_ZK_3681_TestCase { - @Test - public void testValidatorInvalid() throws Exception { - connect(); - - String origId = jq(".z-fragment span:eq(2)").html(); - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "zK-9487"); - type(jq(".z-fragment input[type=\"text\"]:eq(1)"), "ZK"); - click(jq(".z-fragment button")); - waitResponse(); - - assertEquals("ID is invalid.", jq(".z-fragment span:eq(0)").html()); - assertEquals("Description is too short (minimum is 3 characters)", jq(".z-fragment span:eq(1)").html()); - assertEquals(origId, jq(".z-fragment span:eq(2)").html()); - } - - @Test - public void testValidatorValid() throws Exception { - connect(); - - type(jq(".z-fragment input[type=\"text\"]:eq(0)"), "AK-174"); - type(jq(".z-fragment input[type=\"text\"]:eq(1)"), "ZK is awesome."); - click(jq(".z-fragment button")); - waitResponse(); - - assertEquals("", jq(".z-fragment span:eq(0)").html()); - assertEquals("", jq(".z-fragment span:eq(1)").html()); - assertEquals("AK-174", jq(".z-fragment span:eq(2)").html()); - assertEquals("ZK is awesome.", jq(".z-fragment span:eq(3)").html()); - } -} diff --git a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3780Test.java b/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3780Test.java deleted file mode 100644 index d6aff1b92b6..00000000000 --- a/zktest/src/test/java/org/zkoss/zktest/zats/test2/F85_ZK_3780Test.java +++ /dev/null @@ -1,33 +0,0 @@ -/* F85_ZK_3780.java - - Purpose: - - Description: - - History: - Tue Oct 24 17:48:05 CST 2017, Created by rudyhuang - -Copyright (C) 2017 Potix Corporation. All Rights Reserved. -*/ -package org.zkoss.zktest.zats.test2; - -import static org.junit.jupiter.api.Assertions.assertFalse; - -import org.junit.jupiter.api.Test; - -import org.zkoss.test.webdriver.WebDriverTestCase; -import org.zkoss.test.webdriver.ztl.JQuery; - -/** - * @author rudyhuang - */ -public class F85_ZK_3780Test extends WebDriverTestCase { - @Test - public void testNoParsingError() throws Exception { - connect(); - JQuery errMsg = jq(".z-error .messages"); - boolean hasError = errMsg.exists(); - assertFalse(hasError && errMsg.text().contains("Lexical error"), - "Might be a parsing error."); - } -} diff --git a/zul/src/main/resources/metainfo/xml/zul.xsd b/zul/src/main/resources/metainfo/xml/zul.xsd index 155945376f7..7593c40b076 100644 --- a/zul/src/main/resources/metainfo/xml/zul.xsd +++ b/zul/src/main/resources/metainfo/xml/zul.xsd @@ -722,7 +722,6 @@ - @@ -837,7 +836,6 @@ - @@ -4117,20 +4115,6 @@ - - - - - - - - - - - - - - @@ -4178,30 +4162,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -