Author: dgeraskov
Date: 2008-01-15 09:34:36 -0500 (Tue, 15 Jan 2008)
New Revision: 5691
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1412
http://jira.jboss.com/jira/browse/JBIDE-1594
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
===================================================================
---
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2008-01-15
14:32:21 UTC (rev 5690)
+++
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2008-01-15
14:34:36 UTC (rev 5691)
@@ -12,6 +12,9 @@
import junit.framework.TestCase;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
import org.hibernate.cfg.Configuration;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
@@ -26,7 +29,8 @@
*
*/
public class OpenMappingFileTest extends TestCase {
- public void testOpenMappingFileTest(){
+
+ public void testOpenMappingFileTest() throws Throwable{
KnownConfigurations knownConfigurations = KnownConfigurations.getInstance();
final ConsoleConfiguration consCFG =
knownConfigurations.find(ProjectUtil.ConsoleCFGName);
assertNotNull(consCFG);
@@ -38,8 +42,10 @@
for (int i = 0; i < persClasses.length; i++) {
assertTrue(persClasses[0] instanceof PersistentClass);
PersistentClass persClass = (PersistentClass) persClasses[i];
- OpenMappingAction.run(persClass, consCFG);
- }
+ IEditorPart editor = OpenMappingAction.run(persClass, consCFG);
+ if (editor == null) fail("Editor not opened.");
+ ProjectUtil.throwExceptionIfItOccured(editor);
+ }
}
//close all editors
}
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
===================================================================
---
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2008-01-15
14:32:21 UTC (rev 5690)
+++
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2008-01-15
14:34:36 UTC (rev 5691)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
import org.hibernate.cfg.Configuration;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
@@ -28,7 +31,7 @@
*/
public class OpenSourceFileTest extends TestCase {
- public void testOpenSourceFileTest(){
+ public void testOpenSourceFileTest() throws Throwable{
//fail("test fail");
KnownConfigurations knownConfigurations = KnownConfigurations.getInstance();
final ConsoleConfiguration consCFG =
knownConfigurations.find(ProjectUtil.ConsoleCFGName);
@@ -41,8 +44,10 @@
for (int i = 0; i < persClasses.length; i++) {
assertTrue(persClasses[0] instanceof PersistentClass);
PersistentClass persClass = (PersistentClass) persClasses[i];
- new OpenSourceAction().run(persClass,
MappingTestProject.getTestProject().getIJavaProject(),
- ProjectUtil.getPersistentClassName(persClass));
+ IEditorPart editor = new OpenSourceAction().run(persClass,
MappingTestProject.getTestProject().getIJavaProject(),
+ persClass.getClassName());
+ if (editor == null) fail("Editor not opened.");
+ ProjectUtil.throwExceptionIfItOccured(editor);
}
}
//close all editors