Skip to content

feat: Adding new fields for Instance Create Time and Update Time #1913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 15, 2022
Merged

feat: Adding new fields for Instance Create Time and Update Time #1913

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
69a60ab
feat: Adding new fields for Instance Create Time and Update Time.
gauravpurohit06 Jun 7, 2022
ea00944
Test: Updating Junit to check for create time and update time as well.
gauravpurohit06 Jun 7, 2022
5910b8e
Updating the sample to log create time and update time on console.
gauravpurohit06 Jun 8, 2022
3c031d8
Code review changes.
gauravpurohit06 Jun 17, 2022
726c85f
1. Using Junit asserts check instead of Google Truth as it's more fam…
gauravpurohit06 Jun 20, 2022
dc67a91
Updating value for update time to make it a greater than create time.
gauravpurohit06 Jun 20, 2022
f485462
Merge branch 'main' into span_instance_additional_fields
gauravpurohit06 Jul 12, 2022
41e374d
refactor: Reverting sample changes to pass the presubmit checks.
gauravpurohit06 Jul 12, 2022
c49f4db
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Test: Updating Junit to check for create time and update time as well.
  • Loading branch information
@gauravpurohit06
gauravpurohit06 committed Jun 8, 2022
commit ea009445dd43258c6f1e2a6148cad92147135c44
19 changes: 19 additions & 0 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import com.google.cloud.Timestamp;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -41,6 +42,8 @@ public void testEmptyBuilder() {
assertEquals(0, info.getNodeCount());
assertEquals(0, info.getProcessingUnits());
assertTrue(info.getLabels().isEmpty());
assertNull(info.getUpdateTime());
assertNull(info.getCreateTime());
}

