Skip to content

Commit 3724b53

Browse files
jmdobryjmdobry
committed
---
yaml --- r: 9135 b: refs/heads/master c: d4a179e h: refs/heads/master i: 9133: dfb5c7c 9131: b223604 9127: e596634 9119: d8f3d00
1 parent ed6eb3e commit 3724b53

19 files changed

Lines changed: 22 additions & 1114 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b7102bb119cdf6b0e811101bf193402b32aab22c
2+
refs/heads/master: d4a179ed3bb153436185cf81469fb40d3436f210
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: 8e9b065ba06cd7a4af306aaea1010aade81670e0
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

‎trunk/.circleci/config.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,6 @@ jobs:
7979
- run:
8080
name: Run integration tests for google-cloud-bigquery
8181
command: ./utilities/verify_single_it.sh google-cloud-bigquery
82-
83-
bigtable_it:
84-
working_directory: ~/googleapis
85-
<<: *anchor_docker
86-
<<: *anchor_auth_vars
87-
steps:
88-
- checkout
89-
- run:
90-
<<: *anchor_run_decrypt
91-
- run:
92-
name: Run integration tests for google-cloud-bigtable
93-
command: ./utilities/verify_single_it.sh google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.table=projects/gcloud-devel/instances/google-cloud-bigtable/tables/integration-tests
94-
9582
compute_it:
9683
working_directory: ~/googleapis
9784
<<: *anchor_docker
@@ -233,10 +220,6 @@ workflows:
233220
filters:
234221
branches:
235222
only: master
236-
- bigtable_it:
237-
filters:
238-
branches:
239-
only: master
240223
- compute_it:
241224
filters:
242225
branches:

‎trunk/TESTING.md‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
This library provides tools to help write tests for code that uses the following google-cloud services:
44

55
- [BigQuery](#testing-code-that-uses-bigquery)
6-
- [Bigtable](#testing-code-that-uses-bigtable)
76
- [Compute](#testing-code-that-uses-compute)
87
- [Datastore](#testing-code-that-uses-datastore)
98
- [DNS](#testing-code-that-uses-dns)
@@ -42,29 +41,6 @@ Here is an example that clears the dataset created in Step 3.
4241
RemoteBigQueryHelper.forceDelete(bigquery, dataset);
4342
```
4443

45-
### Testing code that uses Bigtable
46-
47-
Bigtable integration tests can either be run against an emulator or a real Bigtable table. The
48-
target environment can be selected via the `bigtable.env` system property. By default it is set to
49-
`emulator` and the other option is `prod`.
50-
51-
To use the `emulator` environment, please install the gcloud sdk and use it to install the
52-
`cbtemulator` via `gcloud components install bigtable`.
53-
54-
To use the `prod` environment:
55-
1. Set up the target table using `google-cloud-bigtable/scripts/setup-test-table.sh`
56-
2. Download the [JSON service account credentials file][create-service-account] from the Google
57-
Developer's Console.
58-
3. Set the environment variable `GOOGLE_APPLICATION_CREDENTIALS` to the path of the credentials file
59-
4. Set the system property `bigtable.env=prod` and `bigtable.table` to the full table name you
60-
created earlier. Example:
61-
```shell
62-
mvn verify -am -pl google-cloud-bigtable \
63-
-Dbigtable.env=prod \
64-
-Dbigtable.table=projects/my-project/instances/my-instance/tables/my-table
65-
```
66-
67-
6844
### Testing code that uses Compute
6945

7046
Currently, there isn't an emulator for Google Compute, so an alternative is to create a test

‎trunk/google-cloud-bigtable/pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,24 +127,6 @@
127127
</execution>
128128
</executions>
129129
</plugin>
130-
<plugin>
131-
<groupId>org.apache.maven.plugins</groupId>
132-
<artifactId>maven-failsafe-plugin</artifactId>
133-
<version>2.19.1</version>
134-
<executions>
135-
<execution>
136-
<goals>
137-
<goal>integration-test</goal>
138-
<goal>verify</goal>
139-
</goals>
140-
</execution>
141-
</executions>
142-
<configuration>
143-
<parallel>classes</parallel>
144-
<perCoreThreadCount>true</perCoreThreadCount>
145-
<threadCount>2</threadCount>
146-
</configuration>
147-
</plugin>
148130
<plugin>
149131
<groupId>org.apache.maven.plugins</groupId>
150132
<artifactId>maven-javadoc-plugin</artifactId>

‎trunk/google-cloud-bigtable/scripts/setup-test-table.sh‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎trunk/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/InstanceName.java‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,26 @@ private InstanceName(Builder builder) {
5858
}
5959

6060
public static InstanceName of(String project, String instance) {
61-
return newBuilder().setProject(project).setInstance(instance).build();
61+
return newBuilder()
62+
.setProject(project)
63+
.setInstance(instance)
64+
.build();
6265
}
6366

6467
public static String format(String project, String instance) {
65-
return newBuilder().setProject(project).setInstance(instance).build().toString();
68+
return newBuilder()
69+
.setProject(project)
70+
.setInstance(instance)
71+
.build()
72+
.toString();
6673
}
6774

6875
public static InstanceName parse(String formattedString) {
6976
if (formattedString.isEmpty()) {
7077
return null;
7178
}
7279
Map<String, String> matchMap =
73-
PATH_TEMPLATE.validatedMatch(
74-
formattedString, "InstanceName.parse: formattedString not in valid format");
80+
PATH_TEMPLATE.validatedMatch(formattedString, "InstanceName.parse: formattedString not in valid format");
7581
return of(matchMap.get("project"), matchMap.get("instance"));
7682
}
7783

@@ -117,7 +123,9 @@ public String getFieldValue(String fieldName) {
117123
return getFieldValuesMap().get(fieldName);
118124
}
119125

120-
/** @deprecated This method is only present to satisfy the ResourceName interface. */
126+
/**
127+
* @deprecated This method is only present to satisfy the ResourceName interface.
128+
*/
121129
@Deprecated
122130
public ResourceNameType getType() {
123131
throw new UnsupportedOperationException("InstanceName.getType() not supported");
@@ -152,7 +160,8 @@ public Builder setInstance(String instance) {
152160
return this;
153161
}
154162

155-
private Builder() {}
163+
private Builder() {
164+
}
156165

157166
private Builder(InstanceName instanceName) {
158167
project = instanceName.project;
@@ -171,7 +180,8 @@ public boolean equals(Object o) {
171180
}
172181
if (o instanceof InstanceName) {
173182
InstanceName that = (InstanceName) o;
174-
return (this.project.equals(that.project)) && (this.instance.equals(that.instance));
183+
return (this.project.equals(that.project))
184+
&& (this.instance.equals(that.instance));
175185
}
176186
return false;
177187
}
@@ -186,3 +196,4 @@ public int hashCode() {
186196
return h;
187197
}
188198
}
199+

‎trunk/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/BulkMutationBatcherIT.java‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎trunk/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/CheckAndMutateIT.java‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)