From 979d533a98d63c566659625778b0ac6d4dba2ec4 Mon Sep 17 00:00:00 2001 From: Miroslav Pokorny Date: Wed, 7 Oct 2026 14:11:45 +1100 Subject: [PATCH] https://github.com/mP1/walkingkooka-spreadsheet/pull/10295 SpreadsheetConverters.basic() deleted - https://github.com/mP1/walkingkooka-spreadsheet/pull/10295 - SpreadsheetConverters.basic() deleted --- .../SpreadsheetExpressionFunctionNumberIfPredicateTest.java | 2 +- .../function/SpreadsheetExpressionFunctionTestCase.java | 2 +- .../function/SpreadsheetExpressionFunctionsTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionNumberIfPredicateTest.java b/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionNumberIfPredicateTest.java index 0fbc733a..0e6e8993 100644 --- a/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionNumberIfPredicateTest.java +++ b/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionNumberIfPredicateTest.java @@ -289,7 +289,7 @@ private SpreadsheetExpressionEvaluationContext context() { .set(SpreadsheetMetadataPropertyName.DECIMAL_NUMBER_DIGIT_COUNT, DecimalNumberContext.DEFAULT_NUMBER_DIGIT_COUNT) .set(SpreadsheetMetadataPropertyName.DEFAULT_YEAR, 20) .set(SpreadsheetMetadataPropertyName.EXPRESSION_NUMBER_KIND, ExpressionNumberKind.BIG_DECIMAL) - .set(SpreadsheetMetadataPropertyName.FORMULA_CONVERTER, ConverterSelector.parse("collection(text, number, basic, value)")) + .set(SpreadsheetMetadataPropertyName.FORMULA_CONVERTER, ConverterSelector.parse("collection(null-to-number, simple, text, number, value)")) .set(SpreadsheetMetadataPropertyName.PRECISION, MathContext.DECIMAL32.getPrecision()) .set(SpreadsheetMetadataPropertyName.ROUNDING_MODE, RoundingMode.HALF_UP) .set(SpreadsheetMetadataPropertyName.NUMBER_FORMATTER, SpreadsheetPattern.parseNumberFormatPattern("#.###").spreadsheetFormatterSelector()) diff --git a/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionTestCase.java b/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionTestCase.java index 7b0f7590..05ba35c5 100644 --- a/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionTestCase.java +++ b/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionTestCase.java @@ -129,7 +129,7 @@ final SpreadsheetExpressionEvaluationContext createContext0() { .set(SpreadsheetMetadataPropertyName.DATE_TIME_OFFSET, Converters.EXCEL_1904_DATE_SYSTEM_OFFSET) .set(SpreadsheetMetadataPropertyName.DEFAULT_YEAR, 20) .set(SpreadsheetMetadataPropertyName.EXPRESSION_NUMBER_KIND, KIND) - .set(SpreadsheetMetadataPropertyName.FORMULA_CONVERTER, ConverterSelector.parse("collection(text, number, basic, value)")) + .set(SpreadsheetMetadataPropertyName.FORMULA_CONVERTER, ConverterSelector.parse("collection(null-to-number, simple, text, number, value)")) .set(SpreadsheetMetadataPropertyName.PRECISION, MathContext.DECIMAL32.getPrecision()) .set(SpreadsheetMetadataPropertyName.ROUNDING_MODE, RoundingMode.HALF_UP) .set(SpreadsheetMetadataPropertyName.NUMBER_FORMATTER, SpreadsheetPattern.parseNumberFormatPattern("#.###").spreadsheetFormatterSelector()) diff --git a/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionsTest.java b/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionsTest.java index 976b607d..42d5eb0e 100644 --- a/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionsTest.java +++ b/src/test/java/walkingkooka/spreadsheet/expression/function/SpreadsheetExpressionFunctionsTest.java @@ -5899,7 +5899,7 @@ private SpreadsheetMetadata metadata() { .aliasSet() ).set( SpreadsheetMetadataPropertyName.FORMATTING_CONVERTER, - ConverterSelector.parse("collection(text, number, date-time, basic, value, boolean, error-throwing, color, expression, environment, locale, plugins, properties, spreadsheet-metadata, style, text-node, template, net)") + ConverterSelector.parse("collection(null-to-number, simple, text, number, date-time, value, boolean, error-throwing, color, expression, environment, locale, plugins, properties, spreadsheet-metadata, style, text-node, template, net, optional-to, collection-to)") ).set(SpreadsheetMetadataPropertyName.PRECISION, MathContext.DECIMAL32.getPrecision()) .set(SpreadsheetMetadataPropertyName.ROUNDING_MODE, RoundingMode.HALF_UP) .set(SpreadsheetMetadataPropertyName.NUMBER_FORMATTER, SpreadsheetPattern.parseNumberFormatPattern("#.###").spreadsheetFormatterSelector()) @@ -5945,7 +5945,7 @@ private SpreadsheetMetadata metadata() { ValidatorAliasSet.EMPTY ).set( SpreadsheetMetadataPropertyName.VALIDATION_CONVERTER, - ConverterSelector.parse("basic") + ConverterSelector.parse("simple") ); }