Merge pull request #409 from apache/test-log-spam-and-assert

Remove log spam and minor test cleanup
apache · Nov 8, 2023 · b91fee9 · b91fee9
2 parents 8fd9a17 + 855671d
commit b91fee9
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 315 deletions.
diff --git a/scim-core/src/test/java/org/apache/directory/scim/core/repository/UpdateRequestTest.java b/scim-core/src/test/java/org/apache/directory/scim/core/repository/UpdateRequestTest.java
@@ -89,7 +89,7 @@ public void initialize() throws Exception {
   public void testResourcePassthrough() throws Exception {
     UpdateRequest<ScimUser> updateRequest = new UpdateRequest<>("1234", createUser(), createUser(), schemaRegistry);
     ScimUser result = updateRequest.getResource();
-    log.info("testResourcePassthrough: " + result);
+    log.debug("testResourcePassthrough: {}", result);
     assertThat(result)
               .isNotNull();
   }
@@ -98,7 +98,7 @@ public void testResourcePassthrough() throws Exception {
   public void testPatchPassthrough() throws Exception {
     UpdateRequest<ScimUser> updateRequest = new UpdateRequest<>("1234", createUser(), createUser1PatchOps(), schemaRegistry);
     List<PatchOperation> result = updateRequest.getPatchOperations();
-    log.info("testPatchPassthrough: " + result);
+    log.debug("testPatchPassthrough: {}", result);
     assertThat(result)
               .isNotNull();
   }

diff --git a/scim-server/src/test/java/org/apache/directory/scim/server/rest/AttributeUtilTest.java b/scim-server/src/test/java/org/apache/directory/scim/server/rest/AttributeUtilTest.java
@@ -231,7 +231,7 @@ public void testExcludeAttributesWithExtensions() throws Exception {
   private void debugJson(Object resource) throws JsonGenerationException, JsonMappingException, IOException {
     StringWriter sw = new StringWriter();
     objectMapper.writeValue(sw, resource);
-    LOG.info(sw.toString());
+    LOG.debug(sw.toString());
   }
 
   private ScimUser getScimUser() throws PhoneNumberParseException {

diff --git a/...chema/src/main/java/org/apache/directory/scim/spec/filter/ExpressionBuildingListener.java b/...chema/src/main/java/org/apache/directory/scim/spec/filter/ExpressionBuildingListener.java
@@ -47,7 +47,9 @@ public class ExpressionBuildingListener extends FilterBaseListener {
 
   @Override
   public void exitFilter(FilterContext ctx) {
-    assert expressionStack.size() == 1 : "wrong number (" + expressionStack.size() + ") of expressions on stack, should be 1";
+    if (expressionStack.size() != 1) {
+      throw new IllegalStateException("Wrong number (" + expressionStack.size() + ") of expressions on stack, should be 1");
+    }
   }
 
   @Override

diff --git a/...spec/scim-spec-schema/src/test/java/org/apache/directory/scim/spec/filter/FilterTest.java b/...spec/scim-spec-schema/src/test/java/org/apache/directory/scim/spec/filter/FilterTest.java
@@ -37,10 +37,10 @@ private static String[] getAllFilters() {
   @ParameterizedTest
   @MethodSource("getAllFilters")
   public void test(String filterText) throws Exception {
-    LOG.info("Running Filter Parser test on input: " + filterText);
+    LOG.debug("Running Filter Parser test on input: {}", filterText);
     Filter filter = new Filter(filterText);
     FilterExpression expression = filter.getExpression();
-    LOG.info("Parsed String: " + expression.toFilter());
+    LOG.debug("Parsed String: {}", expression.toFilter());
     Assertions.assertNotNull(expression);
   }
 }
diff --git a/...pec-schema/src/test/java/org/apache/directory/scim/spec/patch/PatchOperationPathTest.java b/...pec-schema/src/test/java/org/apache/directory/scim/spec/patch/PatchOperationPathTest.java
@@ -40,10 +40,10 @@ public static String[] pathValues() {
   @MethodSource("pathValues")
   public void testPathParsing(String value) throws Exception {
     PatchOperationPath path = new PatchOperationPath(value);
-    log.info("ValuePathExpression: " + path.getValuePathExpression());
+    log.debug("ValuePathExpression: {}", path.getValuePathExpression());
 
     String result = path.toString();
-    log.info(result);
+    log.debug(result);
     Assertions.assertNotNull(path.getValuePathExpression());
     Assertions.assertEquals(value.toLowerCase(), result.toLowerCase());
   }