From 2f3ef42f4f30c2c85490538e76fccdce471114f6 Mon Sep 17 00:00:00 2001 From: Fay Wang Date: Wed, 4 Mar 2009 23:26:51 +0000 Subject: [PATCH] OPENJPA-937: back off test case. Will check it in later. git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@750225 13f79535-47bb-0310-9956-ffa450edef68 --- .../embed/attrOverrides/Address.java | 12 +- .../embed/attrOverrides/AddressXml.java | 17 -- .../attrOverrides/TestAssocOverrides.java | 192 ------------------ 3 files changed, 1 insertion(+), 220 deletions(-) delete mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java index ac3dadf17..c7f4da445 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/Address.java @@ -20,10 +20,8 @@ package org.apache.openjpa.persistence.embed.attrOverrides; import javax.persistence.*; -@Entity -@Table(name="ADDR_ATTROVER") +@Embeddable public class Address { - @Id int id; @Column(length = 20) protected String street; @Column(length = 20) @@ -32,14 +30,6 @@ public class Address { protected String state; @Embedded protected Zipcode zipcode; - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - public String getStreet() { return street; } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AddressXml.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AddressXml.java index 76f8213b6..1bb399d54 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AddressXml.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/AddressXml.java @@ -19,27 +19,10 @@ package org.apache.openjpa.persistence.embed.attrOverrides; public class AddressXml { - protected int id; protected String street; protected String city; protected String state; protected ZipcodeXml zipcode; - - public ZipcodeXml getZipcode() { - return zipcode; - } - - public void setZipcode(ZipcodeXml zipcode) { - this.zipcode = zipcode; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } public String getStreet() { return street; diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java deleted file mode 100644 index 3e08bc051..000000000 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAssocOverrides.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openjpa.persistence.embed.attrOverrides; - -import java.util.Collection; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; - -import org.apache.openjpa.persistence.test.SQLListenerTestCase; - -public class TestAssocOverrides extends SQLListenerTestCase { - public int numEmployees = 2; - public int numPhoneNumbers = numEmployees + 1; - public int numEmployeesPerPhoneNumber = 2; - public int numPhoneNumbersPerEmployee = 2; - public int numJobsPerEmployee = 2; - public int empId = 1; - public int phoneId = 1; - public int addrId = 1; - public int pmId = 1; - - public void setUp() throws Exception { - super.setUp(DROP_TABLES, Address.class, ContactInfo.class, - EmergencyContactInfo.class, Employee.class, JobInfo.class, - PhoneNumber.class, ProgramManager.class, Zipcode.class); - } - - public void testAssocOverride1() { - sql.clear(); - createObj1(); - findObj1(); - queryObj1(); - assertMappingOverrides("EMPPHONES"); - assertMappingOverrides("EMP_ATTROVER"); - assertMappingOverrides("EMPLOYEE_JOBINFOS"); - } - - public void createObj1() { - EntityManager em = emf.createEntityManager(); - EntityTransaction tran = em.getTransaction(); - for (int i = 0; i < numEmployees; i++) - createEmployee(em, empId++); - tran.begin(); - em.flush(); - tran.commit(); - em.close(); - } - - public Employee createEmployee(EntityManager em, int id) { - Employee e = new Employee(); - e.setEmpId(id); - ContactInfo contactInfo = new ContactInfo(); - for (int i = 0; i < numPhoneNumbersPerEmployee; i++) { - PhoneNumber phoneNumber = createPhoneNumber(em); - contactInfo.addPhoneNumber(phoneNumber); - e.setContactInfo(contactInfo); - phoneNumber.addEmployees(e); - em.persist(phoneNumber); - } - Address addr = new Address(); - addr.setId(addrId++); - addr.setCity("city_" + addr.getId()); - addr.setState("state_" + addr.getId()); - addr.setStreet("street_" + addr.getId()); - Zipcode zip = new Zipcode(); - zip.setZip("zip_" + addr.getId()); - zip.setPlusFour("+4_" + addr.getId()); - addr.setZipcode(zip); - em.persist(addr); - contactInfo.setAddress(addr); - - EmergencyContactInfo ecInfo = new EmergencyContactInfo(); - ecInfo.setFName("fName_" + id); - ecInfo.setLName("lName_" + id); - Address eaddr = new Address(); - eaddr.setId(addrId++); - eaddr.setCity("city_" + eaddr.getId()); - eaddr.setState("state_" + eaddr.getId()); - eaddr.setStreet("street_" + eaddr.getId()); - Zipcode ezip = new Zipcode(); - ezip.setZip("zip_" + eaddr.getId()); - ezip.setPlusFour("+4_" + eaddr.getId()); - eaddr.setZipcode(ezip); - ecInfo.setAddress(eaddr); - contactInfo.setEmergencyContactInfo(ecInfo); - PhoneNumber phoneNumber = createPhoneNumber(em); - ecInfo.setPhoneNumber(phoneNumber); - em.persist(eaddr); - - for (int i = 0; i < numJobsPerEmployee; i++) { - JobInfo job = new JobInfo(); - job.setJobDescription("job_" + id + "_" + i); - ProgramManager pm = new ProgramManager(); - pm.setId(pmId++); - pm.addManage(e); - em.persist(pm); - job.setProgramManager(pm); - e.addJobInfo(job); - } - em.persist(e); - return e; - } - - public PhoneNumber createPhoneNumber(EntityManager em) { - PhoneNumber p = new PhoneNumber(); - p.setNumber(phoneId++); - em.persist(p); - return p; - } - - public void findObj1() { - EntityManager em = emf.createEntityManager(); - Employee e = em.find(Employee.class, 1); - assertEmployee(e); - em.close(); - } - - public void queryObj1() { - EntityManager em = emf.createEntityManager(); - EntityTransaction tran = em.getTransaction(); - tran.begin(); - Query q = em.createQuery("select e from Employee e"); - List es = q.getResultList(); - for (Employee e : es){ - assertEmployee(e); - } - tran.commit(); - em.close(); - } - - public void assertEmployee(Employee e) { - int id = e.getEmpId(); - ContactInfo c = e.getContactInfo(); - List phones = c.getPhoneNumbers(); - for (PhoneNumber p : phones) { - assertPhoneNumber(p, e.getEmpId()); - } - } - - public void assertPhoneNumber(PhoneNumber p, int empId) { - int number = p.getNumber(); - Collection es = p.getEmployees(); - for (Employee e: es) { - assertEquals(empId, e.getEmpId()); - } - } - - public void assertMappingOverrides(String tableName) { - for (String sqlStr : sql) { - if (sqlStr.toUpperCase().indexOf("CREATE TABLE " + tableName + " (") != -1) { - if (tableName.equals("EMPPHONES")) { - if (sqlStr.indexOf("EMP") == -1 || - sqlStr.indexOf("PHONE") == -1) - fail(); - } else if (tableName.equals("EMP_ATTROVER")) { - System.out.println("sql=" + sqlStr); - if (sqlStr.indexOf("EMP_ADDR") == -1 || - sqlStr.indexOf("EMERGENCY_FNAME") == -1 || - sqlStr.indexOf("EMERGENCY_LNAME") == -1 || - sqlStr.indexOf("EMERGENCY_ADDR") == -1 || - sqlStr.indexOf("EMERGENCY_PHONE") == -1) - fail(); - } else if (tableName.equals("EMP_ATTROVER_jobInfos")) { - if (sqlStr.indexOf("JOB_KEY") == -1 || - sqlStr.indexOf("JOB_DESC") == -1 || - sqlStr.indexOf("PROGRAM_MGR") == -1) - fail(); - } - } - } - } - -} \ No newline at end of file