Add feature to use label text as identifier (#107)

Closes #102
MarketSquare · Jul 3, 2018 · 764db06 · 764db06
1 parent e92bf6d
commit 764db06
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/org/robotframework/swing/label/LabelOperatorFactory.java b/src/main/java/org/robotframework/swing/label/LabelOperatorFactory.java
@@ -17,7 +17,7 @@
 package org.robotframework.swing.label;
 
 import org.netbeans.jemmy.operators.ContainerOperator;
-import org.robotframework.swing.chooser.ByNameComponentChooser;
+import org.robotframework.swing.chooser.ByNameOrTextComponentChooser;
 import org.robotframework.swing.context.Context;
 import org.robotframework.swing.factory.DefaultContextVerifyingOperatorFactory;
 
@@ -27,6 +27,6 @@ public LabelOperator createOperatorByIndex(int index) {
     }
 
     public LabelOperator createOperatorByName(String name) {
-        return new LabelOperator((ContainerOperator) Context.getContext(), new ByNameComponentChooser(name));
+        return new LabelOperator((ContainerOperator) Context.getContext(), new ByNameOrTextComponentChooser(name));
     }
 }
diff --git a/src/test/resources/robot-tests/label.robot b/src/test/resources/robot-tests/label.robot
@@ -12,6 +12,9 @@ Label Should Exist By Index
 
 Label Should Exist By Name
     labelShouldExist  ${labelName}
+
+Label Should Exist By Text
+	labelShouldExist  ${labelContent}
 
 Label Should Exist Fails If Label Doesn't Exist
     runKeywordAndExpectError  *Label 'unexistingLabel' doesn't exist*  labelShouldExist  unexistingLabel
@@ -21,10 +24,16 @@ Label Should Not Exist By Index
 
 Label Should Not Exist By Name
     labelShouldNotExist  UnexistingLabel
+
+Label Should Not Exist By Text
+	labelShouldNotExist  UnexistingLabel
 
 Label Should Not Exist Fails If Label Exists
     runKeywordAndExpectError  *Label '${labelName}' exists*  labelShouldNotExist  ${labelName}
 
+Label Should Not Exist By Text Fails If Label Exists
+    runKeywordAndExpectError  *Label '${labelContent}' exists*  labelShouldNotExist  ${labelContent}
+
 Get Label Content By Name
     ${retrievedContent}=  getLabelContent  ${labelName}
     shouldBeEqual  ${labelContent}  ${retrievedContent}