Skip to content

Commit b04179f

Browse files
Rename pingEndpointService to cRaterPingService
1 parent b4e623d commit b04179f

3 files changed

Lines changed: 18 additions & 20 deletions

File tree

src/main/java/org/wise/vle/web/CRaterController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public class CRaterController {
4242

4343
@Autowired
4444
private CRaterService cRaterService;
45-
45+
4646
@Autowired
47-
private CRaterPingService pingEndpointService;
47+
private CRaterPingService cRaterPingService;
4848

4949
@GetMapping("/verify")
5050
String verifyItemId(CRaterVerificationRequest request) throws JSONException {
@@ -59,8 +59,8 @@ String scoreItem(@RequestBody CRaterScoringRequest request) throws JSONException
5959
@PostMapping("/ping")
6060
public String pingItem(@RequestBody CRaterPingRequest ping) throws JSONException {
6161
String itemId = ping.getItemId();
62-
if (!this.pingEndpointService.hasPingedItem(itemId)) {
63-
this.pingEndpointService.cachePingedItem(itemId, 280);
62+
if (!this.cRaterPingService.hasPingedItem(itemId)) {
63+
this.cRaterPingService.cachePingedItem(itemId, 280);
6464
return this.cRaterService.getCRaterResponse(ping);
6565
}
6666
return "";

src/test/java/org/wise/portal/service/ping/impl/CRaterPingServiceImplTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@ExtendWith(EasyMockExtension.class)
1919
public class CRaterPingServiceImplTest {
2020
@TestSubject
21-
private CRaterPingServiceImpl pingEndpointServiceImpl = new CRaterPingServiceImpl();
21+
private CRaterPingServiceImpl cRaterPingServiceImpl = new CRaterPingServiceImpl();
2222

2323
@Mock
2424
private StringRedisTemplate stringRedisTemplate;
@@ -33,7 +33,7 @@ public void hasPingedItem_ItemPinged_ShouldReturnTrue() {
3333
expect(stringRedisTemplate.opsForValue()).andReturn(valueOperations);
3434
expect(valueOperations.size(testId)).andReturn(1L);
3535
replay(stringRedisTemplate, valueOperations);
36-
assertTrue(pingEndpointServiceImpl.hasPingedItem(testId));
36+
assertTrue(cRaterPingServiceImpl.hasPingedItem(testId));
3737
verify(stringRedisTemplate);
3838
verify(valueOperations);
3939
}
@@ -43,7 +43,7 @@ public void hasPingedItem_ItemNotPinged_ShouldReturnFalse() {
4343
expect(stringRedisTemplate.opsForValue()).andReturn(valueOperations);
4444
expect(valueOperations.size(testId)).andReturn(0L);
4545
replay(stringRedisTemplate, valueOperations);
46-
assertFalse(pingEndpointServiceImpl.hasPingedItem(testId));
46+
assertFalse(cRaterPingServiceImpl.hasPingedItem(testId));
4747
verify(stringRedisTemplate);
4848
verify(valueOperations);
4949

@@ -55,7 +55,7 @@ public void cachePingedItem_ShouldCacheAndExpireItemId() {
5555
expect(stringRedisTemplate.expire(testId, Duration.ofSeconds(1))).andReturn(null);
5656
expect(valueOperations.setIfAbsent(testId, "pinged")).andReturn(null);
5757
replay(stringRedisTemplate, valueOperations);
58-
pingEndpointServiceImpl.cachePingedItem(testId, 1);
58+
cRaterPingServiceImpl.cachePingedItem(testId, 1);
5959
verify(stringRedisTemplate, valueOperations);
6060
}
6161
}

src/test/java/org/wise/vle/web/CRaterControllerTest.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class CRaterControllerTest {
2727
private CRaterService cRaterService;
2828

2929
@Mock
30-
private CRaterPingService pingEndpointService;
30+
private CRaterPingService cRaterPingService;
3131

3232
private String clientId = "wise-test";
3333
private String itemId = "test-item-id";
@@ -94,12 +94,11 @@ public void pingItem_ItemAlreadyPinged_ShouldReturnEmpty() {
9494
CRaterPingRequest request = new CRaterPingRequest();
9595
request.setItemId(berkeleyItemId);
9696
try {
97-
expect(pingEndpointService.hasPingedItem(berkeleyItemId))
98-
.andReturn(true);
99-
replay(cRaterService, pingEndpointService);
97+
expect(cRaterPingService.hasPingedItem(berkeleyItemId)).andReturn(true);
98+
replay(cRaterService, cRaterPingService);
10099
String response = controller.pingItem(request);
101100
assertEquals(response, "");
102-
verify(cRaterService, pingEndpointService);
101+
verify(cRaterService, cRaterPingService);
103102
} catch (JSONException exception) {
104103

105104
}
@@ -111,20 +110,19 @@ public void pingItem_ItemNotPinged_ShouldReturnString() {
111110
request.setItemId(berkeleyItemId);
112111
try {
113112
expect(cRaterService.getCRaterResponse(request))
114-
.andReturn(createPingResponseString(berkeleyItemId, trackingId, clientId));
115-
expect(pingEndpointService.hasPingedItem(berkeleyItemId))
116-
.andReturn(false);
117-
pingEndpointService.cachePingedItem(berkeleyItemId, 280);
113+
.andReturn(createPingResponseString(berkeleyItemId, trackingId, clientId));
114+
expect(cRaterPingService.hasPingedItem(berkeleyItemId)).andReturn(false);
115+
cRaterPingService.cachePingedItem(berkeleyItemId, 280);
118116
expectLastCall();
119-
replay(cRaterService, pingEndpointService);
117+
replay(cRaterService, cRaterPingService);
120118
String response = controller.pingItem(request);
121119
assertNotNull(response);
122120
assertNotEquals(response, "");
123-
verify(cRaterService, pingEndpointService);
121+
verify(cRaterService, cRaterPingService);
124122
} catch (JSONException exception) {
125123

126124
}
127-
125+
128126
}
129127

130128
private String createPingResponseString(String itemId, Long trackingId, String clientId) {

0 commit comments

Comments
 (0)