Merge pull request SonicCloudOrg#39 from aoliaoaoaojiao/master

feat:add get parent node

src/main/java/org/cloud/sonic/driver/poco/models/PocoElement.java

@@ -14,7 +14,7 @@
 @ToString
 @AllArgsConstructor
 public class PocoElement {
- public String currentNodeSelector = "";
+ public String currentNodeSelector = "Root";
  private Payload payload;
  private List<PocoElement> children;
  Element rootNodeXmlElement;
@@ -67,7 +67,6 @@ public PocoElement(Element root, Element currentNodeXmlElement) {
  this(root);
  this.currentNodeXmlElement = currentNodeXmlElement;
  this.currentNodeSelector = currentNodeXmlElement.cssSelector();
- System.out.println(currentNodeSelector);
  parseXmlNode(currentNodeXmlElement);
  }
 
@@ -120,23 +119,23 @@ public void parseXmlNode(Element xmlNode) {
  payload.texture = xmlNode.attr("texture");
 
  String _instanceId = xmlNode.attr("_instanceId");
- payload._instanceId = _instanceId == null ? 0 : Integer.parseInt(_instanceId);
+ payload._instanceId = _instanceId.isEmpty()? 0 : Integer.parseInt(_instanceId);
 
  String _ilayer = xmlNode.attr("_ilayer");
- payload._ilayer = _ilayer == null ? 0 : Integer.parseInt(_ilayer);
+ payload._ilayer = _ilayer.isEmpty() ? 0 : Integer.parseInt(_ilayer);
 
  payload.type = xmlNode.attr("type");
 
  String visible = xmlNode.attr("visible");
  payload.visible = Boolean.parseBoolean(visible);
 
  String global = xmlNode.attr("global");
- payload.zOrders.global = global == null ? 0 : Float.parseFloat(global);
+ payload.zOrders.global = global.isEmpty() ? 0 : Float.parseFloat(global);
  String local = xmlNode.attr("local");
- payload.zOrders.local = local == null ? 0 : Float.parseFloat(local);
+ payload.zOrders.local = local.isEmpty() ? 0 : Float.parseFloat(local);
 
  String components = xmlNode.attr("components");
- if (components != null && components.length() > 2) {
+ if (components.length() > 2) {
  components = components.substring(1, components.length() - 1);
  payload.components = Arrays.asList(components.split(","));
  }
@@ -148,7 +147,7 @@ public void parseXmlNode(Element xmlNode) {
  }
 
  private List<Float> parseFloatAttrList(String floatAttrStr) {
- if (floatAttrStr == null && floatAttrStr.length() <= 2) return null;
+ if (floatAttrStr.length() <= 2) return null;
  List<Float> result = new ArrayList<Float>();
  floatAttrStr = floatAttrStr.substring(1, floatAttrStr.length() - 1);
  for (String numStr : floatAttrStr.split(",")) {
@@ -160,4 +159,21 @@ private List<Float> parseFloatAttrList(String floatAttrStr) {
  public Boolean currentTheNodeExists(){
  return rootNodeXmlElement.select(currentNodeSelector).first()!=null;
  }
+
+ public PocoElement getParentNode(){
+ Element xmlPocoNode = rootNodeXmlElement.select(currentNodeSelector).first();
+
+ if (xmlPocoNode == null) {
+ return null;
+ }
+ Element preChildNode = xmlPocoNode.parent();
+ if (preChildNode==null){
+ return null;
+ }
+ Element parentNode = preChildNode.parent();
+ if (parentNode==null){
+ return null;
+ }
+ return new PocoElement(rootNodeXmlElement,parentNode);
+ }
 }

src/test/java/org/cloud/sonic/driver/poco/PocoDriverTest.java

@@ -26,7 +26,8 @@ public static void beforeClass() {
  public void testPageSource() throws SonicRespException {
  Assert.assertEquals("Root", pocoDriver.getPageSource().getPayload().getType());
  Assert.assertTrue(pocoDriver.getPageSourceForJsonString().length() > 0);
- Assert.assertNotNull(pocoDriver.getPageSourceForXmlElement().data());
+ Assert.assertNotNull(pocoDriver.getPageSourceForXmlElement().toString());
+ System.out.println(pocoDriver.getPageSourceForXmlElement().toString());
  }
 
  @Test
@@ -47,6 +48,12 @@ public void testFindElement() throws SonicRespException {
  public void testFreeze() throws SonicRespException {
  String r = pocoDriver.getPageSourceForJsonString();
  pocoDriver.freezeSource();
+ try {
+ // change page tree operation
+ Thread.sleep(5*1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
  Assert.assertEquals(r, pocoDriver.getPageSourceForJsonString());
  pocoDriver.thawSource();
  }
@@ -58,6 +65,27 @@ public void testWindowsSize() throws SonicRespException {
  Assert.assertTrue(windowSize.getWidth() > 0);
  }
 
+ @Test
+ public void testNodeExist() throws SonicRespException{
+ String expression = "Root > children > MEHolo > children > AnchorManager";
+ PocoElement pocoElement = pocoDriver.findElement(expression);
+ Assert.assertTrue(pocoElement.currentTheNodeExists());
+ // mock node does not exist
+ pocoElement.currentNodeSelector = "Root > children > MEHolo > children > AnchorManager222";
+ Assert.assertTrue(pocoElement.currentTheNodeExists());
+ }
+
+ @Test
+ public void testGetParent() throws SonicRespException{
+ String expression = "Root > children > MEHolo > children > AnchorManager";
+ PocoElement pocoElement = pocoDriver.findElement(expression);
+ PocoElement parentPocoElement = pocoElement.getParentNode();
+ Assert.assertNotNull(parentPocoElement.getPayload().getName());
+ System.out.println(parentPocoElement.getPayload().getName());
+ Assert.assertNotNull(parentPocoElement.currentNodeSelector);
+ System.out.println(parentPocoElement.currentNodeSelector);
+ }
+
  @AfterClass
  public static void afterClass() {
  pocoDriver.closeDriver();