import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
-import java.util.Vector;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.jupiter.api.AfterEach;
Services services;
private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
- .create(); //
+ .serializeNulls() //
+ .create(); //
public static class MockApplicationConfig extends ApplicationConfig {
@Override
@Override
public boolean hasError(ClientHttpResponse httpResponse) throws IOException {
return (httpResponse.getStatusCode().series() == Series.CLIENT_ERROR
- || httpResponse.getStatusCode().series() == Series.SERVER_ERROR);
+ || httpResponse.getStatusCode().series() == Series.SERVER_ERROR);
}
@Override
public void verifyNoRicLocks() {
for (Ric ric : this.rics.getRics()) {
ric.getLock().lockBlocking(LockType.EXCLUSIVE);
- ric.getLock().unlock();
+ ric.getLock().unlockBlocking();
assertThat(ric.getLock().getLockCounter()).isEqualTo(0);
assertThat(ric.getState()).isEqualTo(Ric.RicState.IDLE);
}
@Test
public void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception {
- addRic("notCorrectRic1");
- addRic("notCorrectRic2");
- addRic("notCorrectRic3");
- addRic("notCorrectRic4");
- addRic("notCorrectRic5");
- addRic("notCorrectRic6");
-
String ricName = "ric1";
- Ric ric = addRic(ricName);
String managedElementId = "kista_1";
- ric.addManagedElement(managedElementId);
+ addRic(ricName, managedElementId);
String url = baseUrl() + "/ric?managedElementId=" + managedElementId;
String rsp = this.restTemplate.getForObject(url, String.class);
this.setRestErrorhandler();
String url = baseUrl() + "/ric?managedElementId=kista_1";
ResponseEntity<String> entity = this.restTemplate.getForEntity(url, String.class);
- assertThat(entity.getStatusCode().equals(HttpStatus.NOT_FOUND));
+ assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
}
@Test
addPolicyType(policyTypeName, ricName);
String url = baseUrl() + "/policy?type=" + policyTypeName + "&instance=" + policyInstanceId + "&ric=" + ricName
- + "&service=" + serviceName;
+ + "&service=" + serviceName;
final String json = jsonString();
this.rics.getRic(ricName).setState(Ric.RicState.IDLE);
this.setRestErrorhandler();
String urlWrongRic = baseUrl() + "/policy?type=type1&instance=instance1&ric=ricXXX&service=service1";
ResponseEntity<String> entity = this.putForEntity(urlWrongRic, jsonString());
- assertThat(entity.getStatusCode().equals(HttpStatus.METHOD_NOT_ALLOWED));
+ assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.METHOD_NOT_ALLOWED);
Policy policy = policies.getPolicy("instance1");
assertThat(policy.ric().name()).isEqualTo("ric1"); // Not changed
// Keep alive
url = baseUrl() + "/services/keepalive?name=name";
ResponseEntity<String> entity = this.restTemplate.postForEntity(url, null, String.class);
- assertThat(entity.getStatusCode().equals(HttpStatus.OK));
+ assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
// DELETE
assertThat(services.size()).isEqualTo(1);
private Policy addPolicy(String id, String typeName, String service, String ric) throws ServiceException {
addRic(ric);
Policy p = ImmutablePolicy.builder().id(id) //
- .json(jsonString()) //
- .ownerServiceName(service) //
- .ric(rics.getRic(ric)) //
- .type(addPolicyType(typeName, ric)) //
- .lastModified("lastModified").build();
+ .json(jsonString()) //
+ .ownerServiceName(service) //
+ .ric(rics.getRic(ric)) //
+ .type(addPolicyType(typeName, ric)) //
+ .lastModified("lastModified").build();
policies.put(p);
return p;
}
this.supervision = supervision;
}
+ @Override
public void run() {
for (int i = 0; i < 100; ++i) {
if (i % 10 == 0) {
private PolicyType addPolicyType(String policyTypeName, String ricName) {
PolicyType type = ImmutablePolicyType.builder() //
- .name(policyTypeName) //
- .schema("{\"title\":\"" + policyTypeName + "\"}") //
- .build();
+ .name(policyTypeName) //
+ .schema("{\"title\":\"" + policyTypeName + "\"}") //
+ .build();
policyTypes.put(type);
addRic(ricName).addSupportedPolicyType(type);
}
private Ric addRic(String ricName) {
+ return addRic(ricName, null);
+ }
+
+ private Ric addRic(String ricName, String managedElement) {
if (rics.get(ricName) != null) {
return rics.get(ricName);
}
- Vector<String> mes = new Vector<>();
+ List<String> mes = new ArrayList<>();
+ if (managedElement != null) {
+ mes.add(managedElement);
+ }
RicConfig conf = ImmutableRicConfig.builder() //
- .name(ricName) //
- .baseUrl(ricName) //
- .managedElementIds(mes) //
- .build();
+ .name(ricName) //
+ .baseUrl(ricName) //
+ .managedElementIds(mes) //
+ .build();
Ric ric = new Ric(conf);
ric.setState(Ric.RicState.IDLE);
this.rics.put(ric);