Skip to content
This repository has been archived by the owner on Apr 14, 2023. It is now read-only.

Fix #1520 #1531

Merged
merged 3 commits into from
Nov 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public Stream<DataBagValue> generate(Field field, FieldSpec spec) {
private Stream<Object> getDataValues(FieldValueSource source, boolean unique) {
if (unique) {
return source.generateAllValues();
}
}

switch (dataType) {
case FULL_SEQUENTIAL:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.scottlogic.deg.generator.generation.grouped;

import com.google.inject.Inject;
import com.scottlogic.deg.common.ValidationException;
import com.scottlogic.deg.common.profile.Field;
import com.scottlogic.deg.generator.config.detail.CombinationStrategyType;
import com.scottlogic.deg.generator.fieldspecs.FieldSpec;
Expand Down Expand Up @@ -85,7 +86,7 @@ private FieldSpec updateFirstSpecFromRelations(Field first, FieldSpecGroup group
.map(relation -> createModifierForField(first, relation, group))
.map(Optional::of)
.reduce(Optional.of(firstFieldSpec), this::mergeOptionalFieldspecs)
.orElseThrow(() -> new IllegalStateException("Failed to merge field specs in related fields"));
.orElseThrow(() -> new ValidationException("The provided profile is wholly contradictory!"));
cdowding-sl marked this conversation as resolved.
Show resolved Hide resolved

return applyGranularityToFieldSpec(firstFieldSpec, updatedFieldSpec);
}
Expand Down