diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml index 5c29b38ec..cd464890c 100644 --- a/modello-maven-plugin/pom.xml +++ b/modello-maven-plugin/pom.xml @@ -148,6 +148,21 @@ junit test + + org.codehaus.plexus + plexus-testing + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params + test + diff --git a/modello-maven-plugin/src/it/clone-java5/src/test/java/test/CloneTest.java b/modello-maven-plugin/src/it/clone-java5/src/test/java/test/CloneTest.java index 15d2f0e15..412e877f7 100644 --- a/modello-maven-plugin/src/it/clone-java5/src/test/java/test/CloneTest.java +++ b/modello-maven-plugin/src/it/clone-java5/src/test/java/test/CloneTest.java @@ -4,12 +4,16 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; -import junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; public class CloneTest - extends TestCase { - + @Test public void testNullSafe() throws Exception { @@ -20,7 +24,7 @@ public void testNullSafe() assertNotNull( copy ); assertNotSame( orig, copy ); } - + @Test public void testClone() throws Exception { diff --git a/modello-maven-plugin/src/it/clone/src/test/java/test/CloneTest.java b/modello-maven-plugin/src/it/clone/src/test/java/test/CloneTest.java index e824dfcec..ea97bca38 100644 --- a/modello-maven-plugin/src/it/clone/src/test/java/test/CloneTest.java +++ b/modello-maven-plugin/src/it/clone/src/test/java/test/CloneTest.java @@ -4,12 +4,16 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; -import junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; public class CloneTest - extends TestCase { - + @Test public void testNullSafe() throws Exception { @@ -20,7 +24,7 @@ public void testNullSafe() assertNotNull( copy ); assertNotSame( orig, copy ); } - + @Test public void testClone() throws Exception { diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java index 92adde1f5..1e51439f3 100644 --- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java +++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java @@ -22,25 +22,44 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.io.File; import java.util.Arrays; import org.apache.maven.project.MavenProject; import org.codehaus.modello.core.ModelloCore; import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.build.BuildContext; +import org.codehaus.plexus.testing.PlexusExtension; +import org.codehaus.plexus.testing.PlexusTest; +import org.codehaus.plexus.testing.PlexusTestConfiguration; import org.codehaus.plexus.util.FileUtils; +import org.junit.jupiter.api.Test; + +import static org.codehaus.plexus.testing.PlexusExtension.getTestFile; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Brett Porter */ -public class ModelloConvertersMojoTest extends PlexusTestCase { - public void testModelloConvertersMojo() throws Exception { - ModelloCore modelloCore = (ModelloCore) lookup(ModelloCore.ROLE); +@PlexusTest +public class ModelloConvertersMojoTest implements PlexusTestConfiguration { + + @Inject + private ModelloCore modelloCore; - BuildContext buildContext = (BuildContext) lookup(BuildContext.class); + @Inject + private BuildContext buildContext; + @Override + public void customizeConfiguration(ContainerConfiguration containerConfiguration) { + containerConfiguration.setClassPathScanning("cache"); + } + + @Test + public void testModelloConvertersMojo() throws Exception { ModelloConvertersMojo mojo = new ModelloConvertersMojo(); File outputDirectory = getTestFile("target/converters-test"); @@ -54,7 +73,7 @@ public void testModelloConvertersMojo() throws Exception { mojo.setOutputDirectory(outputDirectory); String models[] = new String[1]; - models[0] = getTestPath("src/test/resources/java-model.mdo"); + models[0] = PlexusExtension.getTestPath("src/test/resources/java-model.mdo"); mojo.setModels(models); mojo.setVersion("1.0.0"); @@ -78,33 +97,28 @@ public void testModelloConvertersMojo() throws Exception { File javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/v1_0_0/convert/VersionConverter.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File( outputDirectory, "org/codehaus/mojo/modello/javatest/v1_0_0/convert/BasicVersionConverter.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/v0_9_0/convert/VersionConverter.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File( outputDirectory, "org/codehaus/mojo/modello/javatest/v0_9_0/convert/BasicVersionConverter.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/convert/VersionConverter.java"); - assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertFalse(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/convert/BasicVersionConverter.java"); - assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); - } - - @Override - protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { - containerConfiguration.setClassPathScanning("cache"); + assertFalse(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); } } diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java index ef234cac5..b3ba2802c 100644 --- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java +++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java @@ -22,24 +22,38 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.io.File; import java.util.Arrays; import org.apache.maven.project.MavenProject; import org.codehaus.modello.core.ModelloCore; import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.build.BuildContext; +import org.codehaus.plexus.testing.PlexusTest; +import org.codehaus.plexus.testing.PlexusTestConfiguration; import org.codehaus.plexus.util.FileUtils; +import org.junit.jupiter.api.Test; + +import static org.codehaus.plexus.testing.PlexusExtension.getTestFile; +import static org.codehaus.plexus.testing.PlexusExtension.getTestPath; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Trygve Laugstøl */ -public class ModelloJavaMojoTest extends PlexusTestCase { - public void testModelloJavaMojo() throws Exception { - ModelloCore modelloCore = (ModelloCore) lookup(ModelloCore.ROLE); +@PlexusTest +public class ModelloJavaMojoTest implements PlexusTestConfiguration { + @Inject + private BuildContext buildContext; - BuildContext buildContext = (BuildContext) lookup(BuildContext.class); + @Inject + private ModelloCore modelloCore; + + @Test + public void testModelloJavaMojo() throws Exception { ModelloJavaMojo mojo = new ModelloJavaMojo(); @@ -76,32 +90,32 @@ public void testModelloJavaMojo() throws Exception { File javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/Model.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/NewModel.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/v1_0_0/Model.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/v1_0_0/NewModel.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/v0_9_0/Model.java"); - assertTrue("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + assertTrue(javaFile.exists(), "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'."); javaFile = new File(outputDirectory, "org/codehaus/mojo/modello/javatest/v0_9_0/NewModel.java"); assertFalse( - "The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + javaFile.exists(), "The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'."); } @Override - protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { + public void customizeConfiguration(ContainerConfiguration containerConfiguration) { containerConfiguration.setClassPathScanning("cache"); } } diff --git a/modello-plugins/modello-plugin-converters/pom.xml b/modello-plugins/modello-plugin-converters/pom.xml index 194987cec..529647a3d 100644 --- a/modello-plugins/modello-plugin-converters/pom.xml +++ b/modello-plugins/modello-plugin-converters/pom.xml @@ -37,6 +37,12 @@ 7.1.1 test + + + junit + junit + test + diff --git a/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java b/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java index b630cccbc..7b4d9db92 100644 --- a/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java +++ b/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java @@ -22,6 +22,8 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.io.Reader; import java.util.HashMap; import java.util.Map; @@ -31,14 +33,22 @@ import org.codehaus.modello.ModelloParameterConstants; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** */ +@PlexusTest public class ConverterGeneratorTest extends AbstractModelloJavaGeneratorTest { + + @Inject + private ModelloCore modello; + public ConverterGeneratorTest() { super("converters"); } + @Test public void testConverterGenerator() throws Throwable { generateConverterClasses(getXmlResourceReader("/models/maven.mdo"), "3.0.0", "4.0.0"); @@ -53,8 +63,6 @@ public void testConverterGenerator() throws Throwable { } private void generateConverterClasses(Reader modelReader, String fromVersion, String toVersion) throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(modelReader); Map parameters = new HashMap<>(); diff --git a/modello-plugins/modello-plugin-dom4j/pom.xml b/modello-plugins/modello-plugin-dom4j/pom.xml index ef5f6f0c6..33cad4d43 100644 --- a/modello-plugins/modello-plugin-dom4j/pom.xml +++ b/modello-plugins/modello-plugin-dom4j/pom.xml @@ -37,6 +37,12 @@ xmlunit-core test + + + junit + junit + test + diff --git a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java index 9fc204267..0a7351679 100644 --- a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java +++ b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java @@ -22,6 +22,8 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.List; import java.util.Map; @@ -32,20 +34,27 @@ import org.codehaus.modello.model.ModelField; import org.codehaus.modello.model.Version; import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; /** * Test the generators. * * @author Brett Porter */ +@PlexusTest public class Dom4jGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public Dom4jGeneratorTest() { super("dom4j"); } + @Test public void testDom4jGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/maven.mdo")); List classesList = model.getClasses(new Version("4.0.0")); diff --git a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java index ee417c3e6..36bff4fd9 100644 --- a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java +++ b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java @@ -22,23 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Hervé Boutemy */ +@PlexusTest public class FeaturesDom4jGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public FeaturesDom4jGeneratorTest() { super("features"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-jackson/pom.xml b/modello-plugins/modello-plugin-jackson/pom.xml index feeedee67..a89f0a261 100644 --- a/modello-plugins/modello-plugin-jackson/pom.xml +++ b/modello-plugins/modello-plugin-jackson/pom.xml @@ -39,6 +39,12 @@ com.fasterxml.jackson.core jackson-annotations + + + junit + junit + test + diff --git a/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java b/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java index 08c2c7e0f..fd9e1d196 100644 --- a/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java +++ b/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java @@ -22,6 +22,8 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.List; import java.util.Map; @@ -30,18 +32,25 @@ import org.codehaus.modello.model.Model; import org.codehaus.modello.model.ModelClass; import org.codehaus.modello.model.Version; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Simone Tripodi */ +@PlexusTest public class JacksonGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public JacksonGeneratorTest() { super("jackson"); } + @Test public void testJacksonGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/maven.mdo")); // check some elements read from the model diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml index 953bf22c7..bf01f486f 100644 --- a/modello-plugins/modello-plugin-java/pom.xml +++ b/modello-plugins/modello-plugin-java/pom.xml @@ -21,6 +21,12 @@ plexus-build-api + + + junit + junit + test + javax.persistence persistence-api diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AbstractAnnotationsVerifier.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AbstractAnnotationsVerifier.java index 7c3c8eb79..fbe2c5f43 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AbstractAnnotationsVerifier.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AbstractAnnotationsVerifier.java @@ -26,8 +26,8 @@ import org.codehaus.modello.verifier.Verifier; -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.fail; /** * @author Hervé Boutemy diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java index 63a93009f..18f637a7c 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java @@ -22,23 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @version $Id: TmpJavaGeneratorTest.java 1125 2009-01-10 20:29:32Z hboutemy $ */ +@PlexusTest public class AnnotationsJavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public AnnotationsJavaGeneratorTest() { super("annotations"); } + @Test public void testJavaGeneratorWithAnnotations() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/annotations.mdo")); Map parameters = getModelloParameters("1.0.0", 8); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java index f454e5be7..c527ccc26 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java @@ -22,23 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Trygve Laugstøl */ +@PlexusTest public class AssociationGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public AssociationGeneratorTest() { super("oneToManyAssociation"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/oneToManyAssociation.mdo")); Map parameters = getModelloParameters("4.0.0"); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java index b349731a5..76f40b3d0 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java @@ -16,25 +16,32 @@ * limitations under the License. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * BiDirectionalOverrideJavaGeneratorTest * * @author Joakim Erdfelt */ +@PlexusTest public class BiDirectionalOverrideJavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public BiDirectionalOverrideJavaGeneratorTest() { super("bidirectional"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/bidirectional-override.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BuilderJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BuilderJavaGeneratorTest.java index 222eb50f9..05881b13b 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BuilderJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BuilderJavaGeneratorTest.java @@ -22,15 +22,25 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.io.File; import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; import org.codehaus.plexus.util.FileUtils; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; +@PlexusTest public class BuilderJavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public BuilderJavaGeneratorTest() { super("builder"); } @@ -39,9 +49,8 @@ public BuilderJavaGeneratorTest() { * MODELLO-83 * @throws Exception if any exception occurs */ + @Test public void testJavaGeneratorWithBuilder() throws Exception { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/builder.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java index feb7e33e2..2f06238af 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java @@ -22,23 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Benjamin Bentmann */ +@PlexusTest public class FeaturesJava5GeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public FeaturesJava5GeneratorTest() { super("features-java5"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); Map parameters = getModelloParameters("2.0.0", 8); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java index a4db27b32..682e55d05 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java @@ -22,26 +22,33 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.ModelloParameterConstants; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Hervé Boutemy */ +@PlexusTest public class FeaturesVersionJavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public FeaturesVersionJavaGeneratorTest() { super("features-version"); } private static final String ALL_VERSIONS = "1.0.0,1.5.0,2.0.0,3.0.0"; + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); Map parameters = getModelloParameters(); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java index 96b39f287..b0c837d79 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java @@ -1,19 +1,26 @@ package org.codehaus.modello.plugin.java; +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; +@PlexusTest public class InterfaceAssociationTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public InterfaceAssociationTest() { super("interfaceAssociationTest"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/interfaceAssociation.mdo")); Map parameters = getModelloParameters("4.0.0", 8); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java index 1e28b5d35..515de9f8c 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java @@ -22,23 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Trygve Laugstøl */ +@PlexusTest public class JavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public JavaGeneratorTest() { super("java"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/maven.mdo")); Map parameters = getModelloParameters("4.0.0"); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java index bb1ee0dca..74c19e5f6 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java @@ -22,24 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Benjamin Bentmann */ +@PlexusTest public class LocationsJavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; public LocationsJavaGeneratorTest() { super("locations"); } + @Test public void testLocations() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/locations.mdo")); Map parameters = getModelloParameters("1.0.0", 8); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java index b50eb7366..13c99077d 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java @@ -22,24 +22,31 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.ModelloParameterConstants; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Trygve Laugstøl */ +@PlexusTest public class PackageVersionJavaTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public PackageVersionJavaTest() { super("packageversion"); } + @Test public void testThatTheCorrectVersionIsInThePackageName() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/maven.mdo")); Map parameters = getModelloParameters("4.0.0"); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/StaticCreatorJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/StaticCreatorJavaGeneratorTest.java index a7905c34b..f10eb9f4d 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/StaticCreatorJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/StaticCreatorJavaGeneratorTest.java @@ -22,22 +22,31 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.io.File; import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; import org.codehaus.plexus.util.FileUtils; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; +@PlexusTest public class StaticCreatorJavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public StaticCreatorJavaGeneratorTest() { super("static-creator"); } + @Test public void testJavaGeneratorWithStaticCreator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/static-creator.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/TmpJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/TmpJavaGeneratorTest.java index 7d65a9094..a89c5638c 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/TmpJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/TmpJavaGeneratorTest.java @@ -22,11 +22,15 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * MODELLO-83: check that tmp can be used as a field name without interference with generated code for @@ -34,7 +38,11 @@ * * @author Vincent Siveton */ +@PlexusTest public class TmpJavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public TmpJavaGeneratorTest() { super("tmp"); } @@ -43,9 +51,8 @@ public TmpJavaGeneratorTest() { * MODELLO-83 * @throws Exception if any exception occurs */ + @Test public void testJavaGeneratorWithTmp() throws Exception { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/tmp.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/ToStringJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/ToStringJavaGeneratorTest.java index 8e86383e4..b6075abd2 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/ToStringJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/ToStringJavaGeneratorTest.java @@ -22,20 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.io.File; import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; import org.codehaus.plexus.util.FileUtils; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * check toString() method is generated. * * @author Olivier Lamy */ +@PlexusTest public class ToStringJavaGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public ToStringJavaGeneratorTest() { super("tostring"); } @@ -43,9 +53,8 @@ public ToStringJavaGeneratorTest() { /** * @throws Exception if any exception occurs */ + @Test public void testJavaGeneratorWithToString() throws Exception { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/tostring.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTestCase.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTest.java similarity index 83% rename from modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTestCase.java rename to modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTest.java index 7f2dc0b04..395826f80 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTestCase.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTest.java @@ -1,25 +1,30 @@ package org.codehaus.modello.plugin.java.javasource; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Simone Tripodi * @since 1.8 */ -public final class JMapTypeTestCase extends TestCase { +public final class JMapTypeTest { + @Test public void testJavaPropertiesType() { JMapType mapType = new JMapType("java.util.Properties", new JClass("String")); assertEquals("java.util.Properties", mapType.toString()); } + @Test public void testJavaMapType() { JMapType mapType = new JMapType("java.util.Map", new JClass("String")); assertEquals("java.util.Map", mapType.toString()); } + @Test public void testJavaMapInitialization() { JMapType mapType = new JMapType("java.util.Map", "new java.util.HashMap()", new JClass("String")); diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JavaSourceTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JavaSourceTest.java index 44c728449..4e0d12471 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JavaSourceTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JavaSourceTest.java @@ -3,12 +3,16 @@ import java.io.File; import org.codehaus.modello.AbstractModelloGeneratorTest; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class JavaSourceTest extends AbstractModelloGeneratorTest { public JavaSourceTest() { super("javasource"); } + @Test public void testJavaSource() { checkJClass(); checkJCompUnit(); diff --git a/modello-plugins/modello-plugin-jdom/pom.xml b/modello-plugins/modello-plugin-jdom/pom.xml index 9f0f7b895..4850dbd05 100644 --- a/modello-plugins/modello-plugin-jdom/pom.xml +++ b/modello-plugins/modello-plugin-jdom/pom.xml @@ -43,6 +43,12 @@ xmlunit-core test + + + junit + junit + test + diff --git a/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java b/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java index 6216392c7..903bd2fb4 100644 --- a/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java +++ b/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java @@ -22,23 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Hervé Boutemy */ +@PlexusTest public class FeaturesJDOMGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public FeaturesJDOMGeneratorTest() { super("features"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/RootClassnameJDOMGeneratorTest.java b/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/RootClassnameJDOMGeneratorTest.java index 4fe33fd24..ec7b4b3a4 100644 --- a/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/RootClassnameJDOMGeneratorTest.java +++ b/modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/RootClassnameJDOMGeneratorTest.java @@ -19,11 +19,15 @@ * under the License. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * Test for issue where "Root" cannot be used as a class name in JDOM writer. @@ -32,13 +36,17 @@ * * @author Copilot */ +@PlexusTest public class RootClassnameJDOMGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public RootClassnameJDOMGeneratorTest() { super("root-classname"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); Model model = modello.loadModel(getXmlResourceReader("/root-classname.mdo")); diff --git a/modello-plugins/modello-plugin-sax/pom.xml b/modello-plugins/modello-plugin-sax/pom.xml index 7ece539ec..e21aeb211 100644 --- a/modello-plugins/modello-plugin-sax/pom.xml +++ b/modello-plugins/modello-plugin-sax/pom.xml @@ -30,6 +30,12 @@ xmlunit-core test + + + junit + junit + test + diff --git a/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java b/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java index fb415f02d..939e54b29 100644 --- a/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java @@ -22,6 +22,8 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.List; import java.util.Map; @@ -32,18 +34,25 @@ import org.codehaus.modello.model.ModelField; import org.codehaus.modello.model.Version; import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; /** * @author Simone Tripodi */ +@PlexusTest public class SaxGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public SaxGeneratorTest() { super("sax"); } + @Test public void testXpp3Generator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/maven.mdo")); // check some elements read from the model diff --git a/modello-plugins/modello-plugin-snakeyaml/pom.xml b/modello-plugins/modello-plugin-snakeyaml/pom.xml index 64a26f592..1ad099f34 100644 --- a/modello-plugins/modello-plugin-snakeyaml/pom.xml +++ b/modello-plugins/modello-plugin-snakeyaml/pom.xml @@ -26,6 +26,12 @@ snakeyaml 2.5 + + + junit + junit + test + diff --git a/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java b/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java index a9bb50fbb..fe7e78516 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java @@ -22,20 +22,28 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; +@PlexusTest public class SnakeYamlGeneratorTest extends AbstractModelloJavaGeneratorTest { + + @Inject + private ModelloCore modello; + public SnakeYamlGeneratorTest() { super("snakeyaml"); } + @Test public void testYamlGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/models/maven.mdo")); Map parameters = getModelloParameters("4.0.0"); diff --git a/modello-plugins/modello-plugin-stax/pom.xml b/modello-plugins/modello-plugin-stax/pom.xml index 1d28b11af..9da7b6958 100644 --- a/modello-plugins/modello-plugin-stax/pom.xml +++ b/modello-plugins/modello-plugin-stax/pom.xml @@ -44,6 +44,12 @@ xmlunit-core test + + + junit + junit + test + diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java index 2f79de979..ce4332c8d 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java @@ -22,25 +22,31 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.ModelloParameterConstants; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; import org.codehaus.plexus.util.StringUtils; +import org.junit.jupiter.api.BeforeEach; +@PlexusTest public abstract class AbstractStaxGeneratorTestCase extends AbstractModelloJavaGeneratorTest { + + @Inject protected ModelloCore modello; protected AbstractStaxGeneratorTestCase(String name) { super(name); } - protected void setUp() throws Exception { + @BeforeEach + public void setUp() throws Exception { super.setUp(); - - modello = (ModelloCore) lookup(ModelloCore.ROLE); } protected void verifyModel(Model model, String className) throws Exception { diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java index 38cfd2f6f..77114723a 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java @@ -19,20 +19,28 @@ * under the License. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; +@PlexusTest public class BooleanTypeStaxGeneratorTest extends AbstractModelloJavaGeneratorTest { + + @Inject + private ModelloCore modello; + public BooleanTypeStaxGeneratorTest() { super("testBooleanType"); } + @Test public void testBooleanType() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/boolean.mdo")); Map parameters = getModelloParameters("1.0.0", 8); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java index 319653d51..3f805046a 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java @@ -22,23 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Hervé Boutemy */ +@PlexusTest public class FeaturesStaxDomGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public FeaturesStaxDomGeneratorTest() { super("features-dom"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java index 6a71a43ff..c53451aae 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java @@ -22,23 +22,30 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; /** * @author Hervé Boutemy */ +@PlexusTest public class FeaturesStaxGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public FeaturesStaxGeneratorTest() { super("features"); } + @Test public void testJavaGenerator() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/NoAdderStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/NoAdderStaxGeneratorTest.java index 41acd67d0..683217ee3 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/NoAdderStaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/NoAdderStaxGeneratorTest.java @@ -19,20 +19,27 @@ * under the License. */ +import javax.inject.Inject; + import java.util.Map; import org.codehaus.modello.AbstractModelloJavaGeneratorTest; import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; +import org.codehaus.plexus.testing.PlexusTest; +import org.junit.jupiter.api.Test; +@PlexusTest public class NoAdderStaxGeneratorTest extends AbstractModelloJavaGeneratorTest { + @Inject + private ModelloCore modello; + public NoAdderStaxGeneratorTest() { super("testNoAdder"); } + @Test public void testNoAdder() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/noAdder.mdo")); Map parameters = getModelloParameters("1.0.0"); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorPartsTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorPartsTest.java index c65513019..bd234ece2 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorPartsTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorPartsTest.java @@ -28,6 +28,9 @@ import org.codehaus.modello.model.ModelClass; import org.codehaus.modello.model.Version; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** */ @@ -36,6 +39,7 @@ public StaxGeneratorPartsTest() throws ComponentLookupException { super("stax-parts"); } + @Test public void testStaxReaderParts() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/parts.mdo")); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorTest.java index 048566e6f..a9025f0c2 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorTest.java @@ -30,6 +30,9 @@ import org.codehaus.modello.model.Version; import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; /** * @author Trygve Laugstøl @@ -40,6 +43,7 @@ public StaxGeneratorTest() throws ComponentLookupException { super("stax"); } + @Test public void testStaxGenerator() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/maven.mdo")); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionInFieldTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionInFieldTest.java index 757665844..eba25863d 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionInFieldTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionInFieldTest.java @@ -6,6 +6,9 @@ import org.codehaus.modello.model.ModelClass; import org.codehaus.modello.model.Version; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Trygve Laugstøl @@ -16,6 +19,7 @@ public StaxGeneratorVersionInFieldTest() throws ComponentLookupException { super("stax-version-in-field"); } + @Test public void testStaxReaderVersionInField() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/version-in-field.mdo")); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionInNamespaceTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionInNamespaceTest.java index 9eeccc77a..f01f1b63f 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionInNamespaceTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionInNamespaceTest.java @@ -6,6 +6,9 @@ import org.codehaus.modello.model.ModelClass; import org.codehaus.modello.model.Version; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Trygve Laugstøl @@ -16,6 +19,7 @@ public StaxGeneratorVersionInNamespaceTest() throws ComponentLookupException { super("stax-version-in-namespace"); } + @Test public void testStaxReaderVersionInField() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/version-in-namespace.mdo")); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionReaderDelegateTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionReaderDelegateTest.java index b478213d9..e00738f20 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionReaderDelegateTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorVersionReaderDelegateTest.java @@ -24,6 +24,7 @@ import org.codehaus.modello.model.Model; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.junit.jupiter.api.Test; /** */ @@ -32,6 +33,7 @@ public StaxGeneratorVersionReaderDelegateTest() throws ComponentLookupException super("stax-version-reader-delegate"); } + @Test public void testStaxReaderVersionInField() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/version-in-namespace.mdo")); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorWrongVersionInNamespaceTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorWrongVersionInNamespaceTest.java index ffd2d1738..8d067c800 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorWrongVersionInNamespaceTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorWrongVersionInNamespaceTest.java @@ -6,6 +6,9 @@ import org.codehaus.modello.model.ModelClass; import org.codehaus.modello.model.Version; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Trygve Laugstøl @@ -16,6 +19,7 @@ public StaxGeneratorWrongVersionInNamespaceTest() throws ComponentLookupExceptio super("stax-wrong-version-in-namespace"); } + @Test public void testStaxReaderVersionInField() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/version-in-namespace.mdo")); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorWrongVersionTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorWrongVersionTest.java index f3d3b83e1..dc9b25501 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorWrongVersionTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/StaxGeneratorWrongVersionTest.java @@ -1,21 +1,32 @@ package org.codehaus.modello.generator.xml.stax; +import javax.inject.Inject; + import java.util.List; +import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; import org.codehaus.modello.model.ModelClass; import org.codehaus.modello.model.Version; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Trygve Laugstøl * @author Emmanuel Venisse */ public class StaxGeneratorWrongVersionTest extends AbstractStaxGeneratorTestCase { + + @Inject + private ModelloCore modello; + public StaxGeneratorWrongVersionTest() throws ComponentLookupException { super("stax-wrong-version"); } + @Test public void testStaxReaderVersionInField() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/version-in-field.mdo")); diff --git a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java index da8ac6d5f..09f5e4745 100644 --- a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java +++ b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java @@ -22,6 +22,8 @@ * SOFTWARE. */ +import javax.inject.Inject; + import java.io.File; import java.nio.file.Files; import java.util.HashSet; @@ -39,16 +41,24 @@ import org.codehaus.modello.model.Version; import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata; import org.codehaus.modello.verifier.VerifierException; +import org.codehaus.plexus.testing.PlexusTest; import org.codehaus.plexus.util.FileUtils; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.xmlunit.builder.DiffBuilder; import org.xmlunit.builder.Input; import org.xmlunit.diff.Diff; +import static org.codehaus.plexus.testing.PlexusExtension.getTestFile; +import static org.junit.jupiter.api.Assertions.*; + /** * @author Trygve Laugstøl */ +@PlexusTest public class XdocGeneratorTest extends AbstractModelloGeneratorTest { + @Inject + private ModelloCore modello; public XdocGeneratorTest() { super("xdoc"); @@ -58,15 +68,15 @@ protected File getOutputDirectory() { return getTestFile("target/generated-site/xdoc"); } + @Test public void testXdocGenerator() throws Exception { checkMavenXdocGenerator(); checkFeaturesXdocGenerator(); checkSettingsXdocGenerator(); } + @Test public void testHtmlToXml() throws Exception { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/html4.mdo")); Map parameters = getModelloParameters("1.0.0"); @@ -79,14 +89,12 @@ public void testHtmlToXml() throws Exception { .build(); assertFalse( + diff.hasDifferences(), diff.toString() + "\nGenerated output:\n" - + new String(Files.readAllBytes(new File(getOutputDirectory(), "html4.xml").toPath())), - diff.hasDifferences()); + + new String(Files.readAllBytes(new File(getOutputDirectory(), "html4.xml").toPath()))); } private void checkMavenXdocGenerator() throws Exception { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/maven.mdo")); List classesList = model.getClasses(new Version("4.0.0")); @@ -130,8 +138,6 @@ private void checkMavenXdocGenerator() throws Exception { } public void checkFeaturesXdocGenerator() throws Exception { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); Map parameters = getModelloParameters("1.5.0"); @@ -142,12 +148,10 @@ public void checkFeaturesXdocGenerator() throws Exception { String content = FileUtils.fileRead(new File(getOutputDirectory(), "features.xml"), "UTF-8"); - assertTrue("Transient fields were erroneously documented", !content.contains("transientString")); + assertTrue(!content.contains("transientString"), "Transient fields were erroneously documented"); } public void checkSettingsXdocGenerator() throws Exception { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - Model model = modello.loadModel(getXmlResourceReader("/settings.mdo")); Map parameters = getModelloParameters("1.5.0"); @@ -158,7 +162,7 @@ public void checkSettingsXdocGenerator() throws Exception { String content = FileUtils.fileRead(new File(getOutputDirectory(), "settings.xml"), "UTF-8"); - assertTrue("Properties field was erroneously documented", !content.contains("<properties/>")); + assertTrue(!content.contains("<properties/>"), "Properties field was erroneously documented"); } /** @@ -177,7 +181,7 @@ private void checkInternalLinks(String filename) throws Exception { while (m.find()) { hrefs.add(m.group(1)); } - Assert.assertTrue("should find some ' 0); + assertTrue(file.length() > 0, "The generated file is empty."); } protected List getClassPathElements() { diff --git a/modello-test/src/main/java/org/codehaus/modello/verifier/Verifier.java b/modello-test/src/main/java/org/codehaus/modello/verifier/Verifier.java index 061c84fcd..dabe82ede 100644 --- a/modello-test/src/main/java/org/codehaus/modello/verifier/Verifier.java +++ b/modello-test/src/main/java/org/codehaus/modello/verifier/Verifier.java @@ -29,9 +29,9 @@ import org.codehaus.plexus.util.xml.XmlStreamReader; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public abstract class Verifier { public abstract void verify() throws Throwable; @@ -59,12 +59,12 @@ protected void assertReader(Class reader, Class model, Class input, Cla try { read = reader.getMethod("read", input); - assertEquals("Bad return type of " + read, model, read.getReturnType()); + assertEquals(model, read.getReturnType(), "Bad return type of " + read); for (Class e : read.getExceptionTypes()) { assertTrue( - "Unexpected exception " + e.getName() + " at " + read, - IOException.class.equals(e) || exception.equals(e)); + IOException.class.equals(e) || exception.equals(e), + "Unexpected exception " + e.getName() + " at " + read); } } catch (NoSuchMethodException e) { fail(e.toString()); @@ -74,12 +74,12 @@ protected void assertReader(Class reader, Class model, Class input, Cla try { read = reader.getMethod("read", input, Boolean.TYPE); - assertEquals("Bad return type of " + read, model, read.getReturnType()); + assertEquals(model, read.getReturnType(), "Bad return type of " + read); for (Class e : read.getExceptionTypes()) { assertTrue( - "Unexpected exception " + e.getName() + " at " + read, - IOException.class.equals(e) || exception.equals(e)); + IOException.class.equals(e) || exception.equals(e), + "Unexpected exception " + e.getName() + " at " + read); } } catch (NoSuchMethodException e) { fail(e.toString()); @@ -95,8 +95,8 @@ protected void assertWriter(Class writer, Class model, Class output, Cl for (Class e : write.getExceptionTypes()) { assertTrue( - "Unexpected exception " + e.getName() + " at " + write, - IOException.class.equals(e) || exception.equals(e)); + IOException.class.equals(e) || exception.equals(e), + "Unexpected exception " + e.getName() + " at " + write); } } catch (NoSuchMethodException e) { fail(e.toString()); diff --git a/pom.xml b/pom.xml index 4d98d9e92..ae67552a4 100644 --- a/pom.xml +++ b/pom.xml @@ -340,7 +340,7 @@ org.codehaus.plexus plexus-testing - 1.6.0 + 1.7.0