From 9c2c8f1ab63b1db4e57180b2081cbb202b48afb9 Mon Sep 17 00:00:00 2001 From: Julian Reschke Date: Sun, 9 Mar 2025 17:30:58 +0100 Subject: [PATCH] simplify Junit parametrizable (closes #13) --- .../greenbytes/http/sfv/AbstractSpecificationTests.java | 7 ++++++- .../org/greenbytes/http/sfv/SpecificationBinaryTests.java | 4 ++++ .../java/org/greenbytes/http/sfv/SpecificationTests.java | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 src/test/java/org/greenbytes/http/sfv/SpecificationBinaryTests.java diff --git a/src/test/java/org/greenbytes/http/sfv/AbstractSpecificationTests.java b/src/test/java/org/greenbytes/http/sfv/AbstractSpecificationTests.java index 497a8f1..bcbf08f 100644 --- a/src/test/java/org/greenbytes/http/sfv/AbstractSpecificationTests.java +++ b/src/test/java/org/greenbytes/http/sfv/AbstractSpecificationTests.java @@ -34,6 +34,11 @@ public static class TestParams { public JsonValue expected_value; public JsonValue expected_params; public String canonical; + + // provides the test name to Junit runner + @Override public String toString() { + return filename + ":" + name; + } } public static Collection makeParameters(String... filenames) { @@ -51,7 +56,7 @@ private static Collection internalMakeParameters(String filename) { JsonReader reader = Json.createReader(AbstractSpecificationTests.class.getClassLoader().getResourceAsStream(filename)); for (JsonValue vt : reader.readArray()) { TestParams p = makeOneTest(basename, vt); - result.add(new Object[] { basename + ": " + p.name, p }); + result.add(new Object[] { p }); } return result; diff --git a/src/test/java/org/greenbytes/http/sfv/SpecificationBinaryTests.java b/src/test/java/org/greenbytes/http/sfv/SpecificationBinaryTests.java new file mode 100644 index 0000000..c16ea72 --- /dev/null +++ b/src/test/java/org/greenbytes/http/sfv/SpecificationBinaryTests.java @@ -0,0 +1,4 @@ +package org.greenbytes.http.sfv; + +public class SpecificationBinaryTests { +} diff --git a/src/test/java/org/greenbytes/http/sfv/SpecificationTests.java b/src/test/java/org/greenbytes/http/sfv/SpecificationTests.java index 79a957b..1c3a900 100644 --- a/src/test/java/org/greenbytes/http/sfv/SpecificationTests.java +++ b/src/test/java/org/greenbytes/http/sfv/SpecificationTests.java @@ -41,8 +41,8 @@ public static Collection parameters() { "param-listlist.json", "string.json", "string-generated.json", "token.json", "token-generated.json"); } - public SpecificationTests(Object x, Object y) { - this.p = (TestParams) y; + public SpecificationTests(TestParams params) { + this.p = params; } @Test