From d386483bd27be818057d3a78e314f696a76964de Mon Sep 17 00:00:00 2001 From: James Rosewell Date: Sat, 14 Nov 2026 12:42:45 +0000 Subject: [PATCH 1/2] Run ShareUsageBuilderBaseTest on JUnit 5, which its module runs The module depends on JUnit 5 alone, so the JUnit 4 annotations meant none of these tests ran. --- .../ShareUsageBuilderBaseTest.java | 103 +++++++++++------- 1 file changed, 66 insertions(+), 37 deletions(-) diff --git a/pipeline/pipeline.engines.fiftyone/src/test/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBaseTest.java b/pipeline/pipeline.engines.fiftyone/src/test/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBaseTest.java index b91149c58..cfa2ab23e 100644 --- a/pipeline/pipeline.engines.fiftyone/src/test/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBaseTest.java +++ b/pipeline/pipeline.engines.fiftyone/src/test/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBaseTest.java @@ -22,19 +22,19 @@ package fiftyone.pipeline.engines.fiftyone.flowelements; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ShareUsageBuilderBaseTest { ShareUsageBuilderBase base; - @Before + @BeforeEach public void setUp(){ base = new ShareUsageBuilderBase(null, null) { @Override @@ -111,22 +111,30 @@ public void testSetBlockedHttpHeaders() { } - @Test(expected = IllegalArgumentException.class) + @Test public void setIgnoreFlowDataEvidenceFilter1() { - base.setIgnoreFlowDataEvidenceFilter(""); + assertThrows(IllegalArgumentException.class, () -> { + base.setIgnoreFlowDataEvidenceFilter(""); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void setIgnoreFlowDataEvidenceFilter2() { - base.setIgnoreFlowDataEvidenceFilter("hello"); + assertThrows(IllegalArgumentException.class, () -> { + base.setIgnoreFlowDataEvidenceFilter("hello"); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void setIgnoreFlowDataEvidenceFilter2a() { - base.setIgnoreFlowDataEvidenceFilter("hello, one: two"); + assertThrows(IllegalArgumentException.class, () -> { + base.setIgnoreFlowDataEvidenceFilter("hello, one: two"); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void setIgnoreFlowDataEvidenceFilter2b() { - base.setIgnoreFlowDataEvidenceFilter("hello : world, one"); + assertThrows(IllegalArgumentException.class, () -> { + base.setIgnoreFlowDataEvidenceFilter("hello : world, one"); + }); } @Test public void setIgnoreFlowDataEvidenceFilter3() { @@ -143,13 +151,17 @@ public void setSharePercentage1() { base.setSharePercentage(0.1); assertEquals(0.1, base.sharePercentage, 0.00001); } - @Test(expected = IllegalArgumentException.class) + @Test public void setSharePercentage2() { - base.setSharePercentage(-0.1); + assertThrows(IllegalArgumentException.class, () -> { + base.setSharePercentage(-0.1); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void setSharePercentage3() { - base.setSharePercentage(1.1); + assertThrows(IllegalArgumentException.class, () -> { + base.setSharePercentage(1.1); + }); } @Test @@ -157,26 +169,34 @@ public void setMinimumEntriesPerMessage1() { base.setMinimumEntriesPerMessage(50); assertEquals(50, base.minimumEntriesPerMessage); } - @Test(expected = IllegalArgumentException.class) + @Test public void setMinimumEntriesPerMessage2() { - base.setMinimumEntriesPerMessage(0); + assertThrows(IllegalArgumentException.class, () -> { + base.setMinimumEntriesPerMessage(0); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void setMinimumEntriesPerMessage3() { - base.setMinimumEntriesPerMessage(-1); + assertThrows(IllegalArgumentException.class, () -> { + base.setMinimumEntriesPerMessage(-1); + }); } @Test public void setMaximumQueueSize() { base.setMaximumQueueSize(200); assertEquals(200, base.maximumQueueSize); } - @Test(expected = IllegalArgumentException.class) + @Test public void setMaximumQueueSize1() { - base.setMaximumQueueSize(0); + assertThrows(IllegalArgumentException.class, () -> { + base.setMaximumQueueSize(0); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void setMaximumQueueSize2() { - base.setMaximumQueueSize(-1); + assertThrows(IllegalArgumentException.class, () -> { + base.setMaximumQueueSize(-1); + }); } @Test @@ -190,9 +210,11 @@ public void setAddTimeoutMillis1() { base.setAddTimeoutMillis(1000); assertEquals(1000, base.addTimeout); } - @Test(expected = IllegalArgumentException.class) + @Test public void setAddTimeoutMillis2() { - base.setAddTimeoutMillis(-1); + assertThrows(IllegalArgumentException.class, () -> { + base.setAddTimeoutMillis(-1); + }); } @Test @@ -200,20 +222,24 @@ public void setTakeTimeoutMillis1() { base.setTakeTimeoutMillis(1000); assertEquals(1000, base.takeTimeout); } - @Test(expected = IllegalArgumentException.class) + @Test public void setTakeTimeoutMillis2() { - base.setTakeTimeoutMillis(-1); + assertThrows(IllegalArgumentException.class, () -> { + base.setTakeTimeoutMillis(-1); + }); } @Test public void setShareUsageUrl() { base.setShareUsageUrl("https://dog-food.com"); - assertEquals(base.shareUsageUrl, "https://dog-food.com"); + assertEquals("https://dog-food.com", base.shareUsageUrl); } - @Test(expected = IllegalArgumentException.class) + @Test public void setShareUsageUrl1() { - base.setShareUsageUrl("dog food"); + assertThrows(IllegalArgumentException.class, () -> { + base.setShareUsageUrl("dog food"); + }); } @Test @@ -221,11 +247,12 @@ public void setSessionCookieName() { base.setSessionCookieName("test"); assertEquals("test", base.sessionCookieName); } - @Test (expected = IllegalArgumentException.class) + @Test public void setSessionCookieName1() { - // illegal name - base.setSessionCookieName("te st"); - assertEquals("test", base.sessionCookieName); + assertThrows(IllegalArgumentException.class, () -> { + // illegal name + base.setSessionCookieName("te st"); + }); } @Test @@ -233,9 +260,11 @@ public void setRepeatEvidenceIntervalMinutes() { base.setRepeatEvidenceIntervalMinutes(1); assertEquals(1, base.repeatEvidenceInterval); } - @Test (expected = IllegalArgumentException.class) + @Test public void setRepeatEvidenceIntervalMinutes1() { - base.setRepeatEvidenceIntervalMinutes(-1); + assertThrows(IllegalArgumentException.class, () -> { + base.setRepeatEvidenceIntervalMinutes(-1); + }); } @Test From 01435f96eefe5d6e9c52afa4f5d3ef8b999a5096 Mon Sep 17 00:00:00 2001 From: James Rosewell Date: Sat, 14 Nov 2026 12:50:55 +0000 Subject: [PATCH 2/2] Test the blocked headers and repeat interval setters as documented Once the tests ran, two of them disagreed with the setters' documented behaviour. The text form of setBlockedHttpHeaders adds to the list, as its Javadoc says, and a negative repeat interval is kept and shares every repeat, as 0 does. The repeat interval's Javadoc now gives the default of 20 minutes it has. --- .../flowelements/ShareUsageBuilderBase.java | 3 ++- .../flowelements/ShareUsageBuilderBaseTest.java | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pipeline/pipeline.engines.fiftyone/src/main/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBase.java b/pipeline/pipeline.engines.fiftyone/src/main/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBase.java index 6e07f6dd3..a54e2ac5c 100644 --- a/pipeline/pipeline.engines.fiftyone/src/main/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBase.java +++ b/pipeline/pipeline.engines.fiftyone/src/main/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBase.java @@ -450,7 +450,8 @@ public ShareUsageBuilderBase setSessionCookieName(String cookieName) { * If exactly the same evidence values are seen multiple times within this * time limit then they will only be shared once. *

- * The default value for this is 0 - meaning always share. + * The default is 20 minutes. An interval of 0, or a negative one, + * shares every repeat. * @param interval the interval in minutes * @return this builder */ diff --git a/pipeline/pipeline.engines.fiftyone/src/test/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBaseTest.java b/pipeline/pipeline.engines.fiftyone/src/test/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBaseTest.java index cfa2ab23e..01a190e0a 100644 --- a/pipeline/pipeline.engines.fiftyone/src/test/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBaseTest.java +++ b/pipeline/pipeline.engines.fiftyone/src/test/java/fiftyone/pipeline/engines/fiftyone/flowelements/ShareUsageBuilderBaseTest.java @@ -78,9 +78,14 @@ public void testSetIncludedQueryStringParameters() { @Test public void setBlockedHttpHeaders() { + // The text setter adds to the list, as its Javadoc says, where the + // list setter replaces it. base.setBlockedHttpHeaders("g, h, i"); base.setBlockedHttpHeaders("a, b, c"); - assertEquals(3, base.blockedHttpHeaders.size()); + assertEquals(6, base.blockedHttpHeaders.size()); + assertTrue(base.blockedHttpHeaders.contains("g")); + assertTrue(base.blockedHttpHeaders.contains("h")); + assertTrue(base.blockedHttpHeaders.contains("i")); assertTrue(base.blockedHttpHeaders.contains("a")); assertTrue(base.blockedHttpHeaders.contains("b")); assertTrue(base.blockedHttpHeaders.contains("c")); @@ -261,10 +266,11 @@ public void setRepeatEvidenceIntervalMinutes() { assertEquals(1, base.repeatEvidenceInterval); } @Test - public void setRepeatEvidenceIntervalMinutes1() { - assertThrows(IllegalArgumentException.class, () -> { - base.setRepeatEvidenceIntervalMinutes(-1); - }); + public void setRepeatEvidenceIntervalMinutes_Negative_Kept() { + // A negative interval is not refused. It shares every repeat, as 0 + // does. + base.setRepeatEvidenceIntervalMinutes(-1); + assertEquals(-1, base.repeatEvidenceInterval); } @Test