1
0
mirror of https://github.com/octoleo/plantuml.git synced 2024-06-12 13:12:25 +00:00

test refactor: simplify test using TimTestUtils

For: `Chr` and `Ord`
This commit is contained in:
The-Lum 2023-12-08 21:44:05 +00:00
parent 3f836a44cc
commit 5c7245623a
2 changed files with 22 additions and 26 deletions

View File

@ -1,29 +1,31 @@
package net.sourceforge.plantuml.tim.stdlib; package net.sourceforge.plantuml.tim.stdlib;
import static org.junit.jupiter.api.Assertions.assertEquals; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
import java.util.Collections;
import java.util.List;
import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
import org.junit.jupiter.api.IndicativeSentencesGeneration;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.CsvSource;
import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterException;
import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterExceptionLocated;
import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.tim.TFunction;
/** /**
* Tests the builtin function %chr. * Tests the builtin function %chr.
*/ */
class ChrTest { @IndicativeSentencesGeneration(separator = ": ", generator = ReplaceUnderscores.class)
class ChrTest {
TFunction cut = new Chr();
final String cutName = "Chr";
/** /**
* Tests chr according to a list of input / expected output * Tests chr according to a list of input / expected output
* *
* @throws EaterException should not * @throws EaterException should not
* @throws EaterExceptionLocated should not * @throws EaterExceptionLocated should not
*/ */
@ParameterizedTest @ParameterizedTest(name = "[{index}] " + cutName + "({0}) = ''{1}''")
@CsvSource(nullValues = "null", value = { @CsvSource(nullValues = "null", value = {
" 65 , A ", " 65 , A ",
" 9 , '\t' ", " 9 , '\t' ",
@ -36,11 +38,7 @@ class ChrTest {
" 128512 , 😀 ", " 128512 , 😀 ",
" 128512 , \uD83D\uDE00 ", " 128512 , \uD83D\uDE00 ",
}) })
void executeReturnFunctionChrTest(Integer input, String expected) throws EaterException, EaterExceptionLocated { void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated {
Chr cut = new Chr(); assertTimExpectedOutputFromInput(cut, input, expected);
List<TValue> values = Collections.singletonList(TValue.fromInt(input));
TValue tValue = cut.executeReturnFunction(null, null, null, values, null);
assertEquals(expected, tValue.toString());
} }
} }

View File

@ -1,29 +1,31 @@
package net.sourceforge.plantuml.tim.stdlib; package net.sourceforge.plantuml.tim.stdlib;
import static org.junit.jupiter.api.Assertions.assertEquals; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
import java.util.Collections;
import java.util.List;
import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
import org.junit.jupiter.api.IndicativeSentencesGeneration;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.CsvSource;
import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterException;
import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterExceptionLocated;
import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.tim.TFunction;
/** /**
* Tests the builtin function %ord. * Tests the builtin function %ord.
*/ */
class OrdTest { @IndicativeSentencesGeneration(separator = ": ", generator = ReplaceUnderscores.class)
class OrdTest {
TFunction cut = new Ord();
final String cutName = "Ord";
/** /**
* Tests ord according to a list of input / expected output * Tests ord according to a list of input / expected output
* *
* @throws EaterException should not * @throws EaterException should not
* @throws EaterExceptionLocated should not * @throws EaterExceptionLocated should not
*/ */
@ParameterizedTest @ParameterizedTest(name = "[{index}] " + cutName + "(''{0}'') = {1}")
@CsvSource(nullValues = "null", value = { @CsvSource(nullValues = "null", value = {
" A , 65 ", " A , 65 ",
" ABC , 65 ", " ABC , 65 ",
@ -39,11 +41,7 @@ class OrdTest {
" 😀 , 128512 ", " 😀 , 128512 ",
" \uD83D\uDE00 , 128512 ", " \uD83D\uDE00 , 128512 ",
}) })
void executeReturnFunctionOrdTest(String input, String expected) throws EaterException, EaterExceptionLocated { void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated {
Ord cut = new Ord(); assertTimExpectedOutputFromInput(cut, input, expected);
List<TValue> values = Collections.singletonList(TValue.fromString(input));
TValue tValue = cut.executeReturnFunction(null, null, null, values, null);
assertEquals(expected, tValue.toString());
} }
} }