[jbosstools-commits] JBoss Tools SVN: r18186 - in trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test: res/project/test/annotated/getters and 3 other directories.

Author: vyemialyanchyk Date: 2009-10-20 13:18:05 -0400 (Tue, 20 Oct 2009) New Revision: 18186 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/ZTypesComplex.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/ZTypesComplex.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/ZTypesComplex.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/ZTypesComplex.java Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-5050 - fix Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/ZTypesComplex.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/ZTypesComplex.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/ZTypesComplex.java 2009-10-20 17:18:05 UTC (rev 18186) @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.fields; + +class TypeA { + + public double id2 = 2.0; + + public TypeA() { + } + + protected Integer version; + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } +}; + +class TypeB { + + public int id = 0; + + public TypeB() { + } + + protected Integer version; +}; Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/ZTypesComplex.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/ZTypesComplex.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/ZTypesComplex.java 2009-10-20 17:18:05 UTC (rev 18186) @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +class TypeA { + + public double id2 = 2.0; + + public TypeA() { + } + + protected Integer version; + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } +}; + +class TypeB { + + public int id = 0; + + public TypeB() { + } + + protected Integer version; +}; Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/ZTypesComplex.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/ZTypesComplex.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/ZTypesComplex.java 2009-10-20 17:18:05 UTC (rev 18186) @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.fields; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Version; + +@Entity +class TypeA { + + @Id + @GeneratedValue + public double id2 = 2.0; + + public TypeA() { + } + + @Version + protected Integer version; + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } +}; + +@Entity +class TypeB { + + @Id + @GeneratedValue + public int id = 0; + + public TypeB() { + } + + @Version + protected Integer version; + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } +}; Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/ZTypesComplex.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/ZTypesComplex.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/ZTypesComplex.java 2009-10-20 17:18:05 UTC (rev 18186) @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package test.annotated.getters; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Version; + +@Entity +class TypeA { + + public double id2 = 2.0; + + public TypeA() { + } + + protected Integer version; + + @Version + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } +}; + +@Entity +class TypeB { + + public int id = 0; + + public TypeB() { + } + + protected Integer version; + + @Version + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } +}; Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-10-20 17:15:43 UTC (rev 18185) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-10-20 17:18:05 UTC (rev 18186) @@ -110,24 +110,33 @@ "test.annotated." + testSelection + ".Staff"); //$NON-NLS-1$ //$NON-NLS-2$ ICompilationUnit icu3 = Utils.findCompilationUnit(javaProject, "test.annotated." + testSelection + ".FotoXPerson"); //$NON-NLS-1$ //$NON-NLS-2$ + ICompilationUnit icu4 = Utils.findCompilationUnit(javaProject, + "test.annotated." + testSelection + ".ZTypesComplex"); //$NON-NLS-1$ //$NON-NLS-2$ + try { + icu4.becomeWorkingCopy(null); + } catch (JavaModelException e) { + // ignore + } //ICompilationUnit icu = Utils.findCompilationUnit(javaProject, // "test.annotated." + testSelection + ".Foto"); //$NON-NLS-1$ //$NON-NLS-2$ //ICompilationUnit icu2 = Utils.findCompilationUnit(javaProject, // "test.annotated." + testSelection + ".Person"); //$NON-NLS-1$ //$NON-NLS-2$ - ICompilationUnit icu4 = null; + ICompilationUnit icu44 = null; if (testSelection.equals(TEST_GETTERS)) { - icu4 = Utils.findCompilationUnit(javaProject, + icu44 = Utils.findCompilationUnit(javaProject, "test.annotated." + testSelection + ".FotoXPerson"); //$NON-NLS-1$ //$NON-NLS-2$ } assertNotNull(icu); assertNotNull(icu2); assertNotNull(icu3); + assertNotNull(icu4); collector.initCollector(javaProject); collector.collect(icu); collector.collect(icu2); collector.collect(icu3); - if (icu4 != null) { - collector.collect(icu4); + collector.collect(icu4); + if (icu44 != null) { + collector.collect(icu44); } collector.resolveRelations(); processor.setEnableOptLock(true); @@ -143,7 +152,8 @@ checkItem("PersonXFoto"); //$NON-NLS-1$ checkItem("Country"); //$NON-NLS-1$ checkItem("Visa"); //$NON-NLS-1$ - if (icu4 != null) { + checkItem("ZTypesComplex"); //$NON-NLS-1$ + if (icu44 != null) { checkItem("Entity"); //$NON-NLS-1$ } }