Florezchava
diff --git a/‎gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java
-1Lines changed: 0 additions & 1 deletion b/‎gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎gax-java/gax/src/test/java/com/google/api/gax/rpc/ServerStreamingCallSettingsTest.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/test/java/com/google/api/gax/rpc/ServerStreamingCallSettingsTest.java
+23Lines changed: 23 additions & 0 deletions b/‎gax-java/gax/src/test/java/com/google/api/gax/rpc/ServerStreamingCallSettingsTest.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/test/java/com/google/api/gax/rpc/ServerStreamingCallSettingsTest.java
+23Lines changed: 23 additions & 0 deletions
@@ -29,7 +29,6 @@
  */
 package com.google.api.gax.rpc;
 
-
 import com.google.api.core.ApiClock;
 import com.google.api.core.InternalApi;
 import com.google.common.base.Preconditions;
 
@@ -29,6 +29,7 @@
  */
 package com.google.api.gax.rpc;
 
+import static com.google.api.gax.util.TimeConversionTestUtils.testDurationMethod;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.api.gax.retrying.RetrySettings;
@@ -151,4 +152,26 @@ public void testToString() {
     assertThat(serverCallSettings.toString()).contains("retryableCodes=" + retryableCodes);
     assertThat(serverCallSettings.toString()).contains("retrySettings=" + retrySettings);
   }
+
+  @Test
+  public void testIdleTimeout_backportMethodsBehaveCorrectly() {
+    final ServerStreamingCallSettings.Builder builder = ServerStreamingCallSettings.newBuilder();
+    testDurationMethod(
+        123l,
+        jt -> builder.setIdleTimeout(jt).build(),
+        tt -> builder.setIdleTimeout(tt).build(),
+        cs -> cs.getIdleTimeoutDuration(),
+        cs -> cs.getIdleTimeout());
+  }
+
+  @Test
+  public void testWaitTimeout_backportMethodsBehaveCorrectly() {
+    final ServerStreamingCallSettings.Builder builder = ServerStreamingCallSettings.newBuilder();
+    testDurationMethod(
+        123l,
+        jt -> builder.setWaitTimeout(jt).build(),
+        tt -> builder.setWaitTimeout(tt).build(),
+        cs -> cs.getWaitTimeoutDuration(),
+        cs -> cs.getWaitTimeout());
+  }
 }