Author: vyemialyanchyk Date: 2009-01-12 15:22:51 -0500 (Mon, 12 Jan 2009) New Revision: 13003 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/FotoXPerson.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/PersonXFoto.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/FotoXPerson.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/PersonXFoto.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/FotoXPerson.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/PersonXFoto.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/FotoXPerson.java trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/PersonXFoto.java Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java Log: JBIDE-3426 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/FotoXPerson.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/FotoXPerson.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/FotoXPerson.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -0,0 +1,24 @@ +/******************************************************************************* + * 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 java.util.HashSet; +import java.util.Set; + +public class FotoXPerson { + + protected Integer ffotoId; + + protected PersonXFoto person; + + protected Set<PersonXFoto> persons = new HashSet<PersonXFoto>(0); + +} Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/PersonXFoto.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/PersonXFoto.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/PersonXFoto.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -0,0 +1,24 @@ +/******************************************************************************* + * 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 java.util.HashSet; +import java.util.Set; + +public class PersonXFoto { + + protected Integer ppersonId; + + protected FotoXPerson foto; + + protected Set<FotoXPerson> fotos = new HashSet<FotoXPerson>(0); + +} Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/FotoXPerson.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/FotoXPerson.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/FotoXPerson.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -0,0 +1,47 @@ +/******************************************************************************* + * 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 java.util.HashSet; +import java.util.Set; + +public class FotoXPerson { + + protected Integer ffotoId; + + protected PersonXFoto person; + + protected Set<PersonXFoto> persons = new HashSet<PersonXFoto>(0); + + public Integer getFfotoId() { + return this.ffotoId; + } + + public void setFfotoId(Integer ffotoId) { + this.ffotoId = ffotoId; + } + + public PersonXFoto getPerson() { + return person; + } + + public void setPerson(PersonXFoto person) { + this.person = person; + } + + public Set<PersonXFoto> getPersons() { + return this.persons; + } + + public void setPersons(Set<PersonXFoto> persons) { + this.persons = persons; + } +} Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/PersonXFoto.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/PersonXFoto.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/PersonXFoto.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -0,0 +1,47 @@ +/******************************************************************************* + * 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 java.util.HashSet; +import java.util.Set; + +public class PersonXFoto { + + protected Integer ppersonId; + + protected FotoXPerson foto; + + protected Set<FotoXPerson> fotos = new HashSet<FotoXPerson>(0); + + public Integer getPpersonId() { + return this.ppersonId; + } + + public void setPpersonId(Integer ppersonId) { + this.ppersonId = ppersonId; + } + + public FotoXPerson getFoto() { + return this.foto; + } + + public void setFoto(FotoXPerson foto) { + this.foto = foto; + } + + public Set<FotoXPerson> getFotos() { + return fotos; + } + + public void setFotos(Set<FotoXPerson> fotos) { + this.fotos = fotos; + } +} Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/FotoXPerson.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/FotoXPerson.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/FotoXPerson.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -0,0 +1,33 @@ +/******************************************************************************* + * 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 java.util.HashSet; +import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; + +@Entity +public class FotoXPerson { + + @Id @GeneratedValue + protected Integer ffotoId; + + @ManyToOne + protected PersonXFoto person; + + @OneToMany(mappedBy="foto") + protected Set<PersonXFoto> persons = new HashSet<PersonXFoto>(0); + +} Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/PersonXFoto.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/PersonXFoto.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/PersonXFoto.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -0,0 +1,33 @@ +/******************************************************************************* + * 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 java.util.HashSet; +import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; + +@Entity +public class PersonXFoto { + + @Id @GeneratedValue + protected Integer ppersonId; + + @ManyToOne + protected FotoXPerson foto; + + @OneToMany(mappedBy="person") + protected Set<FotoXPerson> fotos = new HashSet<FotoXPerson>(0); + +} Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/FotoXPerson.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/FotoXPerson.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/FotoXPerson.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -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.fields; + +import java.util.HashSet; +import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; + +@Entity +public class FotoXPerson { + + protected Integer ffotoId; + + protected PersonXFoto person; + + protected Set<PersonXFoto> persons = new HashSet<PersonXFoto>(0); + + @Id @GeneratedValue + public Integer getFfotoId() { + return this.ffotoId; + } + + public void setFfotoId(Integer ffotoId) { + this.ffotoId = ffotoId; + } + + @ManyToOne + public PersonXFoto getPerson() { + return person; + } + + public void setPerson(PersonXFoto person) { + this.person = person; + } + + @OneToMany(mappedBy = "foto") + public Set<PersonXFoto> getPersons() { + return this.persons; + } + + public void setPersons(Set<PersonXFoto> persons) { + this.persons = persons; + } +} Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/PersonXFoto.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/PersonXFoto.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/PersonXFoto.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -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.fields; + +import java.util.HashSet; +import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; + +@Entity +public class PersonXFoto { + + protected Integer ppersonId; + + protected FotoXPerson foto; + + protected Set<FotoXPerson> fotos = new HashSet<FotoXPerson>(0); + + @Id @GeneratedValue + public Integer getPpersonId() { + return this.ppersonId; + } + + public void setPpersonId(Integer ppersonId) { + this.ppersonId = ppersonId; + } + + @ManyToOne + public FotoXPerson getFoto() { + return this.foto; + } + + public void setFoto(FotoXPerson foto) { + this.foto = foto; + } + + @OneToMany(mappedBy = "person") + public Set<FotoXPerson> getFotos() { + return fotos; + } + + public void setFotos(Set<FotoXPerson> fotos) { + this.fotos = fotos; + } +} 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-01-12 20:22:25 UTC (rev 13002) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-01-12 20:22:51 UTC (rev 13003) @@ -120,15 +120,19 @@ "test.annotated." + testSelection + ".Passport"); //$NON-NLS-1$ //$NON-NLS-2$ ICompilationUnit icu2 = Utils.findCompilationUnit(javaProject, "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 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$ assertNotNull(icu); assertNotNull(icu2); + assertNotNull(icu3); collector.initCollector(javaProject); collector.collect(icu); collector.collect(icu2); + collector.collect(icu3); collector.resolveRelations(); processor.modify(javaProject, collector.getMapCUs_Info(), false); // @@ -137,6 +141,8 @@ checkItem("Passport"); //$NON-NLS-1$ checkItem("Person"); //$NON-NLS-1$ checkItem("Staff"); //$NON-NLS-1$ + checkItem("FotoXPerson"); //$NON-NLS-1$ + checkItem("PersonXFoto"); //$NON-NLS-1$ } protected void checkItem(String strCheckItem) {