From ac5b260e40d6c058943ded9e15e4df1bdf6348ce Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Thu, 27 Jun 2024 18:20:14 +0200 Subject: [PATCH] [jps model tests] adapt test for invalid project configurations to the new implementation (IJPL-409) The new implementation based on the workspace model behaves slightly differently for some projects with invalid configurations, tests should tolerate this. GitOrigin-RevId: fa5a7c888aa60ff27507bff3b9a05fc3d68ececc --- .../JpsProjectSerializationTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsProjectSerializationTest.java b/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsProjectSerializationTest.java index 6d6b427486ef..551bb40652b7 100644 --- a/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsProjectSerializationTest.java +++ b/jps/model-serialization/testSrc/org/jetbrains/jps/model/serialization/JpsProjectSerializationTest.java @@ -252,15 +252,21 @@ public class JpsProjectSerializationTest { @Test public void testMissingImlFile() { - JpsProjectData projectData = loadProject("jps/model-serialization/testData/missingImlFile/missingImlFile.ipr"); - UsefulTestCase.assertEmpty(projectData.getProject().getModules()); + loadProject("jps/model-serialization/testData/missingImlFile/missingImlFile.ipr"); } @Test public void testMissingContentUrlAttribute() { - JpsProjectData projectData = loadProject("jps/model-serialization/testData/missingContentUrlAttribute/missingContentUrlAttribute.ipr"); - JpsModule module = assertOneElement(projectData.getProject().getModules()); - assertEquals("missingContentUrlAttribute", module.getName()); + try { + JpsProjectData projectData = loadProject("jps/model-serialization/testData/missingContentUrlAttribute/missingContentUrlAttribute.ipr"); + //the current implementation silently skips missing modules + JpsModule module = assertOneElement(projectData.getProject().getModules()); + assertEquals("missingContentUrlAttribute", module.getName()); + } + catch (CannotLoadJpsModelException e) { + //the new implementation throws an exception + assertEquals("missingContentUrlAttribute.iml", e.getFile().getName()); + } } @Test