Clamp negative freshness TTL to -1

Author: westonruter

plugins/optimization-detective/class-od-url-metric-group-collection.php

@@ -168,7 +168,7 @@ public function __construct( array $url_metrics, string $current_etag, array $br
 		$this->sample_size = $sample_size;
 
 		// Set freshness TTL.
-		$this->freshness_ttl = $freshness_ttl;
+		$this->freshness_ttl = max( -1, $freshness_ttl );
 
 		// Create groups and the URL Metrics to them.
 		$this->groups = $this->create_groups();

plugins/optimization-detective/class-od-url-metric-group.php

@@ -145,7 +145,7 @@ public function __construct( array $url_metrics, int $minimum_viewport_width, ?i
 		}
 		$this->sample_size = $sample_size;
 
-		$this->freshness_ttl = $freshness_ttl;
+		$this->freshness_ttl = max( -1, $freshness_ttl );
 		$this->collection    = $collection;
 		$this->url_metrics   = $url_metrics;
 	}

plugins/optimization-detective/tests/storage/test-data.php

@@ -54,7 +54,7 @@ public function test_negative_od_get_url_metric_freshness_ttl(): void {
 		add_filter(
 			'od_url_metric_freshness_ttl',
 			static function (): int {
-				return -1;
+				return -12345;
 			}
 		);
 

plugins/optimization-detective/tests/test-class-od-url-metrics-group-collection.php

@@ -135,7 +135,11 @@ public function test_construction( array $url_metrics, string $current_etag, arr
 		$this->assertSame( $current_etag, $group_collection->get_current_etag() );
 		$this->assertSame( $sample_size, $group_collection->get_sample_size() );
 		$this->assertSame( $breakpoints, $group_collection->get_breakpoints() );
-		$this->assertSame( $freshness_ttl, $group_collection->get_freshness_ttl() );
+		if ( $freshness_ttl < 0 ) {
+			$this->assertSame( -1, $group_collection->get_freshness_ttl() );
+		} else {
+			$this->assertSame( $freshness_ttl, $group_collection->get_freshness_ttl() );
+		}
 	}
 
 	/**

plugins/optimization-detective/tests/test-class-od-url-metrics-group.php

@@ -57,7 +57,7 @@ public function data_provider_test_construction(): array {
 				'minimum_viewport_width' => 0,
 				'maximum_viewport_width' => 100,
 				'sample_size'            => 3,
-				'freshness_ttl'          => -HOUR_IN_SECONDS,
+				'freshness_ttl'          => -1,
 				'exception'              => '',
 			),
 			'good_empty_url_metrics'         => array(
@@ -287,12 +287,12 @@ public function data_provider_test_is_complete(): array {
 						'etag'      => md5( '' ),
 					)
 				),
-				'freshness_ttl'              => -HOUR_IN_SECONDS,
+				'freshness_ttl'              => -1,
 				'expected_is_group_complete' => true,
 			),
 			'negative_ttl_with_etag_mismatch'  => array(
 				'url_metric'                 => $this->get_sample_url_metric( array( 'etag' => md5( 'different_etag' ) ) ),
-				'freshness_ttl'              => -HOUR_IN_SECONDS,
+				'freshness_ttl'              => -1,
 				'expected_is_group_complete' => false,
 			),
 		);
@@ -302,6 +302,8 @@ public function data_provider_test_is_complete(): array {
 	 * Test is_complete().
 	 *
 	 * @covers ::is_complete
+	 * @covers ::get_freshness_ttl
+	 * @covers OD_URL_Metric_Group_Collection::get_freshness_ttl
 	 *
 	 * @dataProvider data_provider_test_is_complete
 	 */
@@ -312,6 +314,13 @@ public function test_is_complete( OD_URL_Metric $url_metric, int $freshness_ttl,
 		$group->add_url_metric( $url_metric );
 
 		$this->assertSame( $expected_is_group_complete, $group->is_complete() );
+		if ( $freshness_ttl < 0 ) {
+			$this->assertSame( -1, $collection->get_freshness_ttl() );
+			$this->assertSame( -1, $group->get_freshness_ttl() );
+		} else {
+			$this->assertSame( $freshness_ttl, $collection->get_freshness_ttl() );
+			$this->assertSame( $freshness_ttl, $group->get_freshness_ttl() );
+		}
 	}
 
 	/**