Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

Commit

Permalink
chore: add tests for complex resource IDs (#3190)
Browse files Browse the repository at this point in the history 
* chore: add support for complex resource IDs

* fix: revert proto formatting changes
  • Loading branch information
@miraleung
miraleung committed Jun 12, 2020
1 parent 61532e5 commit 30c0b3b
Show file tree
Hide file tree
Showing 13 changed files with 1,210 additions and 1,264 deletions.
29 changes: 29 additions & 0 deletions src/test/java/com/google/api/codegen/config/ResourceNamePatternConfigTest.java
View file
Expand Up @@ -42,6 +42,22 @@ public void testGetBindingVariables() {
.containsExactly("state", "city");
}

@Test
public void testGetBindingVariablesWithComplexResourceIds() {
assertThat(
new ResourceNamePatternConfig("states/{state}/animals/{animal_1}~{animal_2}")
.getBindingVariables())
.containsExactly("state", "animal_1", "animal_2");
assertThat(
new ResourceNamePatternConfig("states/{state}/animals/{foo}.{bar}~{car}-{cdr}_{cadr}")
.getBindingVariables())
.containsExactly("state", "foo", "bar", "car", "cdr", "cadr");
assertThat(
new ResourceNamePatternConfig("states/{state}/animals/{foo}.{bar}/prizes/{prize}")
.getBindingVariables())
.containsExactly("state", "foo", "bar", "prize");
}

@Test
public void testGetPatternId() {
ResourceNamePatternConfig pattern;
Expand All @@ -55,5 +71,18 @@ public void testGetPatternId() {
assertThat(pattern.getPatternId()).isEqualTo("state_city_mascot_animal");
pattern = new ResourceNamePatternConfig("states/{state}/mascotAnimals/{mascot_animal}");
assertThat(pattern.getPatternId()).isEqualTo("state_mascot_animal");

pattern = new ResourceNamePatternConfig("states/{state}/animals/{animal_id=**}");
assertThat(pattern.getPatternId()).isEqualTo("state_animal_id");
}

@Test
public void testGetPatternIdWithComplexResourceIds() {
ResourceNamePatternConfig pattern =
new ResourceNamePatternConfig("states/{state}/animals/{animal_1}~{animal_2}");
assertThat(pattern.getPatternId()).isEqualTo("state_animal_1_animal_2");
pattern =
new ResourceNamePatternConfig("states/{state}/animals/{foo}.{bar}~{car}-{cdr}_{cadr}");
assertThat(pattern.getPatternId()).isEqualTo("state_foo_bar_car_cdr_cadr");
}
}
581 changes: 225 additions & 356 deletions src/test/java/com/google/api/codegen/protoannotations/testdata/csharp_library.baseline
View file

Large diffs are not rendered by default.

70 changes: 35 additions & 35 deletions src/test/java/com/google/api/codegen/protoannotations/testdata/go_library.baseline
View file
Expand Up @@ -56,7 +56,7 @@ func TestLibClientSmoke(t *testing.T) {
t.Fatal(err)
}

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "testShelf-" + strconv.FormatInt(time.Now().UnixNano(), 10) + "", projectId)
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", projectId)
var rating librarypb.Book_Rating = librarypb.Book_GOOD
var book = &librarypb.Book{
Rating: rating,
Expand Down Expand Up @@ -3200,7 +3200,7 @@ func TestLibraryServiceGetBook(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.GetBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -3229,7 +3229,7 @@ func TestLibraryServiceGetBookError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.GetBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -3332,7 +3332,7 @@ func TestLibraryServiceDeleteBook(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.DeleteBookRequest{
Name: formattedName,
}
Expand All @@ -3358,7 +3358,7 @@ func TestLibraryServiceDeleteBookError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.DeleteBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -3395,7 +3395,7 @@ func TestLibraryServiceUpdateBook(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var book *librarypb.Book = &librarypb.Book{}
var request = &librarypb.UpdateBookRequest{
Name: formattedName,
Expand Down Expand Up @@ -3426,7 +3426,7 @@ func TestLibraryServiceUpdateBookError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var book *librarypb.Book = &librarypb.Book{}
var request = &librarypb.UpdateBookRequest{
Name: formattedName,
Expand Down Expand Up @@ -3466,7 +3466,7 @@ func TestLibraryServiceMoveBook(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var formattedOtherShelfName string = fmt.Sprintf("shelves/%s", "[SHELF]")
var request = &librarypb.MoveBookRequest{
Name: formattedName,
Expand Down Expand Up @@ -3497,7 +3497,7 @@ func TestLibraryServiceMoveBookError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var formattedOtherShelfName string = fmt.Sprintf("shelves/%s", "[SHELF]")
var request = &librarypb.MoveBookRequest{
Name: formattedName,
Expand Down Expand Up @@ -3592,7 +3592,7 @@ func TestLibraryServiceAddComments(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var comment []byte = []byte("95")
var stage librarypb.Comment_Stage = librarypb.Comment_UNSET
var alignment librarypb.SomeMessage2_SomeMessage3_Alignment = librarypb.SomeMessage2_SomeMessage3_CHAR
Expand Down Expand Up @@ -3628,7 +3628,7 @@ func TestLibraryServiceAddCommentsError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var comment []byte = []byte("95")
var stage librarypb.Comment_Stage = librarypb.Comment_UNSET
var alignment librarypb.SomeMessage2_SomeMessage3_Alignment = librarypb.SomeMessage2_SomeMessage3_CHAR
Expand Down Expand Up @@ -3673,8 +3673,8 @@ func TestLibraryServiceGetBookFromAnywhere(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedAltBookName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var formattedAltBookName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var formattedPlace string = fmt.Sprintf("projects/%s/locations/%s", "[PROJECT]", "[LOCATION]")
var formattedFolder string = fmt.Sprintf("folders/%s", "[FOLDER]")
var request = &librarypb.GetBookFromAnywhereRequest{
Expand Down Expand Up @@ -3708,8 +3708,8 @@ func TestLibraryServiceGetBookFromAnywhereError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedAltBookName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var formattedAltBookName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var formattedPlace string = fmt.Sprintf("projects/%s/locations/%s", "[PROJECT]", "[LOCATION]")
var formattedFolder string = fmt.Sprintf("folders/%s", "[FOLDER]")
var request = &librarypb.GetBookFromAnywhereRequest{
Expand Down Expand Up @@ -3750,7 +3750,7 @@ func TestLibraryServiceGetBookFromAbsolutelyAnywhere(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.GetBookFromAbsolutelyAnywhereRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -3779,7 +3779,7 @@ func TestLibraryServiceGetBookFromAbsolutelyAnywhereError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.GetBookFromAbsolutelyAnywhereRequest{
Name: formattedName,
}
Expand All @@ -3806,7 +3806,7 @@ func TestLibraryServiceUpdateBookIndex(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var indexName string = "default index"
var indexMapItem string = "indexMapItem1918721251"
var indexMap = map[string]string{
Expand Down Expand Up @@ -3839,7 +3839,7 @@ func TestLibraryServiceUpdateBookIndexError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var indexName string = "default index"
var indexMapItem string = "indexMapItem1918721251"
var indexMap = map[string]string{
Expand Down Expand Up @@ -4020,7 +4020,7 @@ func TestLibraryServiceDiscussBook(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.DiscussBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4059,7 +4059,7 @@ func TestLibraryServiceDiscussBookError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.DiscussBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4101,7 +4101,7 @@ func TestLibraryServiceMonologAboutBook(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.DiscussBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4137,7 +4137,7 @@ func TestLibraryServiceMonologAboutBookError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.DiscussBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4171,7 +4171,7 @@ func TestLibraryServiceBabbleAboutBook(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.DiscussBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4204,7 +4204,7 @@ func TestLibraryServiceBabbleAboutBookError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.DiscussBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4394,7 +4394,7 @@ func TestLibraryServiceGetBigBook(t *testing.T) {
Result: &longrunningpb.Operation_Response{ Response: any },
})

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.GetBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4437,7 +4437,7 @@ func TestLibraryServiceGetBigBookError(t *testing.T) {
},
})

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.GetBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4476,7 +4476,7 @@ func TestLibraryServiceGetBigNothing(t *testing.T) {
Result: &longrunningpb.Operation_Response{ Response: any },
})

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.GetBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4516,7 +4516,7 @@ func TestLibraryServiceGetBigNothingError(t *testing.T) {
},
})

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.GetBookRequest{
Name: formattedName,
}
Expand Down Expand Up @@ -4555,8 +4555,8 @@ func TestLibraryServiceTestOptionalRequiredFlatteningParams(t *testing.T) {
var requiredSingularString string = "requiredSingularString-1949894503"
var requiredSingularBytes []byte = []byte("-29")
var requiredSingularMessage *librarypb.TestOptionalRequiredFlatteningParamsRequest_InnerMessage = &librarypb.TestOptionalRequiredFlatteningParamsRequest_InnerMessage{}
var formattedRequiredSingularResourceName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedRequiredSingularResourceNameOneof string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedRequiredSingularResourceName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var formattedRequiredSingularResourceNameOneof string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var requiredSingularResourceNameCommon string = "requiredSingularResourceNameCommon-1126805002"
var requiredSingularFixed32 int32 = 720656715
var requiredSingularFixed64 int64 = 720656810
Expand Down Expand Up @@ -4704,8 +4704,8 @@ func TestLibraryServiceTestOptionalRequiredFlatteningParamsError(t *testing.T) {
var requiredSingularString string = "requiredSingularString-1949894503"
var requiredSingularBytes []byte = []byte("-29")
var requiredSingularMessage *librarypb.TestOptionalRequiredFlatteningParamsRequest_InnerMessage = &librarypb.TestOptionalRequiredFlatteningParamsRequest_InnerMessage{}
var formattedRequiredSingularResourceName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedRequiredSingularResourceNameOneof string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedRequiredSingularResourceName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var formattedRequiredSingularResourceNameOneof string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var requiredSingularResourceNameCommon string = "requiredSingularResourceNameCommon-1126805002"
var requiredSingularFixed32 int32 = 720656715
var requiredSingularFixed64 int64 = 720656810
Expand Down Expand Up @@ -5171,7 +5171,7 @@ func TestLibraryServiceSaveBook(t *testing.T) {

mockLibrary.resps = append(mockLibrary.resps[:0], expectedResponse)

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.Book{
Name: formattedName,
}
Expand All @@ -5197,7 +5197,7 @@ func TestLibraryServiceSaveBookError(t *testing.T) {
errCode := codes.PermissionDenied
mockLibrary.err = gstatus.Error(errCode, "test error")

var formattedName string = fmt.Sprintf("shelves/%s/books/%s", "[SHELF]", "[BOOK]")
var formattedName string = fmt.Sprintf("archives/%s/books/%s", "[ARCHIVE]", "[BOOK]")
var request = &librarypb.Book{
Name: formattedName,
}
Expand Down

0 comments on commit 30c0b3b

Please sign in to comment.