Skip to content

Commit 5784da7

Browse files
bulat3103bulat3103
committed
Fixed pr issues
1 parent a99bf3c commit 5784da7

6 files changed

Lines changed: 27 additions & 11 deletions

File tree

‎src/main/java/com/crowdin/client/styleguide/StyleGuidesApi.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ public ResponseObject<StyleGuide> addStyleGuide(AddStyleGuideRequest request) th
8181
* <li><a href="https://developer.crowdin.com/enterprise/api/v2/#operation/api.style-guides.getMany" target="_blank"><b>Enterprise API Documentation</b></a></li>
8282
* </ul>
8383
*/
84-
public ResponseList<StyleGuide> listStyleGuide(Long userId, Integer limit, Integer offset) throws HttpException, HttpBadRequestException {
84+
public ResponseList<StyleGuide> listStyleGuides(Long userId, Integer limit, Integer offset) throws HttpException, HttpBadRequestException {
8585
ListStyleGuidesParams params = new ListStyleGuidesParams();
8686
params.setUserId(userId);
8787
params.setLimit(limit);
8888
params.setOffset(offset);
89-
return listStyleGuide(params);
89+
return listStyleGuides(params);
9090
}
9191

9292
/**
@@ -100,16 +100,16 @@ public ResponseList<StyleGuide> listStyleGuide(Long userId, Integer limit, Integ
100100
* <li><a href="https://developer.crowdin.com/enterprise/api/v2/#operation/api.style-guides.getMany" target="_blank"><b>Enterprise API Documentation</b></a></li>
101101
* </ul>
102102
*/
103-
public ResponseList<StyleGuide> listStyleGuide(Long userId, Integer limit, Integer offset, List<OrderByField> orderBy) throws HttpException, HttpBadRequestException {
103+
public ResponseList<StyleGuide> listStyleGuides(Long userId, Integer limit, Integer offset, List<OrderByField> orderBy) throws HttpException, HttpBadRequestException {
104104
ListStyleGuidesParams params = new ListStyleGuidesParams();
105105
params.setUserId(userId);
106106
params.setLimit(limit);
107107
params.setOffset(offset);
108108
params.setOrderByList(orderBy);
109-
return listStyleGuide(params);
109+
return listStyleGuides(params);
110110
}
111111

112-
public ResponseList<StyleGuide> listStyleGuide(ListStyleGuidesParams params) {
112+
public ResponseList<StyleGuide> listStyleGuides(ListStyleGuidesParams params) throws HttpException, HttpBadRequestException {
113113
ListStyleGuidesParams query = Optional.ofNullable(params).orElse(new ListStyleGuidesParams());
114114

115115
String orderBy = query.getOrderByList() != null

‎src/test/java/com/crowdin/client/styleguide/StyleGuidesApiStyleGuidesOrderByIdAscTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void listStyleGuidesTest_orderByIdNull() {
3535
OrderByField orderById = new OrderByField();
3636
orderById.setFieldName("id");
3737

38-
ResponseList<StyleGuide> styleGuideResponseList = this.getStyleGuidesApi().listStyleGuide(null, null, null, singletonList(orderById));
38+
ResponseList<StyleGuide> styleGuideResponseList = this.getStyleGuidesApi().listStyleGuides(null, null, null, singletonList(orderById));
3939
assertEquals(2, styleGuideResponseList.getData().size());
4040
assertEquals(styleGuideId, styleGuideResponseList.getData().get(0).getData().getId());
4141
assertEquals(styleGuide2Id, styleGuideResponseList.getData().get(1).getData().getId());
@@ -47,7 +47,7 @@ public void listStyleGuidesTest_orderByIdAsc() {
4747
orderById.setFieldName("id");
4848
orderById.setOrderBy(SortOrder.ASC);
4949

50-
ResponseList<StyleGuide> styleGuideResponseList = this.getStyleGuidesApi().listStyleGuide(null, null, null, singletonList(orderById));
50+
ResponseList<StyleGuide> styleGuideResponseList = this.getStyleGuidesApi().listStyleGuides(null, null, null, singletonList(orderById));
5151
assertEquals(2, styleGuideResponseList.getData().size());
5252
assertEquals(styleGuideId, styleGuideResponseList.getData().get(0).getData().getId());
5353
assertEquals(styleGuide2Id, styleGuideResponseList.getData().get(1).getData().getId());

‎src/test/java/com/crowdin/client/styleguide/StyleGuidesApiStyleGuidesOrderByIdDescTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void listStyleGuidesTest_orderByIdDesc() {
3636
orderById.setFieldName("id");
3737
orderById.setOrderBy(SortOrder.DESC);
3838

39-
ResponseList<StyleGuide> styleGuideResponseList = this.getStyleGuidesApi().listStyleGuide(null, null, null, singletonList(orderById));
39+
ResponseList<StyleGuide> styleGuideResponseList = this.getStyleGuidesApi().listStyleGuides(null, null, null, singletonList(orderById));
4040
assertEquals(2, styleGuideResponseList.getData().size());
4141
assertEquals(styleGuide2Id, styleGuideResponseList.getData().get(0).getData().getId());
4242
assertEquals(styleGuideId, styleGuideResponseList.getData().get(1).getData().getId());

‎src/test/java/com/crowdin/client/styleguide/StyleGuidesApiTest.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,14 @@ public List<RequestMock> getMocks() {
4343

4444
@Test
4545
public void listStyleGuidesTest() {
46-
ResponseList<StyleGuide> styleGuideResponseList = this.getStyleGuidesApi().listStyleGuide(null, null, null);
46+
ResponseList<StyleGuide> styleGuideResponseList = this.getStyleGuidesApi().listStyleGuides(null, null, null);
4747
assertEquals(styleGuideResponseList.getData().size(), 1);
4848
assertEquals(styleGuideResponseList.getData().get(0).getData().getId(), styleGuideId);
4949
assertEquals(styleGuideResponseList.getData().get(0).getData().getName(), name);
50+
assertEquals(styleGuideResponseList.getData().get(0).getData().getAiInstructions(), aiInstructions);
51+
assertEquals(styleGuideResponseList.getData().get(0).getData().getIsShared(), isShared);
52+
assertEquals(styleGuideResponseList.getData().get(0).getData().getLanguageIds(), languageIds);
53+
assertEquals(styleGuideResponseList.getData().get(0).getData().getProjectIds(), projectIds);
5054
}
5155

5256
@Test
@@ -61,13 +65,21 @@ public void addStyleGuideTest() {
6165
ResponseObject<StyleGuide> styleGuideResponseObject = this.getStyleGuidesApi().addStyleGuide(request);
6266
assertEquals(styleGuideResponseObject.getData().getId(), styleGuideId);
6367
assertEquals(styleGuideResponseObject.getData().getName(), name);
68+
assertEquals(styleGuideResponseObject.getData().getAiInstructions(), aiInstructions);
69+
assertEquals(styleGuideResponseObject.getData().getIsShared(), isShared);
70+
assertEquals(styleGuideResponseObject.getData().getLanguageIds(), languageIds);
71+
assertEquals(styleGuideResponseObject.getData().getProjectIds(), projectIds);
6472
}
6573

6674
@Test
6775
public void getStyleGuideTest() {
6876
ResponseObject<StyleGuide> styleGuideResponseObject = this.getStyleGuidesApi().getStyleGuide(styleGuideId);
6977
assertEquals(styleGuideResponseObject.getData().getId(), styleGuideId);
7078
assertEquals(styleGuideResponseObject.getData().getName(), name);
79+
assertEquals(styleGuideResponseObject.getData().getAiInstructions(), aiInstructions);
80+
assertEquals(styleGuideResponseObject.getData().getIsShared(), isShared);
81+
assertEquals(styleGuideResponseObject.getData().getLanguageIds(), languageIds);
82+
assertEquals(styleGuideResponseObject.getData().getProjectIds(), projectIds);
7183
}
7284

7385
@Test
@@ -84,5 +96,9 @@ public void editStyleGuideTest() {
8496
ResponseObject<StyleGuide> styleGuideResponseObject = this.getStyleGuidesApi().editStyleGuide(styleGuideId, singletonList(request));
8597
assertEquals(styleGuideResponseObject.getData().getId(), styleGuideId);
8698
assertEquals(styleGuideResponseObject.getData().getName(), name);
99+
assertEquals(styleGuideResponseObject.getData().getAiInstructions(), aiInstructions);
100+
assertEquals(styleGuideResponseObject.getData().getIsShared(), isShared);
101+
assertEquals(styleGuideResponseObject.getData().getLanguageIds(), languageIds);
102+
assertEquals(styleGuideResponseObject.getData().getProjectIds(), projectIds);
87103
}
88104
}

‎src/test/resources/api/styleguide/listStyleGuides.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"name": "Be My Eyes iOS's Style Guide",
77
"aiInstructions": "string",
88
"userId": 2,
9-
"languageId": ["uk", "fr", "de"],
9+
"languageIds": ["uk", "fr", "de"],
1010
"projectIds": [1, 2, 3],
1111
"isShared": false,
1212
"createdAt": "2019-09-16T13:42:04+00:00"

‎src/test/resources/api/styleguide/styleGuide.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"name": "Be My Eyes iOS's Style Guide",
55
"aiInstructions": "string",
66
"userId": 2,
7-
"languageId": ["uk", "fr", "de"],
7+
"languageIds": ["uk", "fr", "de"],
88
"projectIds": [1, 2, 3],
99
"isShared": false,
1010
"createdAt": "2019-09-16T13:42:04+00:00"

0 commit comments

Comments
 (0)