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

Jump to bottom

Limit data value name length in unrolled test #1702

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Limit data value name length in unrolled test #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8854013
Limit data value string length
T45K Jun 24, 2023
c1fc557
add test
T45K Jun 24, 2023
ba306d6
Reduce array size
T45K Jun 24, 2023
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
12 changes: 8 additions & 4 deletions spock-core/src/main/java/org/spockframework/runtime/DataVariablesIterationNameProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

package org.spockframework.runtime;

import static java.lang.String.format;
import static org.spockframework.util.RenderUtil.toStringOrDump;

import org.spockframework.runtime.model.*;
import org.spockframework.util.RenderUtil;

import java.util.*;

import static java.lang.String.format;

public class DataVariablesIterationNameProvider implements NameProvider<IterationInfo> {
private final boolean includeFeatureNameForIterations;
private final boolean includeIterationIndex;
Expand Down Expand Up @@ -51,7 +51,11 @@ public String getName(IterationInfo iteration) {
dataVariables.forEach((name, value) -> {
String valueString;
try {
valueString = toStringOrDump(value);
valueString = RenderUtil.toStringOrDump(value);
int maxDataValueStringLength = 1024;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ Did you try to figure out which length of method names where problematic?

❓ Does this really fix the problem comprehensively? What happens if you have more than 1 problematic parameter?

if (valueString.length() > maxDataValueStringLength) {
valueString = valueString.substring(0, maxDataValueStringLength) + "…";
}
} catch (Exception e) {
valueString = format("#Error:%s during rendering", e.getClass().getSimpleName());
}
Expand Down
15 changes: 11 additions & 4 deletions .../src/test/groovy/org/spockframework/runtime/DataVariablesIterationNameProviderSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ class DataVariablesIterationNameProviderSpec extends Specification {
@Subject
DataVariablesIterationNameProvider testee = new DataVariablesIterationNameProvider()

def feature = new FeatureInfo().tap {
name = 'the feature'
reportIterations = true
}
def feature = new FeatureInfo(name: 'the feature', reportIterations: true)

IterationInfo iteration = Stub {
getFeature() >> feature
Expand Down Expand Up @@ -106,6 +103,16 @@ class DataVariablesIterationNameProviderSpec extends Specification {
testee.getName(iteration) == "x: [1], y: [a:2], z: [3], #$iteration.iterationIndex"
}

def 'renders data variables with limited length'() {
given:
testee = new DataVariablesIterationNameProvider(false)
def tooLongArray = (1..1_000_000).toArray() as int[]
iteration.getDataVariables() >> [x: tooLongArray]

expect:
testee.getName(iteration) == "x: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 2…, #$iteration.iterationIndex"
}

def 'returns iteration index when reporting iterations but data variables are null and includeFeatureNameForIterations=false'() {
given:
testee = new DataVariablesIterationNameProvider(false)
Expand Down