2222 * SOFTWARE.
2323 */
2424
25+ import javax .inject .Inject ;
26+
2527import java .util .List ;
2628
2729import org .codehaus .modello .core .ModelloCore ;
3133import org .codehaus .modello .model .ModelField ;
3234import org .codehaus .modello .model .Version ;
3335import org .codehaus .modello .model .VersionRange ;
34- import org .codehaus .plexus .ContainerConfiguration ;
35- import org .codehaus .plexus .PlexusConstants ;
36- import org .codehaus .plexus .PlexusTestCase ;
36+ import org .codehaus .plexus .testing .PlexusTest ;
37+ import org .junit .jupiter .api .Test ;
38+
39+ import static org .codehaus .plexus .testing .PlexusExtension .getTestFile ;
40+ import static org .junit .jupiter .api .Assertions .*;
3741
3842/**
3943 * @author <a href="mailto:[email protected] ">Trygve Laugstøl</a> 4044 * @author <a href="mailto:[email protected] ">Emmanuel Venisse</a> 4145 */
42- public class ModelReaderTest extends PlexusTestCase {
43- public void testBasic () throws Exception {
44- ModelloCore modello = (ModelloCore ) lookup (ModelloCore .ROLE );
46+ @ PlexusTest
47+ class ModelReaderTest {
48+
49+ @ Inject
50+ ModelloCore modello ;
4551
52+ @ Test
53+ void basic () throws Exception {
4654 Model model = modello .loadModel (getTestFile ("src/test/resources/models/simple.mdo" ));
4755
4856 assertNotNull (model );
@@ -73,14 +81,13 @@ public void testBasic() throws Exception {
7381 assertGirl (model .getClass ("Girl" , new VersionRange ("1.0.0" )));
7482 }
7583
76- public void testAssociationDefaultValues () throws Exception {
77- ModelloCore modello = (ModelloCore ) lookup (ModelloCore .ROLE );
78-
84+ @ Test
85+ void associationDefaultValues () throws Exception {
7986 Model model = modello .loadModel (getTestFile ("src/test/resources/models/association.mdo" ));
8087
8188 ModelField field = model .getClass ("Foo" , new VersionRange ("1.0.0" )).getField ("bars" , new VersionRange ("1.0.0" ));
8289
83- assertTrue ( field instanceof ModelAssociation );
90+ assertInstanceOf ( ModelAssociation . class , field );
8491
8592 ModelAssociation association = (ModelAssociation ) field ;
8693
@@ -102,7 +109,7 @@ public void testAssociationDefaultValues() throws Exception {
102109 }
103110
104111 private void assertBoy (Object boyObject ) {
105- assertTrue ( boyObject instanceof ModelClass );
112+ assertInstanceOf ( ModelClass . class , boyObject );
106113
107114 ModelClass boy = (ModelClass ) boyObject ;
108115
@@ -122,7 +129,7 @@ private void assertBoy(Object boyObject) {
122129 }
123130
124131 private void assertBoyName (Object nameObject ) {
125- assertTrue ( nameObject instanceof ModelField );
132+ assertInstanceOf ( ModelField . class , nameObject );
126133
127134 ModelField name = (ModelField ) nameObject ;
128135
@@ -136,7 +143,7 @@ private void assertBoyName(Object nameObject) {
136143 }
137144
138145 private void assertGirl (Object girlObject ) {
139- assertTrue ( girlObject instanceof ModelClass );
146+ assertInstanceOf ( ModelClass . class , girlObject );
140147
141148 ModelClass girl = (ModelClass ) girlObject ;
142149
@@ -156,7 +163,7 @@ private void assertGirl(Object girlObject) {
156163 }
157164
158165 private void assertGirlAge (Object ageObject ) {
159- assertTrue ( ageObject instanceof ModelField );
166+ assertInstanceOf ( ModelField . class , ageObject );
160167
161168 ModelField age = (ModelField ) ageObject ;
162169
@@ -166,10 +173,4 @@ private void assertGirlAge(Object ageObject) {
166173
167174 assertEquals ("int" , age .getType ());
168175 }
169-
170- @ Override
171- protected void customizeContainerConfiguration (ContainerConfiguration configuration ) {
172- configuration .setAutoWiring (true );
173- configuration .setClassPathScanning (PlexusConstants .SCANNING_INDEX );
174- }
175176}
0 commit comments