Merge branch 'develop' into jenkins
This commit is contained in:
commit
d42f8aa769
10 changed files with 281 additions and 156 deletions
49
README.adoc
49
README.adoc
|
@ -59,7 +59,7 @@ if (isTrue() && isAlsoTrue()) {
|
|||
[[source,java]]
|
||||
----
|
||||
Condition.where(isTrue())
|
||||
.and(isAlsoTrue())
|
||||
.and(() -> isAlsoTrue())
|
||||
.then(() -> doSomething())
|
||||
.otherwise(() -> doSomethingElse());
|
||||
----
|
||||
|
@ -78,7 +78,7 @@ if (isTrue() || alternativeIsTrue()) {
|
|||
[[source,java]]
|
||||
----
|
||||
Condition.where(isTrue())
|
||||
.or(alternativeIsTrue())
|
||||
.or(() -> alternativeIsTrue())
|
||||
.then(() -> doSomething())
|
||||
.otherwise(() -> doSomethingElse());
|
||||
----
|
||||
|
@ -115,7 +115,7 @@ if (isTrue() || !isFalse()) {
|
|||
[[source,java]]
|
||||
----
|
||||
Condition.where(isTrue())
|
||||
.andNot(isFalse())
|
||||
.andNot(() -> isFalse())
|
||||
.then(() -> doSomething())
|
||||
.otherwise(() -> doSomethingElse());
|
||||
----
|
||||
|
@ -134,7 +134,7 @@ if (isFalse() || !isAlsoFalse()) {
|
|||
[[source,java]]
|
||||
----
|
||||
Condition.where(isFalse())
|
||||
.orNot(isAlsoFalse())
|
||||
.orNot(() -> isAlsoFalse())
|
||||
.then(() -> doSomething())
|
||||
.otherwise(() -> doSomethingElse());
|
||||
----
|
||||
|
@ -154,7 +154,7 @@ if (isFalse()) {
|
|||
----
|
||||
Condition.where(isFalse())
|
||||
.then(() -> doSomething())
|
||||
.otherwise(isTrue())
|
||||
.otherwise(() -> isTrue())
|
||||
.then(() -> doSomethingElse());
|
||||
----
|
||||
|
||||
|
@ -174,7 +174,7 @@ if (isTrue()) {
|
|||
----
|
||||
Condition.where(isTrue())
|
||||
.then(() -> doSomething())
|
||||
.and(isAlsoTrue())
|
||||
.and(() -> isAlsoTrue())
|
||||
.then(() -> doSomethingElse());
|
||||
----
|
||||
|
||||
|
@ -213,7 +213,8 @@ final Optional<String> result = Value.where(isTrue(), () -> TRUE);
|
|||
|
||||
[[source,java]]
|
||||
----
|
||||
final String result = Value.<String>where(isTrue()).then(() -> TRUE)
|
||||
final String result = Value.<String>where(isTrue())
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
----
|
||||
|
||||
|
@ -231,7 +232,8 @@ if (!isTrue()) {
|
|||
|
||||
[[source,java]]
|
||||
----
|
||||
final String result = Value.<String>whereNot(isTrue()).then(() -> TRUE)
|
||||
final String result = Value.<String>whereNot(isTrue())
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
----
|
||||
|
||||
|
@ -249,7 +251,8 @@ if (isTrue() && alternativeIsTrue()) {
|
|||
|
||||
[[source,java]]
|
||||
----
|
||||
final String result = Value.<String>where(isTrue()).and(alternativeIsTrue())
|
||||
final String result = Value.<String>where(isTrue())
|
||||
.and(() -> alternativeIsTrue())
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
----
|
||||
|
@ -268,7 +271,8 @@ if (isTrue() && !alternativeIsFalse()) {
|
|||
|
||||
[[source,java]]
|
||||
----
|
||||
final String result = Value.<String>where(isTrue()).andNot(alternativeIsFalse())
|
||||
final String result = Value.<String>where(isTrue())
|
||||
.andNot(() -> alternativeIsFalse())
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
----
|
||||
|
@ -287,7 +291,8 @@ if (isTrue() || alternativeIsTrue()) {
|
|||
|
||||
[[source,java]]
|
||||
----
|
||||
final String result = Value.<String>where(isTrue()).or(alternativeIsTrue())
|
||||
final String result = Value.<String>where(isTrue())
|
||||
.or(() -> alternativeIsTrue())
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
----
|
||||
|
@ -306,7 +311,27 @@ if (isTrue() || !isFalse()) {
|
|||
|
||||
[[source,java]]
|
||||
----
|
||||
final String result = Value.<String>where(isTrue()).orNot(isFalse())
|
||||
final String result = Value.<String>where(isTrue())
|
||||
.orNot(() -> isFalse())
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
----
|
||||
|
||||
### if-then
|
||||
|
||||
[[source,java]]
|
||||
-----
|
||||
Optional<String> result;
|
||||
if (isTrue()) {
|
||||
result = Optional.of(TRUE);
|
||||
} else {
|
||||
result = Optional.empty();
|
||||
}
|
||||
-----
|
||||
|
||||
[[source,java]]
|
||||
-----
|
||||
final Optional<String> result = Value.<String>where(isTrue())
|
||||
.then(() -> TRUE)
|
||||
.optional();
|
||||
-----
|
||||
|
|
4
pom.xml
4
pom.xml
|
@ -16,9 +16,7 @@
|
|||
<assertj.version>3.9.1</assertj.version>
|
||||
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
|
||||
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
||||
<kemitix-tiles.version>0.7.1</kemitix-tiles.version>
|
||||
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
|
||||
<maven-failsafe-plugin.version>2.20.1</maven-failsafe-plugin.version>
|
||||
<kemitix-tiles.version>0.8.1</kemitix-tiles.version>
|
||||
<lombok.version>1.16.20</lombok.version>
|
||||
</properties>
|
||||
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
|
||||
package net.kemitix.conditional;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
* If-then-else in a functional-style.
|
||||
*
|
||||
|
@ -35,9 +37,11 @@ public interface Condition {
|
|||
*
|
||||
* @return the Condition
|
||||
*/
|
||||
@SuppressWarnings("avoidinlineconditionals")
|
||||
static Condition where(final boolean clause) {
|
||||
return clause ? TrueCondition.TRUE : FalseCondition.FALSE;
|
||||
if (clause) {
|
||||
return TrueCondition.TRUE;
|
||||
}
|
||||
return FalseCondition.FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -58,7 +62,7 @@ public interface Condition {
|
|||
*
|
||||
* @return the Condition
|
||||
*/
|
||||
Condition and(boolean clause);
|
||||
Condition and(Supplier<Boolean> clause);
|
||||
|
||||
/**
|
||||
* Logically AND combine the current {@code Condition} with boolean opposite of the clause.
|
||||
|
@ -67,8 +71,8 @@ public interface Condition {
|
|||
*
|
||||
* @return the Condition
|
||||
*/
|
||||
default Condition andNot(final boolean clause) {
|
||||
return and(!clause);
|
||||
default Condition andNot(final Supplier<Boolean> clause) {
|
||||
return and(() -> !clause.get());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -79,7 +83,7 @@ public interface Condition {
|
|||
* @return the Condition
|
||||
*/
|
||||
@SuppressWarnings("PMD.ShortMethodName")
|
||||
Condition or(boolean clause);
|
||||
Condition or(Supplier<Boolean> clause);
|
||||
|
||||
/**
|
||||
* Logically OR combine the current {@code Condition} with the boolean opposite of the clause.
|
||||
|
@ -88,8 +92,8 @@ public interface Condition {
|
|||
*
|
||||
* @return the Condition
|
||||
*/
|
||||
default Condition orNot(final boolean clause) {
|
||||
return or(!clause);
|
||||
default Condition orNot(final Supplier<Boolean> clause) {
|
||||
return or(() -> !clause.get());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -115,8 +119,8 @@ public interface Condition {
|
|||
*
|
||||
* @return the Condition
|
||||
*/
|
||||
default Condition otherwise(final boolean clause) {
|
||||
return where(clause);
|
||||
default Condition otherwise(final Supplier<Boolean> clause) {
|
||||
return where(clause.get());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
|
||||
package net.kemitix.conditional;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
* A {@code Condition} that has evaluated to {@code false}.
|
||||
*
|
||||
|
@ -31,14 +33,14 @@ final class FalseCondition implements Condition {
|
|||
public static final Condition FALSE = new net.kemitix.conditional.FalseCondition();
|
||||
|
||||
@Override
|
||||
public Condition and(final boolean clause) {
|
||||
public Condition and(final Supplier<Boolean> clause) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("PMD.ShortMethodName")
|
||||
public Condition or(final boolean secondClause) {
|
||||
return Condition.where(secondClause);
|
||||
public Condition or(final Supplier<Boolean> secondClause) {
|
||||
return Condition.where(secondClause.get());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
package net.kemitix.conditional;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
|
@ -32,22 +33,22 @@ import java.util.function.Supplier;
|
|||
*/
|
||||
class FalseValueClause<T> implements Value.ValueClause<T> {
|
||||
|
||||
protected static final Value.ValueClause FALSE = new FalseValueClause();
|
||||
protected static final Value.ValueClause<?> FALSE = new FalseValueClause<>();
|
||||
|
||||
@Override
|
||||
public ValueSupplier<T> then(final Supplier<T> trueSupplier) {
|
||||
return new FalseValueSupplier();
|
||||
return new FalseValueSupplier<>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Value.ValueClause<T> and(final boolean clause) {
|
||||
public Value.ValueClause<T> and(final Supplier<Boolean> clause) {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("PMD.ShortMethodName")
|
||||
public Value.ValueClause<T> or(final boolean clause) {
|
||||
return Value.where(clause);
|
||||
public Value.ValueClause<T> or(final Supplier<Boolean> clause) {
|
||||
return Value.where(clause.get());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -62,6 +63,11 @@ class FalseValueClause<T> implements Value.ValueClause<T> {
|
|||
return falseSupplier.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<T> optional() {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
|
||||
package net.kemitix.conditional;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
* A {@code Condition} that has evaluated to {@code true}.
|
||||
*
|
||||
|
@ -31,13 +33,13 @@ final class TrueCondition implements Condition {
|
|||
public static final Condition TRUE = new net.kemitix.conditional.TrueCondition();
|
||||
|
||||
@Override
|
||||
public Condition and(final boolean clause) {
|
||||
return Condition.where(clause);
|
||||
public Condition and(final Supplier<Boolean> clause) {
|
||||
return Condition.where(clause.get());
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("PMD.ShortMethodName")
|
||||
public Condition or(final boolean secondClause) {
|
||||
public Condition or(final Supplier<Boolean> secondClause) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ package net.kemitix.conditional;
|
|||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
/**
|
||||
|
@ -34,7 +35,7 @@ import java.util.function.Supplier;
|
|||
*/
|
||||
class TrueValueClause<T> implements Value.ValueClause<T> {
|
||||
|
||||
protected static final Value.ValueClause TRUE = new TrueValueClause<>();
|
||||
protected static final Value.ValueClause<?> TRUE = new TrueValueClause<>();
|
||||
|
||||
@Override
|
||||
public ValueSupplier<T> then(final Supplier<T> trueSupplier) {
|
||||
|
@ -42,13 +43,13 @@ class TrueValueClause<T> implements Value.ValueClause<T> {
|
|||
}
|
||||
|
||||
@Override
|
||||
public Value.ValueClause<T> and(final boolean clause) {
|
||||
return Value.where(clause);
|
||||
public Value.ValueClause<T> and(final Supplier<Boolean> clause) {
|
||||
return Value.where(clause.get());
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("PMD.ShortMethodName")
|
||||
public Value.ValueClause<T> or(final boolean clause) {
|
||||
public Value.ValueClause<T> or(final Supplier<Boolean> clause) {
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -68,6 +69,11 @@ class TrueValueClause<T> implements Value.ValueClause<T> {
|
|||
return valueSupplier.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<T> optional() {
|
||||
return Optional.ofNullable(valueSupplier.get());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -43,9 +43,9 @@ public interface Value {
|
|||
*/
|
||||
@SuppressWarnings("PMD.LawOfDemeter")
|
||||
static <T> T where(
|
||||
boolean clause,
|
||||
Supplier<T> trueSupplier,
|
||||
Supplier<T> falseSupplier
|
||||
final boolean clause,
|
||||
final Supplier<T> trueSupplier,
|
||||
final Supplier<T> falseSupplier
|
||||
) {
|
||||
return Value.<T>where(clause).then(trueSupplier)
|
||||
.otherwise(falseSupplier);
|
||||
|
@ -61,8 +61,8 @@ public interface Value {
|
|||
* @return an Optional either containing the value from the trueSupplier or empty
|
||||
*/
|
||||
static <T> Optional<T> where(
|
||||
boolean clause,
|
||||
Supplier<T> trueSupplier
|
||||
final boolean clause,
|
||||
final Supplier<T> trueSupplier
|
||||
) {
|
||||
return Optional.ofNullable(Value.where(clause, trueSupplier, () -> null));
|
||||
}
|
||||
|
@ -75,9 +75,12 @@ public interface Value {
|
|||
*
|
||||
* @return a true or false value clause
|
||||
*/
|
||||
@SuppressWarnings({"unchecked", "avoidinlineconditionals"})
|
||||
@SuppressWarnings("unchecked")
|
||||
static <T> ValueClause<T> where(final boolean clause) {
|
||||
return (ValueClause<T>) (clause ? TrueValueClause.TRUE : FalseValueClause.FALSE);
|
||||
if (clause) {
|
||||
return (ValueClause<T>) TrueValueClause.TRUE;
|
||||
}
|
||||
return (ValueClause<T>) FalseValueClause.FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -88,7 +91,7 @@ public interface Value {
|
|||
*
|
||||
* @return a true or false value clause
|
||||
*/
|
||||
static <T> ValueClause<T> whereNot(boolean clause) {
|
||||
static <T> ValueClause<T> whereNot(final boolean clause) {
|
||||
return where(!clause);
|
||||
}
|
||||
|
||||
|
@ -115,7 +118,7 @@ public interface Value {
|
|||
*
|
||||
* @return a true or false value clause
|
||||
*/
|
||||
ValueClause<T> and(boolean clause);
|
||||
ValueClause<T> and(Supplier<Boolean> clause);
|
||||
|
||||
/**
|
||||
* Logically OR combine the current {@link ValueClause} with clause.
|
||||
|
@ -125,7 +128,7 @@ public interface Value {
|
|||
* @return a true or false value clause
|
||||
*/
|
||||
@SuppressWarnings("PMD.ShortMethodName")
|
||||
ValueClause<T> or(boolean clause);
|
||||
ValueClause<T> or(Supplier<Boolean> clause);
|
||||
|
||||
/**
|
||||
* Logically AND combine the current {@link ValueClause} with boolean opposite of the clause.
|
||||
|
@ -134,8 +137,8 @@ public interface Value {
|
|||
*
|
||||
* @return a true or false value clause
|
||||
*/
|
||||
default ValueClause<T> andNot(final boolean clause) {
|
||||
return and(!clause);
|
||||
default ValueClause<T> andNot(final Supplier<Boolean> clause) {
|
||||
return and(() -> !clause.get());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -145,8 +148,8 @@ public interface Value {
|
|||
*
|
||||
* @return a true or false value clause
|
||||
*/
|
||||
default ValueClause<T> orNot(boolean clause) {
|
||||
return or(!clause);
|
||||
default ValueClause<T> orNot(final Supplier<Boolean> clause) {
|
||||
return or(() -> !clause.get());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -165,6 +168,12 @@ public interface Value {
|
|||
*/
|
||||
T otherwise(Supplier<T> falseSupplier);
|
||||
|
||||
/**
|
||||
* Returns the value in an Optional if the {@link ValueClause} is true, or an empty Optional if it is false.
|
||||
*
|
||||
* @return an Optional, possibly containing the value
|
||||
*/
|
||||
Optional<T> optional();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -3,6 +3,8 @@ package net.kemitix.conditional;
|
|||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
|
@ -77,7 +79,7 @@ public class ConditionalTest {
|
|||
//when
|
||||
Condition.where(true)
|
||||
.then(thenResponse)
|
||||
.and(true)
|
||||
.and(() -> true)
|
||||
.then(otherwiseResponse);
|
||||
//then
|
||||
assertThatBothResponsesRun();
|
||||
|
@ -138,7 +140,7 @@ public class ConditionalTest {
|
|||
public void whereTrueAndNotFalseThenRuns() {
|
||||
//when
|
||||
Condition.where(true)
|
||||
.andNot(false)
|
||||
.andNot(() -> false)
|
||||
.then(thenResponse);
|
||||
//then
|
||||
assertThatTheThenResponseRuns();
|
||||
|
@ -148,7 +150,7 @@ public class ConditionalTest {
|
|||
public void whereTrueAndNotTrueThenOtherwiseRuns() {
|
||||
//when
|
||||
Condition.where(true)
|
||||
.andNot(true)
|
||||
.andNot(() -> true)
|
||||
.then(thenResponse)
|
||||
.otherwise(otherwiseResponse);
|
||||
//then
|
||||
|
@ -159,7 +161,7 @@ public class ConditionalTest {
|
|||
public void whereFalseOrNotFalseThenRuns() {
|
||||
//when
|
||||
Condition.where(false)
|
||||
.orNot(false)
|
||||
.orNot(() -> false)
|
||||
.then(thenResponse);
|
||||
//then
|
||||
assertThatTheThenResponseRuns();
|
||||
|
@ -169,7 +171,7 @@ public class ConditionalTest {
|
|||
public void whereFalseOrNotTrueThenOtherwiseRuns() {
|
||||
//when
|
||||
Condition.where(false)
|
||||
.orNot(true)
|
||||
.orNot(() -> true)
|
||||
.then(thenResponse)
|
||||
.otherwise(otherwiseResponse);
|
||||
//then
|
||||
|
@ -181,7 +183,7 @@ public class ConditionalTest {
|
|||
//when
|
||||
Condition.where(false)
|
||||
.then(thenResponse)
|
||||
.otherwise(true)
|
||||
.otherwise(() -> true)
|
||||
.then(otherwiseResponse);
|
||||
//then
|
||||
assertThatTheOtherwiseResponseRuns();
|
||||
|
@ -192,7 +194,7 @@ public class ConditionalTest {
|
|||
//when
|
||||
Condition.where(false)
|
||||
.then(thenResponse)
|
||||
.otherwise(false)
|
||||
.otherwise(() -> false)
|
||||
.then(otherwiseResponse);
|
||||
//then
|
||||
assertThatNoResponseRuns();
|
||||
|
@ -269,7 +271,7 @@ public class ConditionalTest {
|
|||
final boolean secondClause
|
||||
) {
|
||||
Condition.where(firstClause)
|
||||
.and(secondClause)
|
||||
.and(() -> secondClause)
|
||||
.then(thenResponse)
|
||||
.otherwise(otherwiseResponse);
|
||||
}
|
||||
|
@ -279,8 +281,34 @@ public class ConditionalTest {
|
|||
final boolean secondClause
|
||||
) {
|
||||
Condition.where(firstClause)
|
||||
.or(secondClause)
|
||||
.or(() -> secondClause)
|
||||
.then(thenResponse)
|
||||
.otherwise(otherwiseResponse);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shortCurcuitOr() {
|
||||
//given
|
||||
final AtomicInteger atomicInteger = new AtomicInteger();
|
||||
//when
|
||||
Condition.where(true)
|
||||
.or(() -> atomicInteger.compareAndSet(0, 2))
|
||||
.then(thenResponse);
|
||||
//then
|
||||
assertThatTheThenResponseRan();
|
||||
assertThat(atomicInteger).hasValue(0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shortCurcuitAnd() {
|
||||
//given
|
||||
final AtomicInteger atomicInteger = new AtomicInteger();
|
||||
//when
|
||||
Condition.where(false)
|
||||
.and(() -> atomicInteger.compareAndSet(0, 2))
|
||||
.then(thenResponse);
|
||||
//then
|
||||
assertThatTheThenResponseDidNotRun();
|
||||
assertThat(atomicInteger).hasValue(0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ import lombok.val;
|
|||
import org.junit.Test;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
|
@ -69,7 +70,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereTrueAndTrueIsTrue() {
|
||||
//when
|
||||
val result = Value.<String>where(true).and(true)
|
||||
val result = Value.<String>where(true).and(() -> true)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -79,7 +80,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereTrueAndFalseIsFalse() {
|
||||
//when
|
||||
val result = Value.<String>where(true).and(false)
|
||||
val result = Value.<String>where(true).and(() -> false)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -89,7 +90,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereFalseAndTrueIsFalse() {
|
||||
//when
|
||||
val result = Value.<String>where(false).and(true)
|
||||
val result = Value.<String>where(false).and(() -> true)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -99,7 +100,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereFalseAndFalseIsFalse() {
|
||||
//when
|
||||
val result = Value.<String>where(false).and(false)
|
||||
val result = Value.<String>where(false).and(() -> false)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -109,7 +110,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereTrueOrTrueIsTrue() {
|
||||
//when
|
||||
val result = Value.<String>where(true).or(true)
|
||||
val result = Value.<String>where(true).or(() -> true)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -119,7 +120,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereTrueOrFalseIsTrue() {
|
||||
//when
|
||||
val result = Value.<String>where(true).or(false)
|
||||
val result = Value.<String>where(true).or(() -> false)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -129,7 +130,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereFalseOrTrueIsTrue() {
|
||||
//when
|
||||
val result = Value.<String>where(false).or(true)
|
||||
val result = Value.<String>where(false).or(() -> true)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -139,7 +140,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereFalseOrFalseIsFalse() {
|
||||
//when
|
||||
val result = Value.<String>where(false).or(false)
|
||||
val result = Value.<String>where(false).or(() -> false)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -167,7 +168,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereTrueAndNotTrueIsFalse() {
|
||||
//when
|
||||
val result = Value.<String>where(true).andNot(true)
|
||||
val result = Value.<String>where(true).andNot(() -> true)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -177,7 +178,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereTrueAndNotFalseIsTrue() {
|
||||
//when
|
||||
val result = Value.<String>where(true).andNot(false)
|
||||
val result = Value.<String>where(true).andNot(() -> false)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -187,7 +188,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereFalseAndNotTrueIsFalse() {
|
||||
//when
|
||||
val result = Value.<String>where(false).andNot(true)
|
||||
val result = Value.<String>where(false).andNot(() -> true)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -197,7 +198,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereFalseAndNotFalseIsFalse() {
|
||||
//when
|
||||
val result = Value.<String>where(false).andNot(false)
|
||||
val result = Value.<String>where(false).andNot(() -> false)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -207,7 +208,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereTrueOrNotTrueIsTrue() {
|
||||
//when
|
||||
val result = Value.<String>where(true).orNot(true)
|
||||
val result = Value.<String>where(true).orNot(() -> true)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -217,7 +218,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereTrueOrNotFalseIsTrue() {
|
||||
//when
|
||||
val result = Value.<String>where(true).orNot(false)
|
||||
val result = Value.<String>where(true).orNot(() -> false)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -227,7 +228,7 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereFalseOrNotTrueIsFalse() {
|
||||
//when
|
||||
val result = Value.<String>where(false).orNot(true)
|
||||
val result = Value.<String>where(false).orNot(() -> true)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
|
@ -237,10 +238,54 @@ public class ValueTest {
|
|||
@Test
|
||||
public void valueWhereFalseOrNotFalseIsTrue() {
|
||||
//when
|
||||
val result = Value.<String>where(false).orNot(false)
|
||||
val result = Value.<String>where(false).orNot(() -> false)
|
||||
.then(() -> TRUE)
|
||||
.otherwise(() -> FALSE);
|
||||
//then
|
||||
assertThat(result).isEqualTo(TRUE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void valueWhereTrueThenIsNotEmpty() {
|
||||
//given
|
||||
final Optional<Object> result = Value.where(true).then(() -> "value").optional();
|
||||
//then
|
||||
assertThat(result).contains("value");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void valueWhereFalseThenIsEmpty() {
|
||||
//given
|
||||
final Optional<Object> result = Value.where(false).then(() -> "value").optional();
|
||||
//when
|
||||
assertThat(result).isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shortCurcuitOr() {
|
||||
//given
|
||||
final AtomicInteger atomicInteger = new AtomicInteger();
|
||||
//when
|
||||
final Optional<String> result = Value.<String>where(true)
|
||||
.or(() -> atomicInteger.compareAndSet(0, 2))
|
||||
.then(() -> "Pass")
|
||||
.optional();
|
||||
//then
|
||||
assertThat(result).contains("Pass");
|
||||
assertThat(atomicInteger).hasValue(0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shortCurcuitAnd() {
|
||||
//given
|
||||
final AtomicInteger atomicInteger = new AtomicInteger();
|
||||
//when
|
||||
final Optional<String> result = Value.<String>where(false)
|
||||
.and(() -> atomicInteger.compareAndSet(0, 2))
|
||||
.then(() -> "Pass")
|
||||
.optional();
|
||||
//then
|
||||
assertThat(result).isEmpty();
|
||||
assertThat(atomicInteger).hasValue(0);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue