From 0745be3e6776caed187eddbd4643193798b67109 Mon Sep 17 00:00:00 2001 From: Matthew Pope Date: Tue, 3 Dec 2024 17:14:40 -0800 Subject: [PATCH] Minor cleanup --- src/main/java/com/amazon/ion/impl/macro/MacroCompiler.kt | 2 +- .../java/com/amazon/ion/conformance/ConformanceTestRunner.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/amazon/ion/impl/macro/MacroCompiler.kt b/src/main/java/com/amazon/ion/impl/macro/MacroCompiler.kt index 8efabb16e..f64da15a6 100644 --- a/src/main/java/com/amazon/ion/impl/macro/MacroCompiler.kt +++ b/src/main/java/com/amazon/ion/impl/macro/MacroCompiler.kt @@ -93,7 +93,7 @@ internal class MacroCompiler( val encoding = Macro.ParameterEncoding.entries.singleOrNull { it.ionTextName == encodingText } if (encoding == null) { // TODO: Check for macro-shaped parameter encodings, and only if it's still null, we throw. - throw IonException("Unknown parameter encoding: $encodingText") + throw IonException("unsupported parameter encoding $annotations") } encoding } diff --git a/src/test/java/com/amazon/ion/conformance/ConformanceTestRunner.kt b/src/test/java/com/amazon/ion/conformance/ConformanceTestRunner.kt index 47878d25c..a96f8f8f0 100644 --- a/src/test/java/com/amazon/ion/conformance/ConformanceTestRunner.kt +++ b/src/test/java/com/amazon/ion/conformance/ConformanceTestRunner.kt @@ -21,6 +21,7 @@ object IncrementalReaderConformanceTests : ConformanceTestRunner( abstract class ConformanceTestRunner( readerBuilder: IonReaderBuilder, + /** A predicate that returns `true` iff the test case should be skipped. */ additionalSkipFilter: (File, String) -> Boolean = { _, _ -> false } ) { @@ -36,8 +37,6 @@ abstract class ConformanceTestRunner( "If no max_id, lack of exact-match must raise an error «then»" in completeTestName -> false // IonCatalog's "best choice" logic is not spec compliant "When max_id is valid, pad/truncate mismatched or absent SSTs" in completeTestName -> false - // TODO—Some commits have a typo in the name. Remove this line once ion-tests submodule is updated. - "When max_id is valid, pad/truncade mismatched or absent SSTs" in completeTestName -> false // No support for reading `$ion_encoding` directives yet. "conformance/ion_encoding/" in file.absolutePath -> false file.endsWith("local_symtab_imports.ion") -> when { @@ -96,7 +95,7 @@ abstract class ConformanceTestRunner( "make_decimal can be invoked in binary using system macro address 6" in completeTestName -> false // TODO: Macro-shaped parameters not implemented yet - "a macro that can create a monomorphized variant of the values macro for a macro-shape when invoked in Ion text" in completeTestName -> false + "macro-shape" in completeTestName -> false // TODO: Not implemented yet "subnormal f16" in completeTestName -> false