diff --git a/model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java b/model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java index 501d8c84..12a50763 100644 --- a/model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java +++ b/model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java @@ -23,14 +23,14 @@ package org.alfresco.transform.messages; import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.validation.DirectFieldBindingResult; import org.springframework.validation.Errors; diff --git a/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java b/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java index 5697e5e8..3bcd9141 100644 --- a/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java +++ b/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java @@ -25,25 +25,22 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import org.alfresco.transform.common.TransformConfigResourceReader; import org.alfresco.transform.config.SupportedSourceAndTarget; import org.alfresco.transform.config.TransformConfig; import org.alfresco.transform.config.TransformStep; import org.alfresco.transform.config.Transformer; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; +import org.junit.jupiter.api.Test; import java.io.IOException; -import java.io.InputStream; import java.util.List; import java.util.Set; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -import static junit.framework.TestCase.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test the CombinedTransformConfig, extended by both T-Router and ACS repository. @@ -258,7 +255,7 @@ public class CombinedTransformConfigTest assertEquals(numberOfTEngineTransformers, transformConfig.getTransformers().size()); Transformer actualTransformer = transformConfig.getTransformers().get(numberOfTEngineTransformers - 1); assertEquals(expectedTransformer, actualTransformer); - assertSame("It should even == the expected transform", expectedTransformer, actualTransformer); + assertTrue(expectedTransformer == actualTransformer); // Check the baseUrl is that of the original t-engine that will do the work, if the overriding transform // is a single step transform. @@ -385,8 +382,8 @@ public class CombinedTransformConfigTest config.combineTransformerConfig(registry); String expected = "Transformer \"1\" references \"unknown\" which do not exist. Read from readFromB"; - assertEquals(1, registry.errorMessages.size()); - assertEquals(expected, registry.errorMessages.get(0)); + assertEquals(1, registry.warnMessages.size()); + assertEquals(expected, registry.warnMessages.get(0)); } @Test diff --git a/model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java b/model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java index 7d7ea875..640c8013 100644 --- a/model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java +++ b/model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java @@ -30,13 +30,13 @@ import org.alfresco.transform.config.RemoveSupported; import org.alfresco.transform.config.SupportedSourceAndTarget; import org.alfresco.transform.config.TransformConfig; import org.alfresco.transform.config.Transformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.Set; -import static junit.framework.TestCase.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests the json elements: {@code removeTransformers}, {@code addSupported}, {@code removeSupported}, @@ -455,6 +455,6 @@ public class OverrideTransformConfigTests Set supportedSourceAndTargetList = resultConfig.getTransformers().get(0).getSupportedSourceAndTargetList(); assertTrue(supportedSourceAndTargetList.equals(expectedSupported)); - assertEquals("toString() difference", expectedToString, supportedSourceAndTargetList.toString()); + assertEquals(expectedToString, supportedSourceAndTargetList.toString()); } } diff --git a/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java b/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java index 505b5d1e..13209b0b 100644 --- a/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java +++ b/model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java @@ -27,15 +27,16 @@ package org.alfresco.transform.registry; import org.alfresco.transform.common.TransformException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; import static java.util.Arrays.asList; import static java.util.Collections.emptySet; import static org.alfresco.transform.registry.TransformRegistryHelper.retrieveTransformListBySize; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TransformRegistryHelperTest { @@ -118,10 +119,10 @@ public class TransformRegistryHelperTest private void assertOrder(List transformsInLoadOrder, List expectedList) { - TransformRegistryHelper helper = new TransformRegistryHelper(); + AtomicInteger transformerCount = new AtomicInteger(0); TransformCache data = new TransformCache(); transformsInLoadOrder.forEach(t->data.appendTransform("text/plain", "application/pdf", t, - null, null)); + "transformer"+transformerCount.getAndIncrement(), null)); List supportedTransforms = retrieveTransformListBySize(data, "text/plain", "application/pdf", null, null); @@ -132,8 +133,8 @@ public class TransformRegistryHelperTest String expectedTransformerName = expectedList.get(0).getName(); long expectedMaxSourceSizeBytes = findMaxSize(expectedList); assertEquals(expectedList, supportedTransforms); - assertEquals("Transform name", expectedTransformerName, transformerName); - assertEquals("MaxSize", expectedMaxSourceSizeBytes, maxSize); + assertEquals(expectedTransformerName, transformerName); + assertEquals(expectedMaxSourceSizeBytes, maxSize); // If the above two pass, we don't really need the following one, but if it is wrong it might indicate // something is wrong, where the sourceSizeInBytes is not just 1. @@ -159,23 +160,25 @@ public class TransformRegistryHelperTest supportedTransforms.get(supportedTransforms.size() - 1).getMaxSourceSizeBytes(); } - @Test(expected = TransformException.class) + @Test public void buildTransformListSourceMimeTypeNullErrorTest() { TransformCache data = new TransformCache(); - retrieveTransformListBySize(data, null, "application/pdf", null, null); - - fail("No exception raised"); + assertThrows(TransformException.class, () -> + { + retrieveTransformListBySize(data, null, "application/pdf", null, null); + }); } - @Test(expected = TransformException.class) + @Test public void buildTransformListTargetMimeTypeNullErrorTest() { TransformCache data = new TransformCache(); - retrieveTransformListBySize(data, "text/plain", null, null, null); - - fail("No exception raised"); + assertThrows(TransformException.class, () -> + { + retrieveTransformListBySize(data, "text/plain", null, null, null); + }); } } diff --git a/model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java b/model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java index aef1bb2f..937bb048 100644 --- a/model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java +++ b/model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java @@ -31,9 +31,9 @@ import static java.util.stream.Collectors.toMap; import static org.alfresco.transform.registry.TransformRegistryHelper.addToPossibleTransformOptions; import static org.alfresco.transform.registry.TransformRegistryHelper.optionsMatch; import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; @@ -48,8 +48,8 @@ import org.alfresco.transform.config.TransformOption; import org.alfresco.transform.config.TransformOptionGroup; import org.alfresco.transform.config.TransformOptionValue; import org.alfresco.transform.config.Transformer; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableSet; @@ -73,7 +73,7 @@ public class TransformRegistryTest protected AbstractTransformRegistry registry; protected Map> mapOfTransformOptions; - @Before + @BeforeEach public void setUp() throws Exception { registry = buildTransformServiceRegistryImpl(); @@ -115,17 +115,16 @@ public class TransformRegistryTest addToPossibleTransformOptions(possibleTransformOptions, transformOptionGroup, true, buildActualOptions(actualOptionNames)); - assertEquals("The expected options don't match", expectedNameSet, - possibleTransformOptions.keySet()); + assertEquals(expectedNameSet, possibleTransformOptions.keySet()); possibleTransformOptions.forEach((name, required) -> { if (required) { - assertTrue(name + " should be REQUIRED", expectedRequiredSet.contains(name)); + assertTrue(expectedRequiredSet.contains(name)); } else { - assertFalse(name + " should be OPTIONAL", expectedRequiredSet.contains(name)); + assertFalse(expectedRequiredSet.contains(name)); } }); } @@ -141,12 +140,11 @@ public class TransformRegistryTest boolean supported = optionsMatch(transformOptions, buildActualOptions(actualOptionNames)); if (isBlank(unsupportedMsg)) { - assertTrue("Expected these options to be SUPPORTED", supported); + assertTrue(supported); } else { - assertFalse("Expected these options NOT to be supported, because " + unsupportedMsg, - supported); + assertFalse(supported); } } @@ -189,9 +187,7 @@ public class TransformRegistryTest buildAndPopulateRegistry(transformers); String transformerName = registry.findTransformerName(sourceMimetype, sourceSizeInBytes, targetMimetype, actualOptions, null); - assertEquals( - sourceMimetype + " to " + targetMimetype + " should have returned " + expectedTransformerName, - expectedTransformerName, transformerName); + assertEquals(expectedTransformerName, transformerName); } private void assertSupported(final Transformer transformer, final String sourceMimetype, @@ -229,13 +225,11 @@ public class TransformRegistryTest actualOptions, renditionName); if (unsupportedMsg == null || unsupportedMsg.isEmpty()) { - assertTrue(sourceMimetype + " to " + targetMimetype + " should be SUPPORTED", - supported); + assertTrue(supported); } else { - assertFalse(sourceMimetype + " to " + targetMimetype + " should NOT be supported", - supported); + assertFalse(supported); } } diff --git a/pom.xml b/pom.xml index 4cf94b63..17bbe631 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,6 @@ 5.17.1 2.13.3 2.13.3 - 4.13.2 3.5.3 2.4.1 5.2.2 @@ -243,12 +242,6 @@ commons-codec 1.15 - - - junit - junit - ${dependency.junit.version} - org.apache.httpcomponents httpclient