Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git

Fix pluralization unit test

Author DaveJarvis <email>
Date 2023-02-20 18:01:11 GMT-0800
Commit 181293ff44133d71337952afaaa2a5815c9a33de
Parent 55c334f
src/test/java/com/keenwrite/r/PluralizeTest.java
public class PluralizeTest {
private static final ScriptEngine ENGINE =
- new ScriptEngineManager().getEngineByName( "Renjin" );
+ new ScriptEngineManager().getEngineByName( "Renjin" );
private static final Map<String, String> PLURAL_MAP = ofEntries(
- entry( "beef", "beefs" ),
- entry( "brother", "brothers" ),
- entry( "child", "children" ),
- entry( "cow", "cows" ),
- entry( "ephemeris", "ephemerides" ),
- entry( "genie", "genies" ),
- entry( "money", "moneys" ),
- entry( "mongoose", "mongooses" ),
- entry( "mythos", "mythoi" ),
- entry( "octopus", "octopuses" ),
- entry( "ox", "oxen" ),
- entry( "soliloquy", "soliloquies" ),
- entry( "trilby", "trilbys" ),
- entry( "wolf", "wolves" )
+ entry( "beef", "beefs" ),
+ entry( "brother", "brothers" ),
+ entry( "child", "children" ),
+ entry( "cow", "cows" ),
+ entry( "ephemeris", "ephemerides" ),
+ entry( "genie", "genies" ),
+ entry( "money", "moneys" ),
+ entry( "mongoose", "mongooses" ),
+ entry( "mythos", "mythoi" ),
+ entry( "octopus", "octopuses" ),
+ entry( "ox", "oxen" ),
+ entry( "soliloquy", "soliloquies" ),
+ entry( "trilby", "trilbys" ),
+ entry( "wolf", "wolves" )
);
@BeforeAll
static void setup() throws ScriptException {
r( "setwd( 'R' );" );
r( "source( 'pluralize.R' );" );
}
@Test
- @SuppressWarnings("UnnecessaryLocalVariable")
public void test_Pluralize_SingularForms_PluralForms()
- throws ScriptException {
- for( final var key : PLURAL_MAP.keySet() ) {
- final var expectedSingular = key;
- final var expectedPlural = PLURAL_MAP.get( key );
- final var actualSingular = pluralize( key, 1 );
- final var actualPlural = pluralize( key, 2 );
+ throws ScriptException {
+
+ for( final var entry : PLURAL_MAP.entrySet() ) {
+ final var expectedSingular = entry.getKey();
+ final var expectedPlural = entry.getValue();
+ final var actualSingular = pluralize( expectedSingular, 1 );
+ final var actualPlural = pluralize( expectedSingular, 2 );
assertEquals( expectedSingular, actualSingular );
assertEquals( expectedPlural, actualPlural );
}
}
private String pluralize( final String word, final int count )
- throws ScriptException {
- return r( format( "pluralize( '%s', %d );", word, count ) ).toString();
+ throws ScriptException {
+ final var stmt = format( "pluralize( word='%s', n=%d );", word, count );
+ return r( stmt ).toString();
}
Delta 25 lines added, 24 lines removed, 1-line increase