db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r467440 - in /db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin: CompanyFactoryAbstractImpl.java Employee.java IEmployee.java
Date Tue, 24 Oct 2006 19:00:53 GMT
Author: mbo
Date: Tue Oct 24 12:00:52 2006
New Revision: 467440

URL: http://svn.apache.org/viewvc?view=rev&rev=467440
Log:
JDO-439: companyMapWithoutJoin.conf failiure: unexpected map SCO read from database
Add getter/setter method for the role field in Employee, IEmployee and call the setter in
the factory.

Modified:
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java?view=diff&rev=467440&r1=467439&r2=467440
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
(original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
Tue Oct 24 12:00:52 2006
@@ -87,6 +87,7 @@
         result.setMiddlename(middle);
         result.setBirthdate(born);
         result.setHiredate(hired);
+        result.setRole(role);
         result.setSalary(sal);
         return result;
     }
@@ -102,6 +103,7 @@
         result.setMiddlename(middle);
         result.setBirthdate(born);
         result.setHiredate(hired);
+        result.setRole(role);
         result.setWage(wage);
         return result;
     }

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java?view=diff&rev=467440&r1=467439&r2=467440
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
(original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
Tue Oct 24 12:00:52 2006
@@ -56,6 +56,7 @@
      * @param middlename The middle name of the employee.
      * @param birthdate The birth date of the employee.
      * @param hiredate The date that the employee was hired.
+     * @param role The role of the employee.
      */
     public Employee(long personid, String firstname, String lastname, 
                     String middlename, Date birthdate,
@@ -98,6 +99,22 @@
         this.weeklyhours = weeklyhours;
     }
 
+    /** 
+     * Get the role of the employee.
+     * @return The role of th employee.
+     */ 
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Set the role of the employee.
+     * @param role The role of the employee.
+     */
+    public void setRole(String role) {
+        this.role=role;
+    }
+
     /**
      * Get the employee's department.
      * @return The department associated with the employee.
@@ -303,6 +320,7 @@
         rc.append(super.getFieldRepr());
         rc.append(", hired ").append(formatter.format(hiredate));
         rc.append(", weeklyhours ").append(weeklyhours);
+        rc.append(", role ").append(role);
         return rc.toString();
     }
 
@@ -324,6 +342,7 @@
         return super.deepCompareFields(otherEmp, helper) &
             helper.equals(hiredate, otherEmp.getHiredate(),  where + ".hiredate") &
             helper.closeEnough(weeklyhours, otherEmp.getWeeklyhours(), where + ".weeklyhours")
&
+            helper.equals(role, otherEmp.getRole(),  where + ".role") &
             helper.deepEquals(department, otherEmp.getDepartment(), where + ".department")
&
             helper.deepEquals(fundingDept, otherEmp.getFundingDept(), where + ".fundingDept")
&
             helper.deepEquals(manager, otherEmp.getManager(), where + ".manager") &

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java?view=diff&rev=467440&r1=467439&r2=467440
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java
(original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/IEmployee.java
Tue Oct 24 12:00:52 2006
@@ -28,6 +28,7 @@
 
     Date getHiredate();
     double getWeeklyhours();
+    String getRole();
     IDepartment getDepartment();
     IDepartment getFundingDept();
     IEmployee getManager();
@@ -39,6 +40,7 @@
     
     void setHiredate(Date hiredate);
     void setWeeklyhours(double weeklyhours);
+    void setRole(String role);
     void setDepartment(IDepartment department);
     void setFundingDept(IDepartment department);
     void setManager(IEmployee manager);



Mime
View raw message