Skip to content

Commit

Permalink
Correct math CST parsing for mod expression to use mod-numeric (#306)
Browse files Browse the repository at this point in the history
* Add broken tests for #305 bug report

* Modulo invoke mod-numeric not idiv for #305.
  • Loading branch information
aj-stein-nist authored Feb 6, 2024
1 parent 412311c commit 6e6f148
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ protected static ISequence<? extends INumericItem> resultOrEmpty(@Nullable INume
if (dividend == null || divisor == null) {
retval = ISequence.empty();
} else {
INumericItem result = OperationFunctions.opNumericIntegerDivide(dividend, divisor);
INumericItem result = OperationFunctions.opNumericMod(dividend, divisor);
retval = ISequence.of(result);
}
return retval;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Portions of this software was developed by employees of the National Institute
* of Standards and Technology (NIST), an agency of the Federal Government and is
* being made available as a public service. Pursuant to title 17 United States
* Code Section 105, works of NIST employees are not subject to copyright
* protection in the United States. This software may be subject to foreign
* copyright. Permission in the United States and in foreign countries, to the
* extent that NIST may hold copyright, to use, copy, modify, create derivative
* works, and distribute this software and its documentation without fee is hereby
* granted on a non-exclusive basis, provided that this notice and disclaimer
* of warranty appears in all copies.
*
* THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND, EITHER
* EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY
* THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND FREEDOM FROM
* INFRINGEMENT, AND ANY WARRANTY THAT THE DOCUMENTATION WILL CONFORM TO THE
* SOFTWARE, OR ANY WARRANTY THAT THE SOFTWARE WILL BE ERROR FREE. IN NO EVENT
* SHALL NIST BE LIABLE FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT,
* INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM,
* OR IN ANY WAY CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
* CONTRACT, TORT, OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY PERSONS OR
* PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED FROM, OR AROSE OUT
* OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER.
*/

package gov.nist.secauto.metaschema.core.metapath.function;

import static gov.nist.secauto.metaschema.core.metapath.TestUtils.decimal;
import static gov.nist.secauto.metaschema.core.metapath.TestUtils.integer;
import static org.junit.jupiter.api.Assertions.assertEquals;

import gov.nist.secauto.metaschema.core.metapath.function.library.FunctionTestBase;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.INumericItem;

import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

import java.util.stream.Stream;

import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;

class OperationFunctionsTest
extends FunctionTestBase {

private static Stream<Arguments> provideValuesOpNumericMod() {
return Stream.of(
Arguments.of(decimal(1), integer(10), integer(3)),
Arguments.of(decimal(0), integer(6), integer(-2)),
Arguments.of(decimal(0.9), decimal(4.5), decimal(1.2)),
Arguments.of(decimal(3.0E0), decimal(1.23E2), decimal(0.6E1)));
}

@ParameterizedTest
@MethodSource("provideValuesOpNumericMod")
void testOpNumericMod(@Nullable INumericItem expected, @NonNull INumericItem dividend,
@NonNull INumericItem divisor) {
assertEquals(expected, OperationFunctions.opNumericMod(dividend, divisor));
}
}

0 comments on commit 6e6f148

Please sign in to comment.