---

rahulKQL · chingor13 · commit 8df8443e71db · 2019-04-24T12:54:56.000-07:00
yaml --- r: 32479 b: refs/heads/autosynth-firestore c: 54d1b1c h: refs/heads/master i: 32477: 061ca75 32475: 1561144 32471: 732e834 32463: bd5beed 32447: fcbed66
diff --git a/[refs] b/[refs]
@@ -130,7 +130,7 @@ refs/heads/autosynth-containeranalysis: 18d210f81f17cf74864d0db2c29e834302f74f2a
 refs/heads/autosynth-datastore: f1efc3dc465174f41041acd56cf29badcec3e5bd
 refs/heads/autosynth-dialogflow: 73974cc32e5212aec0126472e0bc1442886fedaf
 refs/heads/autosynth-errorreporting: effe8001d110ad584187b30aafc473db0dd4a15f
-refs/heads/autosynth-firestore: cef6cd03f92eb9ac491fcb97639769fd06cde841
+refs/heads/autosynth-firestore: 54d1b1cfb1e6da9fcdd6c870f3bc91f402807d4a
 refs/heads/autosynth-iot: 4025d1804241e74d54950a324dc4f667aeaad4b3
 refs/heads/autosynth-kms: 6b65b0f34c12d141031c7288cdc01e550212d0f6
 refs/heads/autosynth-language: e73905aa7672afa47240e65b25c087207f4594f9
diff --git a/branches/autosynth-firestore/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/GCRulesTest.java b/branches/autosynth-firestore/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/GCRulesTest.java
@@ -280,6 +280,86 @@ public void intersectionOfUnions() {
     assertThat(actual.toProto()).isEqualTo(expected);
   }
 
+  @Test
+  public void unionOfRules() {
+    GcRule protoGCRule =
+        GcRule.newBuilder()
+            .setUnion(
+                Union.newBuilder()
+                    .addRules(buildAgeRule(10, 0))
+                    .addRules(buildVersionsRule(1))
+                    .addRules(buildAgeRule(20, 2)))
+            .build();
+
+    GCRules.GCRule modelGCRule =
+        GCRULES
+            .union()
+            .rule(GCRULES.maxAge(Duration.ofSeconds(10)))
+            .rule(GCRULES.maxVersions(1))
+            .rule(GCRULES.maxAge(Duration.ofSeconds(20, 2)));
+    assertThat(GCRULES.fromProto(protoGCRule)).isEqualTo(modelGCRule);
+  }
+
+  @Test
+  public void intersectionWithFromProto() {
+    GcRule protoGCRule =
+        GcRule.newBuilder()
+            .setIntersection(
+                Intersection.newBuilder()
+                    .addRules(buildAgeRule(10, 5))
+                    .addRules(buildVersionsRule(1))
+                    .addRules(buildVersionsRule(2)))
+            .build();
+
+    GCRules.GCRule modelGCRule =
+        GCRules.GCRULES
+            .intersection()
+            .rule(GCRULES.maxAge(org.threeten.bp.Duration.ofSeconds(10, 5)))
+            .rule(GCRULES.maxVersions(1))
+            .rule(GCRULES.maxVersions(2));
+    assertThat(GCRULES.fromProto(protoGCRule)).isEqualTo(modelGCRule);
+  }
+
+  @Test
+  public void unionOfIntersectionFromProto() {
+    GcRule protoGCRule =
+        GcRule.newBuilder()
+            .setUnion(
+                Union.newBuilder()
+                    .addRules(
+                        GcRule.newBuilder()
+                            .setIntersection(
+                                Intersection.newBuilder()
+                                    .addRules(buildVersionsRule(10))
+                                    .addRules(buildAgeRule(2, 4))
+                                    .build())
+                            .build())
+                    .addRules(
+                        GcRule.newBuilder()
+                            .setIntersection(
+                                Intersection.newBuilder()
+                                    .addRules(buildVersionsRule(1))
+                                    .addRules(buildAgeRule(1, 1))
+                                    .build())
+                            .build()))
+            .build();
+
+    GCRules.GCRule modelGCRule =
+        GCRULES
+            .union()
+            .rule(
+                GCRULES
+                    .intersection()
+                    .rule(GCRULES.maxVersions(10))
+                    .rule(GCRULES.maxAge(Duration.ofSeconds(2, 4))))
+            .rule(
+                GCRULES
+                    .intersection()
+                    .rule(GCRULES.maxVersions(1))
+                    .rule(GCRULES.maxAge(Duration.ofSeconds(1, 1))));
+    assertThat(GCRules.GCRULES.fromProto(protoGCRule)).isEqualTo(modelGCRule);
+  }
+
   public static GcRule buildAgeRule(long seconds, int nanos) {
     com.google.protobuf.Duration.Builder duartionBuilder =
         com.google.protobuf.Duration.newBuilder();
