Author: dgeraskov Date: 2010-04-14 06:06:37 -0400 (Wed, 14 Apr 2010) New Revision: 21462 Modified: branches/jbosstools-3.1.x/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDiagramTest.java Log: Revert committed by mistake code back Modified: branches/jbosstools-3.1.x/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDiagramTest.java =================================================================== --- branches/jbosstools-3.1.x/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDiagramTest.java 2010-04-14 10:03:38 UTC (rev 21461) +++ branches/jbosstools-3.1.x/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDiagramTest.java 2010-04-14 10:06:37 UTC (rev 21462) @@ -47,21 +47,20 @@ rts.add(ioe); final List<Object> emptyList = new ArrayList<Object>(); final Iterator<Object> emptyListIterator = emptyList.iterator(); - //see https://jira.jboss.org/jira/browse/JBIDE-6186 - final String innerIntricateName = "myInner$Id"; + context.checking(new Expectations() { { oneOf(ioe).getEntityName(); - will(returnValue(innerIntricateName)); + will(returnValue("testEntityName")); //$NON-NLS-1$ allowing(consoleConfig).getConfiguration(); will(returnValue(config)); oneOf(ioe).getEntityName(); - will(returnValue(innerIntricateName)); + will(returnValue("")); //$NON-NLS-1$ oneOf(ioe).getEntityName(); - will(returnValue(innerIntricateName)); + will(returnValue("")); //$NON-NLS-1$ oneOf(ioe).getIdentifierProperty(); will(returnValue(null)); @@ -94,7 +93,7 @@ will(returnValue("CCName")); //$NON-NLS-1$ allowing(ioe).getEntityName(); - will(returnValue(innerIntricateName)); //$NON-NLS-1$ + will(returnValue("")); //$NON-NLS-1$ } }); final OrmDiagram ormDiagram = new OrmDiagram("", rts) { //$NON-NLS-1$ @@ -102,7 +101,7 @@ return consoleConfig; } }; - ormDiagram.saveInXmlFile(); + ormDiagram.saveInFile(); // test is the folder created File folder = new File(ormDiagram.getStoreFolderPath().toOSString()); assertTrue(folder.exists() && folder.isDirectory());