Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor customizeProperty works in order #1014

Merged
merged 1 commit into from
Jul 30, 2024
Merged

Refactor customizeProperty works in order #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...nkey-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ package com.navercorp.fixturemonkey.kotlin

import com.navercorp.fixturemonkey.ArbitraryBuilder
import com.navercorp.fixturemonkey.FixtureMonkey
import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary
import com.navercorp.fixturemonkey.api.experimental.TypedPropertySelector
import com.navercorp.fixturemonkey.api.instantiator.Instantiator
import com.navercorp.fixturemonkey.api.property.PropertySelector
import com.navercorp.fixturemonkey.api.type.TypeReference
Expand Down Expand Up @@ -229,6 +231,11 @@ class KotlinTypeDefaultArbitraryBuilder<T>(
): KotlinTypeDefaultArbitraryBuilder<T> =
this.apply { delegate.instantiate(type, instantiator) }

override fun <U : Any?> customizeProperty(
propertySelector: TypedPropertySelector<U>,
combinableArbitraryCustomizer: Function<CombinableArbitrary<out U>, CombinableArbitrary<out U>>
): ArbitraryBuilder<T> = this.apply { delegate.customizeProperty(propertySelector, combinableArbitraryCustomizer) }

override fun build(): Arbitrary<T> = delegate.build()

override fun sample(): T = delegate.sample()
Expand Down
41 changes: 41 additions & 0 deletions ...tests/kotlin-tests/src/test/kotlin/com/navercorp/fixturemonkey/tests/kotlin/KotlinTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import com.navercorp.fixturemonkey.FixtureMonkey
import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary
import com.navercorp.fixturemonkey.api.experimental.JavaGetterMethodPropertySelector.javaGetter
import com.navercorp.fixturemonkey.api.experimental.TypedExpressionGenerator.typedRoot
import com.navercorp.fixturemonkey.api.experimental.TypedExpressionGenerator.typedString
import com.navercorp.fixturemonkey.api.introspector.AnonymousArbitraryIntrospector
import com.navercorp.fixturemonkey.api.introspector.ArbitraryIntrospectorResult
import com.navercorp.fixturemonkey.api.introspector.BeanArbitraryIntrospector
Expand Down Expand Up @@ -894,6 +895,46 @@ class KotlinTest {
then(actual).hasSizeLessThan(5)
}

@RepeatedTest(TEST_COUNT)
fun customizePropertyAfterSet() {
// given
class StringValue(val value: String)

val expected = "abc"

// when
val actual = SUT.giveMeKotlinBuilder<StringValue>()
.setExp(StringValue::value, "abcdef")
.customizeProperty(typedString<String>("value")) {
it.map { str -> str.substring(0..2) }
}
.sample()
.value

//then
then(actual).isEqualTo(expected)
}

@RepeatedTest(TEST_COUNT)
fun customizePropertyIgnoredIfSet() {
// given
class StringValue(val value: String)

val expected = "fixed"

// when
val actual = SUT.giveMeKotlinBuilder<StringValue>()
.customizeProperty(typedString<String>("value")) {
it.filter { value -> value.length > 5 }
}
.setExp(StringValue::value, expected)
.sample()
.value

//then
then(actual).isEqualTo(expected)
}

