Addressed issues reported due to updates to the sonar rules:
- invoke only one method in a junit lambda
- complete the assertion
- use assertThat().exists(), canRead(), etc.
Issue-ID: POLICY-2681
Change-Id: I2935f4d0295244ab3b11a57a3bc401c64b695fd1
Signed-off-by: Jim Hahn <jrh3@att.com>
@Test
public void testUncommonConditions() throws IOException {
@Test
public void testUncommonConditions() throws IOException {
- File fileTemp = policyFolder.newFile();
+ Path fileTemp = policyFolder.newFile().toPath();
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
- XacmlPolicyUtils.writePolicyFile(fileTemp.toPath(), new String("not a policy"))
+ XacmlPolicyUtils.writePolicyFile(fileTemp, "not a policy")
);
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
);
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
- XacmlPolicyUtils.constructUniquePolicyFilename(new String("not a policy"),
+ XacmlPolicyUtils.constructUniquePolicyFilename("not a policy",
policyFolder.getRoot().toPath())
);
}
policyFolder.getRoot().toPath())
);
}
// Copy to this folder
//
File copyFolder = policyFolder.newFolder("copy");
// Copy to this folder
//
File copyFolder = policyFolder.newFolder("copy");
- assertThat(copyFolder.exists()).isTrue();
+ assertThat(copyFolder).exists();
//
// Mock up a properties object
//
//
// Mock up a properties object
//
File propertiesFile = XacmlPolicyUtils.copyXacmlPropertiesContents(
fileProperties.toAbsolutePath().toString(), mockProperties, myCreator);
File propertiesFile = XacmlPolicyUtils.copyXacmlPropertiesContents(
fileProperties.toAbsolutePath().toString(), mockProperties, myCreator);
- assertThat(propertiesFile.canRead()).isTrue();
+ assertThat(propertiesFile).canRead();
assertThat(Path.of(copyFolder.getAbsolutePath(),
assertThat(Path.of(copyFolder.getAbsolutePath(),
- rootPath.getFileName().toString()).toFile().canRead()).isTrue();
+ rootPath.getFileName().toString()).toFile()).canRead();
assertThat(Path.of(copyFolder.getAbsolutePath(),
assertThat(Path.of(copyFolder.getAbsolutePath(),
- path1.getFileName().toString()).toFile().canRead()).isTrue();
+ path1.getFileName().toString()).toFile()).canRead();
schema.setType("string");
property.setEntrySchema(schema);
MatchablePropertyTypeMap mapValue = new MatchablePropertyTypeMap(property);
schema.setType("string");
property.setEntrySchema(schema);
MatchablePropertyTypeMap mapValue = new MatchablePropertyTypeMap(property);
- assertThat(mapValue.validate(new String("foo"))).hasSize(0);
+ assertThat(mapValue.validate("foo")).isEmpty();
MatchablePropertyTypeList listValue = new MatchablePropertyTypeList(property);
MatchablePropertyTypeList listValue = new MatchablePropertyTypeList(property);
- assertThat(listValue.validate(new String("foo"))).hasSize(0);
+ assertThat(listValue.validate("foo")).isEmpty();
assertThat(rule.getObligationExpressions().getObligationExpression().size()).isEqualTo(1);
assertThat(rule.getObligationExpressions().getObligationExpression().get(0)
assertThat(rule.getObligationExpressions().getObligationExpression().size()).isEqualTo(1);
assertThat(rule.getObligationExpressions().getObligationExpression().get(0)
- .getAttributeAssignmentExpression().size()).isEqualTo(0);
+ .getAttributeAssignmentExpression()).isEmpty();
//
// Should not throw an exception
//
// Should not throw an exception
assertNotNull(decision);
assertThat(decision.getPolicies()).isNotNull();
assertNotNull(decision);
assertThat(decision.getPolicies()).isNotNull();
- assertThat(decision.getPolicies().size()).isEqualTo(0);
+ assertThat(decision.getPolicies()).isEmpty();
assertNotNull(decision);
assertThat(decision.getPolicies()).isNotNull();
assertNotNull(decision);
assertThat(decision.getPolicies()).isNotNull();
- assertThat(decision.getPolicies().size()).isEqualTo(0);
+ assertThat(decision.getPolicies()).isEmpty();
Obligation badObligation = TestUtilsCommon.createXacmlObligation(
ToscaDictionary.ID_OBLIGATION_REST_BODY.stringValue(),
Obligation badObligation = TestUtilsCommon.createXacmlObligation(
ToscaDictionary.ID_OBLIGATION_REST_BODY.stringValue(),
assertNotNull(decision);
assertThat(decision.getPolicies()).isNotNull();
assertNotNull(decision);
assertThat(decision.getPolicies()).isNotNull();
- assertThat(decision.getPolicies().size()).isEqualTo(1);
+ assertThat(decision.getPolicies()).hasSize(1);
LOGGER.info("Decision {}", decision);
assertThat(decision.getKey()).isNotNull();
LOGGER.info("Decision {}", decision);
assertThat(decision.getKey()).isNotNull();
- assertThat(decision.getKey().getPolicies()).hasSize(0);
+ assertThat(decision.getKey().getPolicies()).isEmpty();
//
// Test the branch for query params, and we have no policy anyway
//
//
// Test the branch for query params, and we have no policy anyway
//
LOGGER.info("Decision {}", decision);
assertThat(decision.getKey()).isNotNull();
LOGGER.info("Decision {}", decision);
assertThat(decision.getKey()).isNotNull();
- assertThat(decision.getKey().getPolicies()).hasSize(0);
+ assertThat(decision.getKey().getPolicies()).isEmpty();
//
// Test the branch for query params, and we have no policy anyway
//
//
// Test the branch for query params, and we have no policy anyway
//
LOGGER.info("Decision {}", decision);
assertThat(decision.getKey()).isNotNull();
LOGGER.info("Decision {}", decision);
assertThat(decision.getKey()).isNotNull();
- assertThat(decision.getKey().getPolicies()).hasSize(0);
+ assertThat(decision.getKey().getPolicies()).isEmpty();
}
@SuppressWarnings("unchecked")
}
@SuppressWarnings("unchecked")
assertThat(decision.getKey()).isNotNull();
assertThat(decision.getKey().getPolicies()).hasSize(1);
jsonPolicy = (Map<String, Object>) decision.getKey().getPolicies().get("onap.scaleout.tca");
assertThat(decision.getKey()).isNotNull();
assertThat(decision.getKey().getPolicies()).hasSize(1);
jsonPolicy = (Map<String, Object>) decision.getKey().getPolicies().get("onap.scaleout.tca");
- assertThat(jsonPolicy).isNotNull();
- assertThat(jsonPolicy).doesNotContainKey("properties");
+ assertThat(jsonPolicy).isNotNull().doesNotContainKey("properties");
//
// Don't Ask for abbreviated results
//
//
// Don't Ask for abbreviated results
//
LOGGER.info("Decision {}", decision.getKey());
assertThat(decision.getKey()).isNotNull();
LOGGER.info("Decision {}", decision.getKey());
assertThat(decision.getKey()).isNotNull();
- assertThat(decision.getKey().getPolicies()).hasSize(0);
+ assertThat(decision.getKey().getPolicies()).isEmpty();
LOGGER.info("Decision {}", decision.getKey());
assertThat(decision.getKey()).isNotNull();
LOGGER.info("Decision {}", decision.getKey());
assertThat(decision.getKey()).isNotNull();
- assertThat(decision.getKey().getPolicies().size()).isEqualTo(0);
+ assertThat(decision.getKey().getPolicies()).isEmpty();
// There is no default policy
//
assertThat(response).isNotNull();
// There is no default policy
//
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(0);
+ assertThat(response.getPolicies()).isEmpty();
//
response = makeDecision();
assertThat(response).isNotNull();
//
response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(1);
+ assertThat(response.getPolicies()).hasSize(1);
LOGGER.info("Decision Returned Policy {}", entrySet.getKey());
assertThat(entrySet.getValue()).isInstanceOf(Map.class);
Map<String, Object> policyContents = (Map<String, Object>) entrySet.getValue();
LOGGER.info("Decision Returned Policy {}", entrySet.getKey());
assertThat(entrySet.getValue()).isInstanceOf(Map.class);
Map<String, Object> policyContents = (Map<String, Object>) entrySet.getValue();
- assertThat(policyContents.containsKey("properties")).isTrue();
+ assertThat(policyContents).containsKey("properties");
assertThat(policyContents.get("properties")).isInstanceOf(Map.class);
Map<String, Object> policyProperties = (Map<String, Object>) policyContents.get("properties");
assertThat(policyContents.get("properties")).isInstanceOf(Map.class);
Map<String, Object> policyProperties = (Map<String, Object>) policyContents.get("properties");
assertThat(response).isNotNull();
Decision decision = response.getResults().iterator().next().getDecision();
assertThat(decision).isNotNull();
assertThat(response).isNotNull();
Decision decision = response.getResults().iterator().next().getDecision();
assertThat(decision).isNotNull();
- assertThat(decision.toString()).isEqualTo(expected);
+ assertThat(decision).hasToString(expected);
LOGGER.info("Xacml response we received {}", DOMResponse.toString(response));
}
}
\ No newline at end of file
LOGGER.info("Xacml response we received {}", DOMResponse.toString(response));
}
}
\ No newline at end of file
LOGGER.info("Decision {}", decision.getKey());
assertThat(decision.getKey()).isNotNull();
LOGGER.info("Decision {}", decision.getKey());
assertThat(decision.getKey()).isNotNull();
- assertThat(decision.getKey().getPolicies().size()).isEqualTo(0);
+ assertThat(decision.getKey().getPolicies()).isEmpty();
//
List<ToscaPolicy> loadedPolicies = TestUtils.loadPolicies("src/test/resources/test-optimization-policies.yaml",
service);
//
List<ToscaPolicy> loadedPolicies = TestUtils.loadPolicies("src/test/resources/test-optimization-policies.yaml",
service);
- assertThat(loadedPolicies).isNotNull();
- assertThat(loadedPolicies).hasSize(14);
+ assertThat(loadedPolicies).isNotNull().hasSize(14);
//
// Ask for a decision for available default policies
//
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
//
// Ask for a decision for available default policies
//
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(2);
+ assertThat(response.getPolicies()).hasSize(2);
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(1);
+ assertThat(response.getPolicies()).hasSize(1);
response.getPolicies().forEach((key, value) -> {
response.getPolicies().forEach((key, value) -> {
- assertThat(((Map<String, Object>) value).get("type"))
- .isEqualTo(("onap.policies.optimization.resource.HpaPolicy"));
+ assertThat(((Map<String, Object>) value)).containsEntry("type",
+ "onap.policies.optimization.resource.HpaPolicy");
//
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
//
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(2);
+ assertThat(response.getPolicies()).hasSize(2);
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(3);
+ assertThat(response.getPolicies()).hasSize(3);
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(6);
+ assertThat(response.getPolicies()).hasSize(6);
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(7);
+ assertThat(response.getPolicies()).hasSize(7);
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(1);
+ assertThat(response.getPolicies()).hasSize(1);
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
DecisionResponse response = makeDecision();
assertThat(response).isNotNull();
- assertThat(response.getPolicies().size()).isEqualTo(2);
+ assertThat(response.getPolicies()).hasSize(2);
LOGGER.info("Decision Returned Policy {}", entrySet.getKey());
assertThat(entrySet.getValue()).isInstanceOf(Map.class);
Map<String, Object> policyContents = (Map<String, Object>) entrySet.getValue();
LOGGER.info("Decision Returned Policy {}", entrySet.getKey());
assertThat(entrySet.getValue()).isInstanceOf(Map.class);
Map<String, Object> policyContents = (Map<String, Object>) entrySet.getValue();
- assertThat(policyContents.containsKey("properties")).isTrue();
+ assertThat(policyContents).containsKey("properties");
assertThat(policyContents.get("properties")).isInstanceOf(Map.class);
Map<String, Object> policyProperties = (Map<String, Object>) policyContents.get("properties");
assertThat(policyContents.get("properties")).isInstanceOf(Map.class);
Map<String, Object> policyProperties = (Map<String, Object>) policyContents.get("properties");
// We need at least 1 policies
//
assertThat(completedJtst).isNotNull();
// We need at least 1 policies
//
assertThat(completedJtst).isNotNull();
- assertThat(completedJtst.getToscaTopologyTemplate().getPolicies().size()).isGreaterThan(0);
+ assertThat(completedJtst.getToscaTopologyTemplate().getPolicies().size()).isPositive();
//
// Copy test directory over of the application directories
//
//
// Copy test directory over of the application directories
//
// Test the basics from the startup
//
assertThat(manager).isNotNull();
// Test the basics from the startup
//
assertThat(manager).isNotNull();
- assertThat(manager.getPolicyCount()).isEqualTo(0);
+ assertThat(manager.getPolicyCount()).isZero();
assertThat(manager.getPolicyTypeCount()).isEqualTo(19);
assertThat(manager.getToscaPolicies()).isEmpty();
assertThat(manager.getToscaPolicyIdentifiers()).isEmpty();
assertThat(manager.getPolicyTypeCount()).isEqualTo(19);
assertThat(manager.getToscaPolicies()).isEmpty();
assertThat(manager.getToscaPolicyIdentifiers()).isEmpty();
final ToscaPolicy policyFinal = policy;
assertThatCode(() -> {
manager.removeUndeployedPolicy(policyFinal);
final ToscaPolicy policyFinal = policy;
assertThatCode(() -> {
manager.removeUndeployedPolicy(policyFinal);
- assertThat(manager.getPolicyCount()).isEqualTo(0);
+ assertThat(manager.getPolicyCount()).isZero();
manager.loadDeployedPolicy(policyFinal);
assertThat(manager.getPolicyCount()).isEqualTo(1);
manager.removeUndeployedPolicy(policyFinal);
manager.loadDeployedPolicy(policyFinal);
assertThat(manager.getPolicyCount()).isEqualTo(1);
manager.removeUndeployedPolicy(policyFinal);
- assertThat(manager.getPolicyCount()).isEqualTo(0);
+ assertThat(manager.getPolicyCount()).isZero();
}).doesNotThrowAnyException();
//
// try loading something unsupported
}).doesNotThrowAnyException();
//
// try loading something unsupported
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import com.att.research.xacml.api.Request;
import com.att.research.xacml.api.RequestAttributes;
import com.att.research.xacml.api.Request;
import com.att.research.xacml.api.RequestAttributes;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
import com.att.research.xacml.api.Request;
import com.att.research.xacml.api.RequestAttributes;
import com.att.research.xacml.api.Request;
import com.att.research.xacml.api.RequestAttributes;