Added Wait.untilSupplied(supplier) implementation

This is done in order to support calls like this:
Wait.untilSupplied(() -> streamOfObjects()).has(stream -> stream.count() > 0)
Which are common when waiting for a specific conditions within a @PostConstruct method

Author: slu-it

webtester-core/src/main/java/info/novatec/testit/webtester/waiting/Wait.java

@@ -88,6 +88,22 @@ public static <T> WaitUntil<T> until(T object) {
         return new WaitUntil<>(waiter.get(), new WaitConfig(), object);
     }
 
+    /**
+     * Creates a {@link WaitUntil} with the default timeout configuration of {@link WaitConfig} for the given object {@link
+     * Supplier}.
+     *
+     * @param objectSupplier the object supplier for the wait until operation
+     * @param <T> the type of the object
+     * @return the fluent wait instance
+     * @see Wait
+     * @see WaitUntil
+     * @see WaitConfig
+     * @since 2.0
+     */
+    public static <T> WaitUntil<T> untilSupplied(Supplier<T> objectSupplier) {
+        return new WaitUntil<>(waiter.get(), new WaitConfig(), objectSupplier);
+    }
+
     /**
      * Creates a {@link WaitUntil} with the default timeout from the given {@link PageFragment}'s configuration.
      *

webtester-core/src/main/java/info/novatec/testit/webtester/waiting/WaitUntil.java

@@ -1,7 +1,8 @@
 package info.novatec.testit.webtester.waiting;
 
+import java.util.function.Supplier;
+
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NonNull;
 
@@ -16,15 +17,24 @@
  * @since 2.0
  */
 @Getter(AccessLevel.PACKAGE)
-@AllArgsConstructor(access = AccessLevel.PACKAGE)
 public class WaitUntil<T> {
 
     @NonNull
     private final Waiter waiter;
     @NonNull
     private final WaitConfig config;
     @NonNull
-    private final T object;
+    private final Supplier<T> objectSupplier;
+
+    public WaitUntil(Waiter waiter, WaitConfig config, T object) {
+        this(waiter, config, () -> object);
+    }
+
+    public WaitUntil(Waiter waiter, WaitConfig config, Supplier<T> objectSupplier) {
+        this.waiter = waiter;
+        this.config = config;
+        this.objectSupplier = objectSupplier;
+    }
 
     /**
      * Waits until the given condition is met. A set of default conditions can be initialized from {@link Conditions}.
@@ -97,7 +107,7 @@ public WaitUntil<T> not(Condition<? super T> condition) throws TimeoutException
     }
 
     private WaitUntil<T> doWait(Condition<? super T> condition) {
-        waiter.waitUntil(config, () -> condition.test(object));
+        waiter.waitUntil(config, () -> condition.test(objectSupplier.get()));
         return this;
     }
 

webtester-core/src/test/java/info/novatec/testit/webtester/waiting/ConfiguredWaitTest.java

@@ -48,7 +48,7 @@ public void waitUntilIsCreatedWithSameConfiguration() {
         @Test
         public void waitUntilIsCreatedForObject() {
             WaitUntil<Object> waitUntil = cut.until(object);
-            assertThat(waitUntil.getObject()).isSameAs(object);
+            assertThat(waitUntil.getObjectSupplier().get()).isSameAs(object);
         }
 
     }

webtester-core/src/test/java/info/novatec/testit/webtester/waiting/WaitTest.java

@@ -101,7 +101,35 @@ public void waitUntilIsCreatedWithDefaultConfiguration() {
         @Test
         public void waitUntilIsCreatedForObject() {
             WaitUntil<Object> until = Wait.until(object);
-            assertThat(until.getObject()).isSameAs(object);
+            assertThat(until.getObjectSupplier().get()).isSameAs(object);
+        }
+
+    }
+
+    public static class Until_ObjectSupplier extends AbstractWaitTest {
+
+        @Mock
+        Object object;
+
+        @Test
+        public void waitUntilIsCreatedWithSameWaiter() {
+            WaitUntil<Object> until = Wait.untilSupplied(() -> object);
+            assertThat(until.getWaiter()).isSameAs(waiter);
+        }
+
+        @Test
+        public void waitUntilIsCreatedWithDefaultConfiguration() {
+            WaitUntil<Object> until = Wait.untilSupplied(() -> object);
+            WaitConfig config = until.getConfig();
+            assertThat(config.getTimeout()).isEqualTo(WaitConfig.DEFAULT_TIMEOUT);
+            assertThat(config.getTimeUnit()).isEqualTo(WaitConfig.DEFAULT_TIME_UNIT);
+            assertThat(config.getInterval()).isEqualTo(WaitConfig.DEFAULT_INTERVAL);
+        }
+
+        @Test
+        public void waitUntilIsCreatedForObject() {
+            WaitUntil<Object> until = Wait.untilSupplied(() -> object);
+            assertThat(until.getObjectSupplier().get()).isSameAs(object);
         }
 
     }
@@ -141,7 +169,7 @@ public void waitUntilIsCreatedWithFragmentsConfiguration() {
         @Test
         public void waitUntilIsCreatedForPageFragment() {
             WaitUntil<PageFragment> until = Wait.until(fragment);
-            assertThat(until.getObject()).isSameAs(fragment);
+            assertThat(until.getObjectSupplier().get()).isSameAs(fragment);
         }
 
     }