Fix test cases

Author: sakthivelmanii

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerCloudMonitoringExporter.java

@@ -88,7 +88,7 @@ static SpannerCloudMonitoringExporter create(
     if (monitoringHost != null) {
       settingsBuilder.setEndpoint(monitoringHost);
     }
-    if (Strings.isNullOrEmpty(universeDomain)) {
+    if (!Strings.isNullOrEmpty(universeDomain)) {
       settingsBuilder.setUniverseDomain(universeDomain);
     }
 
@@ -117,6 +117,11 @@ public CompletableResultCode export(@Nonnull Collection<MetricData> collection)
     return exportSpannerClientMetrics(collection);
   }
 
+  @VisibleForTesting
+  MetricServiceClient getMetricServiceClient() {
+    return client;
+  }
+
   /** Export client built in metrics */
   private CompletableResultCode exportSpannerClientMetrics(Collection<MetricData> collection) {
     // Filter spanner metrics. Only include metrics that contain a valid project.

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java

@@ -888,7 +888,7 @@ default boolean isEnableEndToEndTracing() {
 
     @Deprecated
     @ObsoleteApi(
-        "This will be removed in upcoming version without breaking change release. You should use"
+        "This will be removed in an upcoming version without a major version bump. You should use"
             + " universalDomain to configure the built-in metrics endpoint for a partner universe.")
     default String getMonitoringHost() {
       return null;
@@ -1686,7 +1686,7 @@ public Builder setBuiltInMetricsEnabled(boolean enableBuiltInMetrics) {
     /** Sets the monitoring host to be used for Built-in client side metrics */
     @Deprecated
     @ObsoleteApi(
-        "This will be removed in upcoming version without breaking change release. You should use"
+        "This will be removed in an upcoming version without a major version bump. You should use"
             + " universalDomain to configure the built-in metrics endpoint for a partner universe.")
     public Builder setMonitoringHost(String monitoringHost) {
       this.monitoringHost = monitoringHost;

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerCloudMonitoringExporterTest.java

@@ -30,6 +30,7 @@
 import static com.google.cloud.spanner.BuiltInMetricsConstant.OPERATION_LATENCIES_NAME;
 import static com.google.cloud.spanner.BuiltInMetricsConstant.PROJECT_ID_KEY;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -39,6 +40,7 @@
 import com.google.api.core.ApiFutures;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.monitoring.v3.MetricServiceClient;
+import com.google.cloud.monitoring.v3.MetricServiceSettings;
 import com.google.cloud.monitoring.v3.stub.MetricServiceStub;
 import com.google.common.collect.ImmutableList;
 import com.google.monitoring.v3.CreateTimeSeriesRequest;
@@ -459,6 +461,24 @@ public void getAggregationTemporality() throws IOException {
         .isEqualTo(AggregationTemporality.CUMULATIVE);
   }
 
+  @Test
+  public void testUniverseDomain() throws IOException {
+    SpannerCloudMonitoringExporter actualExporter =
+        SpannerCloudMonitoringExporter.create(projectId, null, null, "abc.goog");
+    MetricServiceSettings metricServiceSettings = actualExporter.getMetricServiceClient().getSettings();
+
+    assertEquals("abc.goog", metricServiceSettings.getUniverseDomain());
+    assertEquals("monitoring.abc.goog:443", metricServiceSettings.getEndpoint());
+
+
+    actualExporter =
+        SpannerCloudMonitoringExporter.create(projectId, null, "monitoringa.abc.goog:443", "abc.goog");
+    metricServiceSettings = actualExporter.getMetricServiceClient().getSettings();
+
+    assertEquals("abc.goog", metricServiceSettings.getUniverseDomain());
+    assertEquals("monitoringa.abc.goog:443", metricServiceSettings.getEndpoint());
+  }
+
   private static class FakeMetricServiceClient extends MetricServiceClient {
 
     protected FakeMetricServiceClient(MetricServiceStub stub) {