From 1a6d76780c9e506b8b4c5a7aae0e2f67ac859cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sautter?= Date: Mon, 26 Jun 2023 21:08:22 +0200 Subject: [PATCH] [java] Deprecate all 'lift style' code --- java/src/org/openqa/selenium/lift/Finders.java | 1 + java/src/org/openqa/selenium/lift/HamcrestWebDriverTestCase.java | 1 + java/src/org/openqa/selenium/lift/Matchers.java | 1 + java/src/org/openqa/selenium/lift/TestContext.java | 1 + java/src/org/openqa/selenium/lift/WebDriverTestContext.java | 1 + java/src/org/openqa/selenium/lift/find/BaseFinder.java | 1 + java/src/org/openqa/selenium/lift/find/DivFinder.java | 1 + java/src/org/openqa/selenium/lift/find/Finder.java | 1 + java/src/org/openqa/selenium/lift/find/HtmlTagFinder.java | 1 + java/src/org/openqa/selenium/lift/find/ImageFinder.java | 1 + java/src/org/openqa/selenium/lift/find/InputFinder.java | 1 + java/src/org/openqa/selenium/lift/find/LinkFinder.java | 1 + java/src/org/openqa/selenium/lift/find/PageTitleFinder.java | 1 + java/src/org/openqa/selenium/lift/find/TableCellFinder.java | 1 + java/src/org/openqa/selenium/lift/find/TableFinder.java | 1 + java/src/org/openqa/selenium/lift/find/XPathFinder.java | 1 + java/src/org/openqa/selenium/lift/match/AttributeMatcher.java | 1 + java/src/org/openqa/selenium/lift/match/DisplayedMatcher.java | 1 + java/src/org/openqa/selenium/lift/match/NumericalMatchers.java | 1 + java/src/org/openqa/selenium/lift/match/SelectionMatcher.java | 1 + java/src/org/openqa/selenium/lift/match/TextMatcher.java | 1 + java/src/org/openqa/selenium/lift/match/ValueMatcher.java | 1 + 22 files changed, 22 insertions(+) diff --git a/java/src/org/openqa/selenium/lift/Finders.java b/java/src/org/openqa/selenium/lift/Finders.java index 6d590978ac79a..5b9faa11ceaf4 100644 --- a/java/src/org/openqa/selenium/lift/Finders.java +++ b/java/src/org/openqa/selenium/lift/Finders.java @@ -27,6 +27,7 @@ import org.openqa.selenium.lift.find.BaseFinder; import org.openqa.selenium.lift.find.Finder; +@Deprecated public class Finders { public static org.openqa.selenium.lift.find.HtmlTagFinder div() { diff --git a/java/src/org/openqa/selenium/lift/HamcrestWebDriverTestCase.java b/java/src/org/openqa/selenium/lift/HamcrestWebDriverTestCase.java index 4040a61b42066..2ce7e0a8e6950 100644 --- a/java/src/org/openqa/selenium/lift/HamcrestWebDriverTestCase.java +++ b/java/src/org/openqa/selenium/lift/HamcrestWebDriverTestCase.java @@ -27,6 +27,7 @@ import org.openqa.selenium.lift.find.Finder; /** Base class for tests using the LiFT style API to driver WebDriver. */ +@Deprecated public abstract class HamcrestWebDriverTestCase extends TestCase { private static final long DEFAULT_TIMEOUT = 5000; diff --git a/java/src/org/openqa/selenium/lift/Matchers.java b/java/src/org/openqa/selenium/lift/Matchers.java index 4b79ae9832712..40e933fee342c 100644 --- a/java/src/org/openqa/selenium/lift/Matchers.java +++ b/java/src/org/openqa/selenium/lift/Matchers.java @@ -18,6 +18,7 @@ // Generated source. package org.openqa.selenium.lift; +@Deprecated public class Matchers { public static org.hamcrest.Matcher attribute( diff --git a/java/src/org/openqa/selenium/lift/TestContext.java b/java/src/org/openqa/selenium/lift/TestContext.java index b83b9910ddab5..7ce36a1105c0a 100644 --- a/java/src/org/openqa/selenium/lift/TestContext.java +++ b/java/src/org/openqa/selenium/lift/TestContext.java @@ -23,6 +23,7 @@ import org.openqa.selenium.lift.find.Finder; /** Interface for objects that provide a context (maintaining any state) for web tests. */ +@Deprecated public interface TestContext { void goTo(String url); diff --git a/java/src/org/openqa/selenium/lift/WebDriverTestContext.java b/java/src/org/openqa/selenium/lift/WebDriverTestContext.java index 7ca37053e7123..effdeb6e04fbd 100644 --- a/java/src/org/openqa/selenium/lift/WebDriverTestContext.java +++ b/java/src/org/openqa/selenium/lift/WebDriverTestContext.java @@ -34,6 +34,7 @@ import org.openqa.selenium.support.ui.WebDriverWait; /** Gives the context for a test, holds page state, and interacts with the {@link WebDriver}. */ +@Deprecated public class WebDriverTestContext implements TestContext { private WebDriver driver; diff --git a/java/src/org/openqa/selenium/lift/find/BaseFinder.java b/java/src/org/openqa/selenium/lift/find/BaseFinder.java index bb56e1e74a777..61bb0fbdec382 100644 --- a/java/src/org/openqa/selenium/lift/find/BaseFinder.java +++ b/java/src/org/openqa/selenium/lift/find/BaseFinder.java @@ -28,6 +28,7 @@ * Base class for {@link Finder}s. These allow the creation of a specification to be applied to * objects of type T, to identify and return a Collection of any contained objects of type S. */ +@Deprecated public abstract class BaseFinder implements Finder { protected List> matchers = new ArrayList<>(); diff --git a/java/src/org/openqa/selenium/lift/find/DivFinder.java b/java/src/org/openqa/selenium/lift/find/DivFinder.java index 736c75cb84c5d..e89f0427540da 100644 --- a/java/src/org/openqa/selenium/lift/find/DivFinder.java +++ b/java/src/org/openqa/selenium/lift/find/DivFinder.java @@ -21,6 +21,7 @@ import static org.openqa.selenium.lift.match.AttributeMatcher.attribute; /** {@link Finder} for HTML div tags. */ +@Deprecated public class DivFinder extends HtmlTagFinder { @Override diff --git a/java/src/org/openqa/selenium/lift/find/Finder.java b/java/src/org/openqa/selenium/lift/find/Finder.java index 6c8d4f72a32ac..b7a7ddea273c4 100644 --- a/java/src/org/openqa/selenium/lift/find/Finder.java +++ b/java/src/org/openqa/selenium/lift/find/Finder.java @@ -21,6 +21,7 @@ import org.hamcrest.Matcher; import org.hamcrest.SelfDescribing; +@Deprecated public interface Finder extends SelfDescribing { Collection findFrom(T context); diff --git a/java/src/org/openqa/selenium/lift/find/HtmlTagFinder.java b/java/src/org/openqa/selenium/lift/find/HtmlTagFinder.java index 0532bee1cd03c..bf198a7d3fa02 100644 --- a/java/src/org/openqa/selenium/lift/find/HtmlTagFinder.java +++ b/java/src/org/openqa/selenium/lift/find/HtmlTagFinder.java @@ -28,6 +28,7 @@ * Base {@link Finder} for all types of HTML tags. Subclasses should be created for each specific * tag, specifying the tag name (e.g. "a" in the case or an anchor tag), and a description. */ +@Deprecated public abstract class HtmlTagFinder extends BaseFinder { @Override diff --git a/java/src/org/openqa/selenium/lift/find/ImageFinder.java b/java/src/org/openqa/selenium/lift/find/ImageFinder.java index 15313157b3f10..0dcdd03fc0f29 100644 --- a/java/src/org/openqa/selenium/lift/find/ImageFinder.java +++ b/java/src/org/openqa/selenium/lift/find/ImageFinder.java @@ -18,6 +18,7 @@ package org.openqa.selenium.lift.find; /** {@link Finder} for HTML image tags. */ +@Deprecated public class ImageFinder extends HtmlTagFinder { @Override diff --git a/java/src/org/openqa/selenium/lift/find/InputFinder.java b/java/src/org/openqa/selenium/lift/find/InputFinder.java index bf11bd9813e2a..a12228076a332 100644 --- a/java/src/org/openqa/selenium/lift/find/InputFinder.java +++ b/java/src/org/openqa/selenium/lift/find/InputFinder.java @@ -22,6 +22,7 @@ import static org.openqa.selenium.lift.Matchers.value; /** {@link Finder} for HTML input tags. */ +@Deprecated public class InputFinder extends HtmlTagFinder { @Override diff --git a/java/src/org/openqa/selenium/lift/find/LinkFinder.java b/java/src/org/openqa/selenium/lift/find/LinkFinder.java index b4f6734499ea3..b42e0b31e5fef 100644 --- a/java/src/org/openqa/selenium/lift/find/LinkFinder.java +++ b/java/src/org/openqa/selenium/lift/find/LinkFinder.java @@ -21,6 +21,7 @@ import static org.openqa.selenium.lift.match.TextMatcher.text; /** A {@link Finder} for HTML anchor tags, "links". */ +@Deprecated public class LinkFinder extends HtmlTagFinder { private LinkFinder() {} diff --git a/java/src/org/openqa/selenium/lift/find/PageTitleFinder.java b/java/src/org/openqa/selenium/lift/find/PageTitleFinder.java index 211b5b2e9a7a1..2142708df8180 100644 --- a/java/src/org/openqa/selenium/lift/find/PageTitleFinder.java +++ b/java/src/org/openqa/selenium/lift/find/PageTitleFinder.java @@ -21,6 +21,7 @@ import static org.openqa.selenium.lift.match.TextMatcher.text; /** A {@link Finder} for HTML title tags. */ +@Deprecated public class PageTitleFinder extends HtmlTagFinder { private PageTitleFinder() {} diff --git a/java/src/org/openqa/selenium/lift/find/TableCellFinder.java b/java/src/org/openqa/selenium/lift/find/TableCellFinder.java index 07f3c3f3638fe..ec098b59c669e 100644 --- a/java/src/org/openqa/selenium/lift/find/TableCellFinder.java +++ b/java/src/org/openqa/selenium/lift/find/TableCellFinder.java @@ -18,6 +18,7 @@ package org.openqa.selenium.lift.find; /** A {@link Finder} for HTML table cell "td" tags. */ +@Deprecated public class TableCellFinder extends HtmlTagFinder { private TableCellFinder() {} diff --git a/java/src/org/openqa/selenium/lift/find/TableFinder.java b/java/src/org/openqa/selenium/lift/find/TableFinder.java index 7ea00942b99fd..3c9d4460639b5 100644 --- a/java/src/org/openqa/selenium/lift/find/TableFinder.java +++ b/java/src/org/openqa/selenium/lift/find/TableFinder.java @@ -18,6 +18,7 @@ package org.openqa.selenium.lift.find; /** A {@link Finder} for HTML table tags. */ +@Deprecated public class TableFinder extends HtmlTagFinder { private TableFinder() {} diff --git a/java/src/org/openqa/selenium/lift/find/XPathFinder.java b/java/src/org/openqa/selenium/lift/find/XPathFinder.java index 8977cfb4655f4..e888e0a7b3e31 100644 --- a/java/src/org/openqa/selenium/lift/find/XPathFinder.java +++ b/java/src/org/openqa/selenium/lift/find/XPathFinder.java @@ -23,6 +23,7 @@ import org.openqa.selenium.WebElement; /** A {@link Finder} for elements using XPath expressions */ +@Deprecated public class XPathFinder extends BaseFinder { private final String xpath; diff --git a/java/src/org/openqa/selenium/lift/match/AttributeMatcher.java b/java/src/org/openqa/selenium/lift/match/AttributeMatcher.java index cbcd212916182..89150f059a979 100644 --- a/java/src/org/openqa/selenium/lift/match/AttributeMatcher.java +++ b/java/src/org/openqa/selenium/lift/match/AttributeMatcher.java @@ -23,6 +23,7 @@ import org.openqa.selenium.WebElement; /** hamcrest matcher for attributes of {@link WebElement}s. */ +@Deprecated public class AttributeMatcher extends TypeSafeMatcher { private final Matcher matcher; diff --git a/java/src/org/openqa/selenium/lift/match/DisplayedMatcher.java b/java/src/org/openqa/selenium/lift/match/DisplayedMatcher.java index d1f90283536e3..1b04e0e05adcc 100644 --- a/java/src/org/openqa/selenium/lift/match/DisplayedMatcher.java +++ b/java/src/org/openqa/selenium/lift/match/DisplayedMatcher.java @@ -22,6 +22,7 @@ import org.openqa.selenium.WebElement; /** Hamcrest matcher for displayed status of {@link WebElement}s. */ +@Deprecated public class DisplayedMatcher extends TypeSafeMatcher { private DisplayedMatcher() {} diff --git a/java/src/org/openqa/selenium/lift/match/NumericalMatchers.java b/java/src/org/openqa/selenium/lift/match/NumericalMatchers.java index c74d5de8a6467..c92b178fc4c97 100644 --- a/java/src/org/openqa/selenium/lift/match/NumericalMatchers.java +++ b/java/src/org/openqa/selenium/lift/match/NumericalMatchers.java @@ -23,6 +23,7 @@ import org.hamcrest.Matcher; /** Various numerical hamcrest {@link Matcher}s. */ +@Deprecated public class NumericalMatchers { public static Matcher atLeast(int i) { diff --git a/java/src/org/openqa/selenium/lift/match/SelectionMatcher.java b/java/src/org/openqa/selenium/lift/match/SelectionMatcher.java index 4172d4533ed1f..aa84966fcea1a 100644 --- a/java/src/org/openqa/selenium/lift/match/SelectionMatcher.java +++ b/java/src/org/openqa/selenium/lift/match/SelectionMatcher.java @@ -23,6 +23,7 @@ import org.openqa.selenium.WebElement; /** Matcher to match a selected element (e.g. a radio button). */ +@Deprecated public class SelectionMatcher extends TypeSafeMatcher { @Override diff --git a/java/src/org/openqa/selenium/lift/match/TextMatcher.java b/java/src/org/openqa/selenium/lift/match/TextMatcher.java index 86fc97b0fe655..ca70cbd06961c 100644 --- a/java/src/org/openqa/selenium/lift/match/TextMatcher.java +++ b/java/src/org/openqa/selenium/lift/match/TextMatcher.java @@ -23,6 +23,7 @@ import org.openqa.selenium.WebElement; /** {@link Matcher} for matching text content within {@link WebElement}s. */ +@Deprecated public class TextMatcher extends TypeSafeMatcher { private final Matcher matcher; diff --git a/java/src/org/openqa/selenium/lift/match/ValueMatcher.java b/java/src/org/openqa/selenium/lift/match/ValueMatcher.java index cf989ce107980..f316ff2f42e20 100644 --- a/java/src/org/openqa/selenium/lift/match/ValueMatcher.java +++ b/java/src/org/openqa/selenium/lift/match/ValueMatcher.java @@ -23,6 +23,7 @@ import org.openqa.selenium.WebElement; /** Matches the value of an element, for example an input field. */ +@Deprecated public class ValueMatcher extends TypeSafeMatcher { private final Object value;