fix test case problem for MySQL

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@811876 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Fay Wang 2009-09-06 20:29:15 +00:00
parent f45899eee8
commit e33f83901f
16 changed files with 70 additions and 42 deletions

View File

@ -55,8 +55,10 @@ public class FieldSub extends AbstractMappedSuperProperty {
public boolean equals(Object obj) {
if (obj instanceof FieldSub) {
FieldSub ps = (FieldSub)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -52,8 +52,10 @@ public class FieldSub2 extends MappedSuperProperty {
public boolean equals(Object obj) {
if (obj instanceof FieldSub2) {
FieldSub2 ps = (FieldSub2)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -54,8 +54,10 @@ public class FieldSub3 extends SuperPropertyEntity {
public boolean equals(Object obj) {
if (obj instanceof FieldSub3) {
FieldSub3 ps = (FieldSub3)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -59,8 +59,10 @@ public class MixedFieldSub extends MixedMappedSuper {
public boolean equals(Object obj) {
if (obj instanceof MixedFieldSub) {
MixedFieldSub ps = (MixedFieldSub)obj;
return super.equals(obj) &&
getCreateDate().equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -55,8 +55,10 @@ public class PropertySub extends AbstractMappedSuperField {
public boolean equals(Object obj) {
if (obj instanceof PropertySub) {
PropertySub ps = (PropertySub)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -51,8 +51,10 @@ public class PropertySub2 extends MappedSuperField {
public boolean equals(Object obj) {
if (obj instanceof PropertySub2) {
PropertySub2 ps = (PropertySub2)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -54,8 +54,10 @@ public class PropertySub3 extends SuperFieldEntity {
public boolean equals(Object obj) {
if (obj instanceof PropertySub3) {
PropertySub3 ps = (PropertySub3)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -241,7 +241,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
(PropertySub)qry.getSingleResult();
assertEquals(ps, ps2);
assertEquals(ps2.getName(), "AbsMappedSuperName");
assertEquals(ps2.getCreateDate(), now);
assertEquals(ps2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("PropertySub.badQuery");
@ -290,7 +290,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
(FieldSub)qry.getSingleResult();
assertEquals(fs, fs2);
assertEquals(fs2.getName(), "AbsMappedSuperName");
assertEquals(fs2.getCreateDate(), now);
assertEquals(fs2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("FieldSub.badQuery");
@ -340,7 +340,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
(PropertySub2)qry.getSingleResult();
assertEquals(ps, ps2);
assertEquals(ps2.getName(), "MappedSuperName");
assertEquals(ps2.getCreateDate(), now);
assertEquals(ps2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("PropertySub2.badQuery");
@ -390,7 +390,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
(FieldSub2)qry.getSingleResult();
assertEquals(fs, fs2);
assertEquals(fs2.getName(), "MappedSuperName");
assertEquals(fs2.getCreateDate(), now);
assertEquals(fs2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("FieldSub2.badQuery");
@ -442,7 +442,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
(MixedFieldSub)qry.getSingleResult();
assertEquals(fs, fs2);
assertEquals(fs2.getName(), "MixedMappedSuperName");
assertEquals(fs2.getCreateDate(), now);
assertEquals(fs2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("MixedFieldSub.badQuery");
@ -497,7 +497,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
(FieldSub3)qry.getSingleResult();
assertEquals(fs, fs2);
assertEquals(fs2.getName(), "EntitySuperName");
assertEquals(fs2.getCreateDate(), now);
assertEquals(fs2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("FieldSub3.badQuery");
@ -576,7 +576,7 @@ public class TestExplicitAccess extends SingleEMFTestCase {
(PropertySub3)qry.getSingleResult();
assertEquals(ps, ps2);
assertEquals(ps2.getName(), "EntitySuperName");
assertEquals(ps2.getCreateDate(), now);
assertEquals(ps2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("PropertySub3.badQuery");

View File

@ -234,7 +234,7 @@ public class TestXMLExplicitAccess extends SingleEMFTestCase {
(XMLPropertySub)qry.getSingleResult();
assertEquals(ps, ps2);
assertEquals(ps2.getName(), "AbsMappedSuperName");
assertEquals(ps2.getCreateDate(), now);
assertEquals(ps2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("XMLPropertySub.badQuery");
@ -290,7 +290,7 @@ public class TestXMLExplicitAccess extends SingleEMFTestCase {
(XMLFieldSub)qry.getSingleResult();
assertEquals(fs, fs2);
assertEquals(fs2.getName(), "AbsMappedSuperName");
assertEquals(fs2.getCreateDate(), now);
assertEquals(fs2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("XMLFieldSub.badQuery");
@ -347,7 +347,7 @@ public class TestXMLExplicitAccess extends SingleEMFTestCase {
(XMLPropertySub2)qry.getSingleResult();
assertEquals(ps, ps2);
assertEquals(ps2.getName(), "MappedSuperName");
assertEquals(ps2.getCreateDate(), now);
assertEquals(ps2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("XMLPropertySub2.badQuery");
@ -398,7 +398,7 @@ public class TestXMLExplicitAccess extends SingleEMFTestCase {
(XMLFieldSub2)qry.getSingleResult();
assertEquals(fs, fs2);
assertEquals(fs2.getName(), "MappedSuperName");
assertEquals(fs2.getCreateDate(), now);
assertEquals(fs2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("XMLFieldSub2.badQuery");
@ -450,7 +450,7 @@ public class TestXMLExplicitAccess extends SingleEMFTestCase {
(XMLMixedFieldSub)qry.getSingleResult();
assertEquals(fs, fs2);
assertEquals(fs2.getName(), "XMLMixedMappedSuperName");
assertEquals(fs2.getCreateDate(), now);
assertEquals(fs2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("XMLMixedFieldSub.badQuery");
@ -505,7 +505,7 @@ public class TestXMLExplicitAccess extends SingleEMFTestCase {
(XMLFieldSub3)qry.getSingleResult();
assertEquals(fs, fs2);
assertEquals(fs2.getName(), "EntitySuperName");
assertEquals(fs2.getCreateDate(), now);
assertEquals(fs2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("XMLFieldSub3.badQuery");
@ -584,7 +584,7 @@ public class TestXMLExplicitAccess extends SingleEMFTestCase {
(XMLPropertySub3)qry.getSingleResult();
assertEquals(ps, ps2);
assertEquals(ps2.getName(), "EntitySuperName");
assertEquals(ps2.getCreateDate(), now);
assertEquals(ps2.getCreateDate().toString(), now.toString());
try {
qry = em.createNamedQuery("XMLPropertySub3.badQuery");

View File

@ -37,8 +37,10 @@ public class XMLFieldSub extends XMLAbstractMappedSuperProperty {
public boolean equals(Object obj) {
if (obj instanceof XMLFieldSub) {
XMLFieldSub ps = (XMLFieldSub)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -35,8 +35,10 @@ public class XMLFieldSub2 extends XMLMappedSuperProperty {
public boolean equals(Object obj) {
if (obj instanceof XMLFieldSub2) {
XMLFieldSub2 ps = (XMLFieldSub2)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -35,8 +35,10 @@ public class XMLFieldSub3 extends XMLSuperPropertyEntity {
public boolean equals(Object obj) {
if (obj instanceof XMLFieldSub3) {
XMLFieldSub3 ps = (XMLFieldSub3)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -37,8 +37,10 @@ public class XMLMixedFieldSub extends XMLMixedMappedSuper {
public boolean equals(Object obj) {
if (obj instanceof XMLMixedFieldSub) {
XMLMixedFieldSub ps = (XMLMixedFieldSub)obj;
return super.equals(obj) &&
getCreateDate().equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -37,8 +37,10 @@ public class XMLPropertySub extends XMLAbstractMappedSuperField {
public boolean equals(Object obj) {
if (obj instanceof XMLPropertySub) {
XMLPropertySub ps = (XMLPropertySub)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -33,8 +33,10 @@ public class XMLPropertySub2 extends XMLMappedSuperField {
public boolean equals(Object obj) {
if (obj instanceof XMLPropertySub2) {
XMLPropertySub2 ps = (XMLPropertySub2)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}

View File

@ -35,8 +35,10 @@ public class XMLPropertySub3 extends XMLSuperFieldEntity {
public boolean equals(Object obj) {
if (obj instanceof XMLPropertySub3) {
XMLPropertySub3 ps = (XMLPropertySub3)obj;
return super.equals(obj) &&
crtDate.equals(ps.getCreateDate());
String crtDateString = ps.getCreateDate() != null ? ps.getCreateDate().toString() : null;
if (!crtDate.toString().equals(crtDateString))
return false;
return super.equals(obj);
}
return false;
}