From fbb79c0c91be756b782674a497e782cb57450527 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 11 Dec 2012 01:13:10 +0800 Subject: [PATCH] IDEMPIERE-92 - Integrate Selenium. Include only id space owner's id as part of component uuid to make it easier to extract zk id locator from generated html id. --- .../src/org/adempiere/webui/AdempiereIdGenerator.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java index 984a8f0ea4..7075ed04ae 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java @@ -19,6 +19,7 @@ import java.util.regex.Pattern; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Desktop; +import org.zkoss.zk.ui.IdSpace; import org.zkoss.zk.ui.Page; import org.zkoss.zk.ui.metainfo.ComponentInfo; import org.zkoss.zk.ui.sys.IdGenerator; @@ -50,9 +51,12 @@ public class AdempiereIdGenerator implements IdGenerator { StringBuilder builder = new StringBuilder(prefix); Component parent = comp.getParent(); while(parent != null) { - String id = parent.getId(); - if (id != null && id.length() > 0) - builder.insert(0, id+"_"); + //only include id space owner to ease converting test case to use zk id selector instead of uuid + if (parent instanceof IdSpace) { + String id = parent.getId(); + if (id != null && id.length() > 0) + builder.insert(0, id+"_"); + } parent = parent.getParent(); } prefix = builder.toString();