diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java index b58c05d13a737..7fabb7199f7b5 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/SimpleIndexAccessorCompatibility.java @@ -270,7 +270,7 @@ public void testIndexRangeSeekByDurationArray() throws Exception @Test public void testIndexRangeSeekByTextArray() throws Exception { - testIndexRangeSeekArray( () -> random.randomValues().nextStringArray() ); + testIndexRangeSeekArray( () -> random.randomValues().nextTextArray() ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericKeyStateFormatTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericKeyStateFormatTest.java index b0916ba72f6fa..a4f50f4c44d53 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericKeyStateFormatTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericKeyStateFormatTest.java @@ -81,7 +81,7 @@ public void setup() // DURATION_ARRAY values.add( rnd.nextDurationArray() ); // TEXT_ARRAY - values.add( rnd.nextStringArray() ); + values.add( rnd.nextTextArray() ); // BOOLEAN_ARRAY values.add( rnd.nextBooleanArray() ); // NUMBER_ARRAY (byte, short, int, long, float, double) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericKeyStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericKeyStateTest.java index 4e95c08d9dce9..ec69f299c0463 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericKeyStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericKeyStateTest.java @@ -403,7 +403,7 @@ private void assertHighestStringArray() { for ( int i = 0; i < 1000; i++ ) { - assertHighest( random.randomValues().nextStringArray() ); + assertHighest( random.randomValues().nextTextArray() ); } } @@ -518,8 +518,8 @@ private static ValueGenerator[] listValueGenerators( boolean includeLossy ) () -> random.randomValues().nextLocalTimeArray(), () -> random.randomValues().nextDurationArray(), () -> random.randomValues().nextDurationArray(), - () -> random.randomValues().nextStringArray(), - () -> random.randomValues().nextAlphaNumericStringArray(), + () -> random.randomValues().nextTextArray(), + () -> random.randomValues().nextAlphaNumericTextArray(), () -> random.randomValues().nextBooleanArray(), () -> random.randomValues().nextByteArray(), () -> random.randomValues().nextShortArray(), diff --git a/community/random-values/src/main/java/org/neo4j/values/storable/RandomValues.java b/community/random-values/src/main/java/org/neo4j/values/storable/RandomValues.java index 86714af9ca46d..2ab5f32cd7dc8 100644 --- a/community/random-values/src/main/java/org/neo4j/values/storable/RandomValues.java +++ b/community/random-values/src/main/java/org/neo4j/values/storable/RandomValues.java @@ -368,9 +368,9 @@ public Value nextValueOfType( Types type ) case DOUBLE_ARRAY: return nextDoubleArray(); case STRING_ARRAY: - return nextStringArray(); + return nextTextArray(); case STRING_ALPHANUMERIC_ARRAY: - return nextAlphaNumericStringArray(); + return nextAlphaNumericTextArray(); case STRING_ASCII_ARRAY: return nextAsciiTextArray(); case STRING_BMP_ARRAY: @@ -1255,7 +1255,7 @@ public boolean[] nextBooleanArrayRaw( int minLength, int maxLength ) * * @return the next pseudorandom {@link TextArray}. */ - public TextArray nextAlphaNumericStringArray() + public TextArray nextAlphaNumericTextArray() { String[] array = nextAlphaNumericStringArrayRaw( minArray(), maxArray(), minString(), maxString() ); return Values.stringArray( array ); @@ -1286,7 +1286,7 @@ private TextArray nextBasicMultilingualPlaneTextArray() * * @return the next pseudorandom {@link TextArray}. */ - public TextArray nextStringArray() + public TextArray nextTextArray() { String[] array = nextStringArrayRaw( minArray(), maxArray(), minString(), maxString() ); return Values.stringArray( array );