@@ -95,7 +95,7 @@ public InstrumentControllerTest(MockMvc mvc) {
95
95
}
96
96
97
97
@ Test
98
- void 전체_악기_매물_목록을_조회한다 () throws Exception {
98
+ void 종류_상관_없이_전체_악기_매물_목록을_조회한다 () throws Exception {
99
99
// given
100
100
long userId = 1L ;
101
101
int page = 0 ;
@@ -116,7 +116,9 @@ public InstrumentControllerTest(MockMvc mvc) {
116
116
.param ("page" , String .valueOf (page ))
117
117
.param ("size" , String .valueOf (pageSize ))
118
118
.param ("sort" , sortOption .name ())
119
- .param ("progress" , filterConditions .getProgress ().name ())
119
+ .param ("progress" , InstrumentProgressStatus .SELLING .name ())
120
+ .param ("sido" , "서울특별시" )
121
+ .param ("sgg" , "종로구" )
120
122
)
121
123
.andExpect (status ().isOk ())
122
124
.andExpect (jsonPath ("$.numberOfElements" ).value (expectedResult .getNumberOfElements ()))
@@ -127,12 +129,11 @@ public InstrumentControllerTest(MockMvc mvc) {
127
129
}
128
130
129
131
@ Test
130
- void 일렉_기타_매물_목록을_조회한다 () throws Exception {
132
+ void 필터링_조건이_주어지고_주어진_조건에_해당하는_일렉_기타_매물_목록을_조회한다 () throws Exception {
131
133
// given
132
134
long userId = 1L ;
133
135
int page = 0 ;
134
136
int pageSize = 10 ;
135
- InstrumentFilterConditions filterConditions = createInstrumentFilterConditions ();
136
137
InstrumentSortOption sortOption = InstrumentSortOption .CREATED_BY_DESC ;
137
138
Page <ElectricGuitarDto > expectedResult = new PageImpl <>(List .of (
138
139
createElectricGuitarDto (2L , userId ),
@@ -150,7 +151,12 @@ public InstrumentControllerTest(MockMvc mvc) {
150
151
.param ("page" , String .valueOf (page ))
151
152
.param ("size" , String .valueOf (pageSize ))
152
153
.param ("sort" , sortOption .name ())
153
- .param ("progress" , filterConditions .getProgress ().name ())
154
+ .param ("progress" , InstrumentProgressStatus .SELLING .name ())
155
+ .param ("sido" , "서울특별시" )
156
+ .param ("sgg" , "종로구" )
157
+ .param ("brand" , ElectricGuitarBrand .FENDER_USA .name ())
158
+ .param ("model" , ElectricGuitarModel .TELECASTER .name ())
159
+ .param ("color" , GuitarColor .RED .name ())
154
160
)
155
161
.andExpect (status ().isOk ())
156
162
.andExpect (jsonPath ("$.numberOfElements" ).value (expectedResult .getNumberOfElements ()))
@@ -163,7 +169,7 @@ public InstrumentControllerTest(MockMvc mvc) {
163
169
}
164
170
165
171
@ Test
166
- void 베이스_기타_매물_목록을_조회한다 () throws Exception {
172
+ void 필터링_조건이_주어지고_주어진_조건에_해당하는_베이스_기타_매물_목록을_조회한다 () throws Exception {
167
173
// given
168
174
long userId = 1L ;
169
175
int page = 0 ;
@@ -186,7 +192,13 @@ public InstrumentControllerTest(MockMvc mvc) {
186
192
.param ("page" , String .valueOf (page ))
187
193
.param ("size" , String .valueOf (pageSize ))
188
194
.param ("sort" , sortOption .name ())
189
- .param ("progress" , filterConditions .getProgress ().name ())
195
+ .param ("progress" , InstrumentProgressStatus .SELLING .name ())
196
+ .param ("sido" , "서울특별시" )
197
+ .param ("sgg" , "종로구" )
198
+ .param ("brand" , BassGuitarBrand .FENDER .name ())
199
+ .param ("pickUp" , BassGuitarPickUp .ETC .name ())
200
+ .param ("preAmplifier" , BassGuitarPreAmplifier .ACTIVE .name ())
201
+ .param ("color" , GuitarColor .BLUE .name ())
190
202
)
191
203
.andExpect (status ().isOk ())
192
204
.andExpect (jsonPath ("$.numberOfElements" ).value (expectedResult .getNumberOfElements ()))
@@ -199,7 +211,7 @@ public InstrumentControllerTest(MockMvc mvc) {
199
211
}
200
212
201
213
@ Test
202
- void 어쿠스틱_클래식_기타_매물_목록을_조회한다 () throws Exception {
214
+ void 필터링_조건이_주어지고_주어진_조건에_해당하는_어쿠스틱_클래식_기타_매물_목록을_조회한다 () throws Exception {
203
215
// given
204
216
long userId = 1L ;
205
217
int page = 0 ;
@@ -222,7 +234,13 @@ public InstrumentControllerTest(MockMvc mvc) {
222
234
.param ("page" , String .valueOf (page ))
223
235
.param ("size" , String .valueOf (pageSize ))
224
236
.param ("sort" , sortOption .name ())
225
- .param ("progress" , filterConditions .getProgress ().name ())
237
+ .param ("progress" , InstrumentProgressStatus .SELLING .name ())
238
+ .param ("sido" , "서울특별시" )
239
+ .param ("sgg" , "종로구" )
240
+ .param ("brand" , AcousticAndClassicGuitarBrand .CORT .name ())
241
+ .param ("model" , AcousticAndClassicGuitarModel .JUMBO_BODY .name ())
242
+ .param ("wood" , AcousticAndClassicGuitarWood .SOLID_WOOD .name ())
243
+ .param ("pickUp" , AcousticAndClassicGuitarPickUp .MICROPHONE .name ())
226
244
)
227
245
.andExpect (status ().isOk ())
228
246
.andExpect (jsonPath ("$.numberOfElements" ).value (expectedResult .getNumberOfElements ()))
@@ -237,7 +255,7 @@ public InstrumentControllerTest(MockMvc mvc) {
237
255
}
238
256
239
257
@ Test
240
- void 이펙터_매물_목록을_조회한다 () throws Exception {
258
+ void 필터링_조건이_주어지고_주어진_조건에_해당하는_이펙터_매물_목록을_조회한다 () throws Exception {
241
259
// given
242
260
long userId = 1L ;
243
261
int page = 0 ;
@@ -260,7 +278,11 @@ public InstrumentControllerTest(MockMvc mvc) {
260
278
.param ("page" , String .valueOf (page ))
261
279
.param ("size" , String .valueOf (pageSize ))
262
280
.param ("sort" , sortOption .name ())
263
- .param ("progress" , filterConditions .getProgress ().name ())
281
+ .param ("progress" , InstrumentProgressStatus .SELLING .name ())
282
+ .param ("sido" , "서울특별시" )
283
+ .param ("sgg" , "종로구" )
284
+ .param ("type" , EffectorType .GUITAR .name ())
285
+ .param ("feature" , EffectorFeature .BASS_COMPRESSOR .name ())
264
286
)
265
287
.andExpect (status ().isOk ())
266
288
.andExpect (jsonPath ("$.numberOfElements" ).value (expectedResult .getNumberOfElements ()))
@@ -273,7 +295,7 @@ public InstrumentControllerTest(MockMvc mvc) {
273
295
}
274
296
275
297
@ Test
276
- void 앰프_매물_목록을_조회한다 () throws Exception {
298
+ void 필터링_조건이_주어지고_주어진_조건에_해당하는_앰프_매물_목록을_조회한다 () throws Exception {
277
299
// given
278
300
long userId = 1L ;
279
301
int page = 0 ;
@@ -296,7 +318,12 @@ public InstrumentControllerTest(MockMvc mvc) {
296
318
.param ("page" , String .valueOf (page ))
297
319
.param ("size" , String .valueOf (pageSize ))
298
320
.param ("sort" , sortOption .name ())
299
- .param ("progress" , filterConditions .getProgress ().name ())
321
+ .param ("progress" , InstrumentProgressStatus .SELLING .name ())
322
+ .param ("sido" , "서울특별시" )
323
+ .param ("sgg" , "종로구" )
324
+ .param ("type" , AmplifierType .GUITAR .name ())
325
+ .param ("brand" , AmplifierBrand .FENDER .name ())
326
+ .param ("usage" , AmplifierUsage .HOME .name ())
300
327
)
301
328
.andExpect (status ().isOk ())
302
329
.andExpect (jsonPath ("$.numberOfElements" ).value (expectedResult .getNumberOfElements ()))
@@ -309,7 +336,7 @@ public InstrumentControllerTest(MockMvc mvc) {
309
336
}
310
337
311
338
@ Test
312
- void 음향_장비_매물_목록을_조회한다 () throws Exception {
339
+ void 필터링_조건이_주어지고_주어진_조건에_해당하는_음향_장비_매물_목록을_조회한다 () throws Exception {
313
340
// given
314
341
long userId = 1L ;
315
342
int page = 0 ;
@@ -332,7 +359,10 @@ public InstrumentControllerTest(MockMvc mvc) {
332
359
.param ("page" , String .valueOf (page ))
333
360
.param ("size" , String .valueOf (pageSize ))
334
361
.param ("sort" , sortOption .name ())
335
- .param ("progress" , filterConditions .getProgress ().name ())
362
+ .param ("progress" , InstrumentProgressStatus .SELLING .name ())
363
+ .param ("sido" , "서울특별시" )
364
+ .param ("sgg" , "종로구" )
365
+ .param ("type" , AudioEquipmentType .AUDIO_EQUIPMENT .name ())
336
366
)
337
367
.andExpect (status ().isOk ())
338
368
.andExpect (jsonPath ("$.numberOfElements" ).value (expectedResult .getNumberOfElements ()))
0 commit comments