Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib_java/build-test-jar.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#! /bin/bash

JAVA_FILES=$(find src/dates_calc/ -name "*.java")

javac -d classes $JAVA_FILES

jar --main-class dates_calc/DatesCalcTest --create --file test-main.jar -C classes dates_calc
6 changes: 6 additions & 0 deletions lib_java/dune
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
(rule
(target test-main.jar)
(deps (glob_files src/dates_calc/*.java))
(action (run ./build-test-jar.sh))
)

(install
(section lib)
(files
Expand Down
90 changes: 0 additions & 90 deletions lib_java/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
import java.util.List;
import java.util.stream.Stream;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class DatesCalcTest {

// Helper to read CSV data, using relative path from lib_java
Expand All @@ -38,25 +32,40 @@ private static List<String[]> readCsv(String relativePath) throws IOException {

// --- Data Providers ---
// Return Stream<Arguments> where each Arguments contains the individual elements of a row
static Stream<Arguments> exactComputationsProvider() throws IOException {
// Map each String[] row to Arguments.of(row[0], row[1], row[2])
return readCsv("exact_computations.csv").stream().map(row -> Arguments.of(row[0], row[1], row[2]));
static Stream<String[]> exactComputationsProvider() throws IOException {
// Arrays of length 3
return readCsv("exact_computations.csv").stream();
}

static Stream<String[]> ambiguousComputationsProvider() throws IOException {
// Arrays of length 4
return readCsv("ambiguous_computations.csv").stream();
}

static Stream<String[]> firstLastDayOfMonthProvider() throws IOException {
// Arrays of length 3
return readCsv("first_last_day_of_month.csv").stream();
}

static Stream<Arguments> ambiguousComputationsProvider() throws IOException {
// Map each String[] row to Arguments.of(row[0], row[1], row[2], row[3])
return readCsv("ambiguous_computations.csv").stream().map(row -> Arguments.of(row[0], row[1], row[2], row[3]));
static <T> void assertEquals(T expected, T received, String message) {
if (!(expected.equals(received))) {
throw new RuntimeException(message);
}
}

static Stream<Arguments> firstLastDayOfMonthProvider() throws IOException {
// Map each String[] row to Arguments.of(row[0], row[1], row[2])
return readCsv("first_last_day_of_month.csv").stream().map(row -> Arguments.of(row[0], row[1], row[2]));
static <T extends Exception> void assertThrows(Class<T> exn_clazz, Runnable thunk, String message) {
try {
thunk.run();
} catch (Exception e) {
if (exn_clazz.isInstance(e)) {
return;
}
}
throw new RuntimeException(message);
}

// --- Test Methods ---
@ParameterizedTest(name = "[{index}] {0} + {1} = {2}")
@MethodSource("exactComputationsProvider")
void testAddDatesExact(String dateStr, String periodStr, String expectedDateStr) {
static void testAddDatesExact(String dateStr, String periodStr, String expectedDateStr) {
Date d = Date.fromString(dateStr);
Period p = Period.fromString(periodStr);
Date expected = Date.fromString(expectedDateStr);
Expand All @@ -66,9 +75,7 @@ void testAddDatesExact(String dateStr, String periodStr, String expectedDateStr)
assertEquals(expected, d.add(p, Date.Rounding.ROUND_DOWN), "Exact addition (RoundDown) failed for " + dateStr + " + " + periodStr);
}

@ParameterizedTest(name = "[{index}] {0} + {1} -> UP={2}, DOWN={3}")
@MethodSource("ambiguousComputationsProvider")
void testAddDatesAmbiguous(String dateStr, String periodStr, String expectedUpStr, String expectedDownStr) {
static void testAddDatesAmbiguous(String dateStr, String periodStr, String expectedUpStr, String expectedDownStr) {
// No need to access via index anymore
Date d = Date.fromString(dateStr);
Period p = Period.fromString(periodStr);
Expand All @@ -80,14 +87,22 @@ void testAddDatesAmbiguous(String dateStr, String periodStr, String expectedUpSt
assertEquals(expectedDown, d.add(p, Date.Rounding.ROUND_DOWN), "Ambiguous addition (RoundDown) failed for " + dateStr + " + " + periodStr);
}

@ParameterizedTest(name = "[{index}] {0} -> First={1}, Last={2}")
@MethodSource("firstLastDayOfMonthProvider")
void testFirstLastDayOfMonth(String dateStr, String expectedFirstStr, String expectedLastStr) {
static void testFirstLastDayOfMonth(String dateStr, String expectedFirstStr, String expectedLastStr) {
Date d = Date.fromString(dateStr);
Date expectedFirst = Date.fromString(expectedFirstStr);
Date expectedLast = Date.fromString(expectedLastStr);

assertEquals(expectedFirst, d.firstDayOfMonth(), "First day of month calculation failed for " + dateStr);
assertEquals(expectedLast, d.lastDayOfMonth(), "Last day of month calculation failed for " + dateStr);
}

public static void main(String[] args) throws IOException {
System.out.println("Running Java unit tests...");
exactComputationsProvider().forEach(arr -> testAddDatesExact(arr[0], arr[1], arr[2]));
System.out.println("- Addition tests: OK");
ambiguousComputationsProvider().forEach(arr -> testAddDatesAmbiguous(arr[0], arr[1], arr[2], arr[3]));
System.out.println("- Ambiguous addition tests: OK");
firstLastDayOfMonthProvider().forEach(arr -> testFirstLastDayOfMonth(arr[0], arr[1], arr[2]));
System.out.println("- First/Last day of month tests: OK");
}
}
4 changes: 2 additions & 2 deletions test/dune
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@

(rule
(alias runtest)
(deps (source_tree ../lib_java))
(action (chdir ../lib_java (run mvn test))))
(deps (file ../lib_java/test-main.jar))
(action (run java -jar %{deps})))