companion object {
private val SUT: FixtureMonkey = FixtureMonkey.builder()
.plugin(KotlinPlugin())
Expand Down
8 changes: 8 additions & 0 deletions fixture-monkey/src/main/java/com/navercorp/fixturemonkey/ArbitraryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import net.jqwik.api.Combinators.F3;
import net.jqwik.api.Combinators.F4;

import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary;
import com.navercorp.fixturemonkey.api.experimental.TypedPropertySelector;
import com.navercorp.fixturemonkey.api.instantiator.Instantiator;
import com.navercorp.fixturemonkey.api.property.PropertySelector;
import com.navercorp.fixturemonkey.api.type.TypeReference;
Expand Down Expand Up @@ -554,4 +556,10 @@ <R> ArbitraryBuilder<R> zipWith(
ArbitraryBuilder<T> instantiate(Class<?> type, Instantiator instantiator);

ArbitraryBuilder<T> instantiate(TypeReference<?> type, Instantiator instantiator);

@API(since = "1.0.9", status = Status.MAINTAINED)
<U> ArbitraryBuilder<T> customizeProperty(
TypedPropertySelector<U> propertySelector,
Function<CombinableArbitrary<? extends U>, CombinableArbitrary<? extends U>> combinableArbitraryCustomizer
);
}
10 changes: 10 additions & 0 deletions ...rc/main/java/com/navercorp/fixturemonkey/builder/JavaTypeDefaultTypeArbitraryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@

import com.navercorp.fixturemonkey.ArbitraryBuilder;
import com.navercorp.fixturemonkey.JavaTypeArbitraryBuilder;
import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary;
import com.navercorp.fixturemonkey.api.experimental.TypedPropertySelector;
import com.navercorp.fixturemonkey.api.instantiator.Instantiator;
import com.navercorp.fixturemonkey.api.property.PropertySelector;
import com.navercorp.fixturemonkey.api.type.TypeReference;
Expand Down Expand Up @@ -335,4 +337,12 @@ public JavaTypeArbitraryBuilder<T> instantiate(TypeReference<?> type, Instantiat
delegate.instantiate(type, instantiator);
return this;
}

@Override
public <U> ArbitraryBuilder<T> customizeProperty(
TypedPropertySelector<U> propertySelector,
Function<CombinableArbitrary<? extends U>, CombinableArbitrary<? extends U>> combinableArbitraryCustomizer
) {
return delegate.customizeProperty(propertySelector, combinableArbitraryCustomizer);
}
}
8 changes: 7 additions & 1 deletion ...onkey/src/main/java/com/navercorp/fixturemonkey/customizer/NodeCustomizerManipulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ public NodeCustomizerManipulator(
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
public void manipulate(ObjectNode objectNode) {
objectNode.addArbitraryCustomizer((Function)arbitraryCustomizer);
if (objectNode.getArbitrary() != null) {
CombinableArbitrary<? extends T> customized = arbitraryCustomizer.apply(
(CombinableArbitrary<? extends T>)objectNode.getArbitrary());
objectNode.setArbitrary(customized);
} else {
objectNode.addGeneratedArbitraryCustomizer((Function)arbitraryCustomizer);
}
}
}
9 changes: 0 additions & 9 deletions .../src/main/java/com/navercorp/fixturemonkey/experimental/ExperimentalArbitraryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,11 @@

package com.navercorp.fixturemonkey.experimental;

import java.util.function.Function;

import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;

import com.navercorp.fixturemonkey.ArbitraryBuilder;
import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary;
import com.navercorp.fixturemonkey.api.experimental.TypedPropertySelector;

@API(since = "0.6.12", status = Status.MAINTAINED)
public interface ExperimentalArbitraryBuilder<T> extends ArbitraryBuilder<T> {
@API(since = "1.0.9", status = Status.EXPERIMENTAL)
<U> ArbitraryBuilder<T> customizeProperty(
TypedPropertySelector<U> propertySelector,
Function<CombinableArbitrary<? extends U>, CombinableArbitrary<? extends U>> combinableArbitraryCustomizer
);
}
6 changes: 4 additions & 2 deletions fixture-monkey/src/main/java/com/navercorp/fixturemonkey/tree/ObjectNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,13 @@ public List<Predicate> getArbitraryFilters() {
return arbitraryFilters;
}

public void addArbitraryCustomizer(Function<CombinableArbitrary<?>, CombinableArbitrary<?>> arbitraryCustomizer) {
public void addGeneratedArbitraryCustomizer(
Function<CombinableArbitrary<?>, CombinableArbitrary<?>> arbitraryCustomizer
) {
this.arbitraryCustomizers.add(arbitraryCustomizer);
}

public List<Function<CombinableArbitrary<?>, CombinableArbitrary<?>>> getArbitraryCustomizers() {
public List<Function<CombinableArbitrary<?>, CombinableArbitrary<?>>> getGeneratedArbitraryCustomizers() {
return arbitraryCustomizers;
}

Expand Down
15 changes: 8 additions & 7 deletions fixture-monkey/src/main/java/com/navercorp/fixturemonkey/tree/ObjectTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@ private CombinableArbitrary<?> generateIntrospected(
);
generated = getArbitraryGenerator(node.getResolvedProperty(), arbitraryIntrospector)
.generate(childArbitraryGeneratorContext);

List<Function<CombinableArbitrary<?>, CombinableArbitrary<?>>> customizers =
node.getGeneratedArbitraryCustomizers();

for (Function<CombinableArbitrary<?>, CombinableArbitrary<?>> customizer : customizers) {
generated = customizer.apply(generated);
}

if (node.cacheable()) {
monkeyContext.putCachedArbitrary(
node.getProperty(),
Expand All @@ -161,13 +169,6 @@ private CombinableArbitrary<?> generateIntrospected(
}
}

List<Function<CombinableArbitrary<?>, CombinableArbitrary<?>>> arbitraryCustomizers =
node.getArbitraryCustomizers();

for (Function<CombinableArbitrary<?>, CombinableArbitrary<?>> arbitraryCustomizer : arbitraryCustomizers) {
generated = arbitraryCustomizer.apply(generated);
}

List<Predicate> arbitraryFilters = node.getArbitraryFilters();
for (Predicate predicate : arbitraryFilters) {
generated = generated.filter(fixtureMonkeyOptions.getGenerateMaxTries(), predicate);
Expand Down
Loading