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 b91149c58..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 @@ -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 @@ -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")); @@ -111,22 +116,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 +156,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 +174,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 +215,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 +227,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 +252,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 +265,12 @@ public void setRepeatEvidenceIntervalMinutes() { base.setRepeatEvidenceIntervalMinutes(1); assertEquals(1, base.repeatEvidenceInterval); } - @Test (expected = IllegalArgumentException.class) - public void setRepeatEvidenceIntervalMinutes1() { + @Test + 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