Fixed string shrinking bug #541

jqwik-team · Dec 8, 2023 · c779a9d · c779a9d
1 parent b964e65
commit c779a9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/engine/src/main/java/net/jqwik/engine/properties/arbitraries/DefaultStringArbitrary.java b/engine/src/main/java/net/jqwik/engine/properties/arbitraries/DefaultStringArbitrary.java
@@ -83,15 +83,15 @@ private boolean hasSingleCharEdgeCases() {
 	}
 
 	private EdgeCases<String> emptyStringEdgeCase() {
-		return EdgeCases.fromSupplier(() -> new ShrinkableString(Collections.emptyList(), minLength, maxLength(), characterArbitrary));
+		return EdgeCases.fromSupplier(() -> new ShrinkableString(Collections.emptyList(), minLength, maxLength(), characterArbitrary, uniqueChars));
 	}
 
 	private EdgeCases<String> fixedSizedEdgeCases(int fixedSize, int maxEdgeCases) {
 		return EdgeCasesSupport.mapShrinkable(
 			effectiveCharacterArbitrary().edgeCases(maxEdgeCases),
 			shrinkableChar -> {
 				List<Shrinkable<Character>> shrinkableChars = new ArrayList<>(Collections.nCopies(fixedSize, shrinkableChar));
-				return new ShrinkableString(shrinkableChars, minLength, maxLength(), characterArbitrary);
+				return new ShrinkableString(shrinkableChars, minLength, maxLength(), characterArbitrary, uniqueChars);
 			}
 		);
 	}

diff --git a/...ne/src/main/java/net/jqwik/engine/properties/arbitraries/randomized/RandomGenerators.java b/...ne/src/main/java/net/jqwik/engine/properties/arbitraries/randomized/RandomGenerators.java
@@ -103,8 +103,8 @@ public static RandomGenerator<String> strings(
 		Arbitrary<Character> characterArbitrary,
 		boolean uniqueChars
 	) {
-		Function<List<Shrinkable<Character>>, Shrinkable<String>> createShrinkable = elements -> new ShrinkableString(elements, minLength, maxLength, characterArbitrary, false);
-		Set<FeatureExtractor<Character>> featureExtractors = uniqueChars ? Collections.singleton(FeatureExtractor.identity()) : Collections.emptySet();
+		Function<List<Shrinkable<Character>>, Shrinkable<String>> createShrinkable = elements -> new ShrinkableString(elements, minLength, maxLength, characterArbitrary, uniqueChars);
+		Set<FeatureExtractor<Character>> featureExtractors = uniqueChars ? ShrinkableString.UNIQUE_CHARS_EXTRACTOR : Collections.emptySet();
 		return container(elementGenerator, createShrinkable, minLength, maxLength, maxUniqueChars, genSize, lengthDistribution, featureExtractors);
 	}
 

diff --git a/...ne/src/test/java/net/jqwik/engine/properties/arbitraries/DefaultStringArbitraryTests.java b/...ne/src/test/java/net/jqwik/engine/properties/arbitraries/DefaultStringArbitraryTests.java
@@ -318,7 +318,7 @@ void uniqueCharsWithImpossibleLength(@ForAll Random random) {
 	}
 
 	@Group
-	@PropertyDefaults(tries = 100)
+	@PropertyDefaults(tries = 10)
 	class Shrinking {
 
 		@Property
@@ -345,15 +345,15 @@ void alpha3IsShrunkToTripleA(@ForAll Random random) {
 			);
 		}
 
-		// @Property // Currently failing
+		@Property
 		void alpha3UniqueCharsIsShrunkToABC(@ForAll Random random) {
 			StringArbitrary arbitrary =
 				Arbitraries.strings().alpha().uniqueChars().ofLength(3);
 			assertAllValuesAreShrunkTo(arbitrary, random, "ABC");
 
 			assertWhileShrinking(
 				random, arbitrary,
-				s -> s.length() == 3 && s.chars().allMatch(c -> c >= 'A' && c <= 'z')
+				s -> s.length() == 3 && s.chars().distinct().count() == 3
 			);
 		}