diff options
4 files changed, 21 insertions, 13 deletions
diff --git a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml index 00aa2d3a80..609428b1ea 100644 --- a/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml +++ b/jpa_diagram_editor/development/org.eclipse.jpt.jpadiagrameditor.releng/pom.xml @@ -44,14 +44,14 @@ <resolver>p2</resolver> </configuration> </plugin> - <plugin> + <!-- plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <version>${tycho-version}</version> <configuration> <argLine>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</argLine> </configuration> - </plugin> + </plugin --> </plugins> </build> diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/i18n/JPAEditorMessages.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/i18n/JPAEditorMessages.java index d586cf0973..ecf6fed218 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/i18n/JPAEditorMessages.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/i18n/JPAEditorMessages.java @@ -232,8 +232,6 @@ public class JPAEditorMessages extends NLS { public static String OpenJpaDiagramActionDelegate_openJPADiagramErrorMsgTitle; public static String OpenJpaDiagramActionDelegate_openJPADiagramErrorMsg; - public static String OpenJpaDiagramActionDelegate_jpaSupportWarningTitle; - public static String OpenJpaDiagramActionDelegate_jpaSupportWarningMsg; public static String OpenJpaDiagramActionDelegate_noPersistenceUnitTitle; public static String OpenJpaDiagramActionDelegate_noPersistenceUnitMsg; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/src/org/eclipse/jpt/jpadiagrameditor/swtbot/tests/internal/AbstractSwtBotEditorTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/src/org/eclipse/jpt/jpadiagrameditor/swtbot/tests/internal/AbstractSwtBotEditorTest.java index e9fe53a976..2a4674e9cb 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/src/org/eclipse/jpt/jpadiagrameditor/swtbot/tests/internal/AbstractSwtBotEditorTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/src/org/eclipse/jpt/jpadiagrameditor/swtbot/tests/internal/AbstractSwtBotEditorTest.java @@ -18,6 +18,7 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpadiagrameditor.swtbot.tests.utils.ContextMenuHelper;
import org.eclipse.jpt.jpadiagrameditor.swtbot.tests.utils.EditorProxy;
import org.eclipse.jpt.jpadiagrameditor.swtbot.tests.utils.RelationshipsUtils;
+import org.eclipse.jpt.jpadiagrameditor.swtbot.tests.utils.Utils;
import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages;
import org.eclipse.jpt.jpadiagrameditor.ui.internal.propertypage.JPADiagramPropertyPage;
import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JpaArtifactFactory;
@@ -63,6 +64,8 @@ public class AbstractSwtBotEditorTest extends SWTBotGefTestCase{ closeWelcomeScreen();
createProject(name, version);
+
+ editorProxy = new EditorProxy(workbenchBot, bot);
if(withOrmXml) {
setOrmXml();
@@ -70,6 +73,9 @@ public class AbstractSwtBotEditorTest extends SWTBotGefTestCase{ jpaDiagramEditor = editorProxy.openDiagramOnJPAProjectNode(
jpaProject.getName());
+
+ Utils.printlnFormatted("------> JPA diagram editor is opened");
+
editorProxy.setJpaDiagramEditor(jpaDiagramEditor);
relUtils = new RelationshipsUtils(jpaDiagramEditor, editorProxy, jpaProject);
@@ -78,7 +84,8 @@ public class AbstractSwtBotEditorTest extends SWTBotGefTestCase{ relUtils.setOrmXml(ormXml);
}
- Thread.sleep(2000);
+ Utils.printlnFormatted("======> Test are ready to start!");
+// Thread.sleep(2000);
}
private static void setOrmXml() throws InterruptedException, CoreException {
@@ -104,7 +111,8 @@ public class AbstractSwtBotEditorTest extends SWTBotGefTestCase{ }
assertNotNull(jpaProject);
assertEquals(name, jpaProject.getName());
- editorProxy = new EditorProxy(workbenchBot, bot);
+
+ Utils.printlnFormatted("-----> JPA project is created!");
}
private static void closeWelcomeScreen() {
@@ -117,7 +125,9 @@ public class AbstractSwtBotEditorTest extends SWTBotGefTestCase{ SWTBotPreferences.TIMEOUT = 5000;
}
workbenchBot.perspectiveByLabel("JPA").activate();
+ Utils.printlnFormatted("-----> JPA perspective is activated successfully!");
bot.closeAllEditors();
+ Utils.printlnFormatted("-----> All editors are closed!");
}
private static void jpaDiagramEditorPropertiesPage(String name) {
@@ -232,7 +242,9 @@ public class AbstractSwtBotEditorTest extends SWTBotGefTestCase{ editorProxy.deleteResources(jpaProject, ormXml!=null);
}
- private static OrmXml getOrmXMl(JpaProject jpaProject){
+ private static OrmXml getOrmXMl(JpaProject jpaProject){
+ jpaProject.getContextModelRoot().synchronizeWithResourceModel();
+
try {
JPACreateFactory.waitNonSystemJobs();
} catch (InterruptedException e) {
@@ -241,6 +253,9 @@ public class AbstractSwtBotEditorTest extends SWTBotGefTestCase{ PersistenceUnit unit = JpaArtifactFactory.instance().getPersistenceUnit(jpaProject);
assertNotNull(unit);
+ unit.synchronizeWithResourceModel();
+ unit.update();
+
assertTrue(unit.getMappingFileRefsSize() > 0);
if(unit.getMappingFileRefsSize() == 0)
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/src/org/eclipse/jpt/jpadiagrameditor/swtbot/tests/utils/EditorProxy.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/src/org/eclipse/jpt/jpadiagrameditor/swtbot/tests/utils/EditorProxy.java index 05961a74fb..49da039eb4 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/src/org/eclipse/jpt/jpadiagrameditor/swtbot/tests/utils/EditorProxy.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.swtbot.tests/src/org/eclipse/jpt/jpadiagrameditor/swtbot/tests/utils/EditorProxy.java @@ -2324,11 +2324,7 @@ public class EditorProxy { private String assertContainsHelperAttrInIdClass(
SWTBotGefEditPart inverse, JavaPersistentType idClass,
PersistentAttribute jpa, String IdClassFQN) throws JavaModelException {
-
-// IType idClassType = JavaCore.createCompilationUnitFrom(idClass).findPrimaryType();
-// assertNotNull(idClassType);
-// idClassType.getCompilationUnit().save(new NullProgressMonitor(), true);
-
+
AttributeMapping attributeMapping = JpaArtifactFactory.instance().getAttributeMapping(jpa);
assertTrue(SingleRelationshipMapping2_0.class.isInstance(attributeMapping));
DerivedIdentity2_0 identity = ((SingleRelationshipMapping2_0)attributeMapping).getDerivedIdentity();
@@ -2337,7 +2333,6 @@ public class EditorProxy { JavaSpecifiedPersistentAttribute helperAttr = idClass.getAttributeNamed(jpa.getName());
assertNotNull(helperAttr);
-// helperAttr.getClassFile().isOpen().getTypeSignature();
String helperAttrType = helperAttr.getTypeName();
if(IdClassFQN != null){
|