@Test
Expand All @@ -56,6 +59,8 @@ public void testBuildInstanceInfo() {
.setState(InstanceInfo.State.READY)
.addLabel("env", "prod")
.addLabel("region", "us")
.setUpdateTime(Timestamp.ofTimeMicroseconds(36000))
.setCreateTime(Timestamp.ofTimeMicroseconds(46000))
.build();
assertThat(info.getId()).isEqualTo(id);
assertThat(info.getInstanceConfigId()).isEqualTo(configId);
Expand All @@ -64,6 +69,8 @@ public void testBuildInstanceInfo() {
assertThat(info.getProcessingUnits()).isEqualTo(2000);
assertThat(info.getState()).isEqualTo(InstanceInfo.State.READY);
assertThat(info.getLabels()).containsExactly("env", "prod", "region", "us");
assertThat(info.getUpdateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(36000));
assertThat(info.getCreateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(46000));

info = info.toBuilder().setDisplayName("new test instance").build();
assertThat(info.getId()).isEqualTo(id);
Expand All @@ -73,6 +80,8 @@ public void testBuildInstanceInfo() {
assertThat(info.getProcessingUnits()).isEqualTo(2000);
assertThat(info.getState()).isEqualTo(InstanceInfo.State.READY);
assertThat(info.getLabels()).containsExactly("env", "prod", "region", "us");
assertThat(info.getUpdateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(36000));
assertThat(info.getCreateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(46000));
}

@Test
Expand All @@ -88,6 +97,8 @@ public void testToBuilder() {
.setState(InstanceInfo.State.READY)
.addLabel("env", "prod")
.addLabel("region", "us")
.setUpdateTime(Timestamp.ofTimeMicroseconds(36000))
.setCreateTime(Timestamp.ofTimeMicroseconds(46000))
.build();

InstanceInfo rebuilt = info.toBuilder().setDisplayName("new test instance").build();
Expand All @@ -98,6 +109,8 @@ public void testToBuilder() {
assertThat(rebuilt.getProcessingUnits()).isEqualTo(2000);
assertThat(rebuilt.getState()).isEqualTo(InstanceInfo.State.READY);
assertThat(rebuilt.getLabels()).containsExactly("env", "prod", "region", "us");
assertThat(info.getUpdateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(36000));
assertThat(info.getCreateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(46000));
}

@Test
Expand All @@ -115,6 +128,8 @@ public void testEquals() {
.setState(InstanceInfo.State.READY)
.addLabel("env", "prod")
.addLabel("region", "us")
.setUpdateTime(Timestamp.ofTimeMicroseconds(36000))
.setCreateTime(Timestamp.ofTimeMicroseconds(46000))
.build();
InstanceInfo instance2 =
InstanceInfo.newBuilder(id)
Expand All @@ -125,6 +140,8 @@ public void testEquals() {
.setState(InstanceInfo.State.READY)
.addLabel("region", "us")
.addLabel("env", "prod")
.setUpdateTime(Timestamp.ofTimeMicroseconds(36000))
.setCreateTime(Timestamp.ofTimeMicroseconds(46000))
.build();
InstanceInfo instance3 =
InstanceInfo.newBuilder(id)
Expand All @@ -134,6 +151,8 @@ public void testEquals() {
.setProcessingUnits(2000)
.setState(InstanceInfo.State.READY)
.addLabel("env", "prod")
.setUpdateTime(Timestamp.ofTimeMicroseconds(3000))
.setCreateTime(Timestamp.ofTimeMicroseconds(4000))
.build();
EqualsTester tester = new EqualsTester();
tester.addEqualityGroup(instance, instance2);
Expand Down
13 changes: 13 additions & 0 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.google.cloud.Identity;
import com.google.cloud.Policy;
import com.google.cloud.Role;
import com.google.cloud.Timestamp;
import com.google.common.testing.EqualsTester;
import java.util.Collections;
import org.junit.Before;
Expand Down Expand Up @@ -56,6 +57,8 @@ public void buildInstance() {
.setState(InstanceInfo.State.READY)
.addLabel("env", "prod")
.addLabel("region", "us")
.setUpdateTime(Timestamp.ofTimeMicroseconds(36000))
.setCreateTime(Timestamp.ofTimeMicroseconds(46000))
.build();
assertThat(instance.getId()).isEqualTo(id);
assertThat(instance.getInstanceConfigId()).isEqualTo(configId);
Expand All @@ -64,6 +67,8 @@ public void buildInstance() {
assertThat(instance.getProcessingUnits()).isEqualTo(2000);
assertThat(instance.getState()).isEqualTo(InstanceInfo.State.READY);
assertThat(instance.getLabels()).containsExactly("env", "prod", "region", "us");
assertThat(instance.getUpdateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(36000));
assertThat(instance.getCreateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(46000));

instance = instance.toBuilder().setDisplayName("new test instance").build();
assertThat(instance.getId()).isEqualTo(id);
Expand All @@ -73,6 +78,8 @@ public void buildInstance() {
assertThat(instance.getProcessingUnits()).isEqualTo(2000);
assertThat(instance.getState()).isEqualTo(InstanceInfo.State.READY);
assertThat(instance.getLabels()).containsExactly("env", "prod", "region", "us");
assertThat(instance.getUpdateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(36000));
assertThat(instance.getCreateTime()).isEqualTo(Timestamp.ofTimeMicroseconds(46000));
}

@Test
Expand All @@ -89,6 +96,8 @@ public void equality() {
.setState(InstanceInfo.State.READY)
.addLabel("env", "prod")
.addLabel("region", "us")
.setUpdateTime(Timestamp.ofTimeMicroseconds(36000))
.setCreateTime(Timestamp.ofTimeMicroseconds(46000))
.build();
Instance instance2 =
new Instance.Builder(instanceClient, dbClient, id)
Expand All @@ -99,6 +108,8 @@ public void equality() {
.setState(InstanceInfo.State.READY)
.addLabel("region", "us")
.addLabel("env", "prod")
.setUpdateTime(Timestamp.ofTimeMicroseconds(36000))
.setCreateTime(Timestamp.ofTimeMicroseconds(46000))
.build();
Instance instance3 =
new Instance.Builder(instanceClient, dbClient, id)
Expand All @@ -108,6 +119,8 @@ public void equality() {
.setProcessingUnits(2000)
.setState(InstanceInfo.State.READY)
.addLabel("env", "prod")
.setUpdateTime(Timestamp.ofTimeMicroseconds(3000))
.setCreateTime(Timestamp.ofTimeMicroseconds(4000))
.build();
EqualsTester tester = new EqualsTester();
tester.addEqualityGroup(instance, instance2);
Expand Down