You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2005/12/17 02:39:11 UTC
cvs commit: db-ojb/src/test/org/apache/ojb repository_junit.xml
arminw 2005/12/16 17:39:11
Modified: src/test/org/apache/ojb/broker Tag: OJB_1_0_RELEASE
ObjectRepository.java PersistenceBrokerTest.java
src/test/org/apache/ojb Tag: OJB_1_0_RELEASE
repository_junit.xml
Log:
update test and improve test classes
Revision Changes Path
No revision
No revision
1.6.2.2 +47 -60 db-ojb/src/test/org/apache/ojb/broker/ObjectRepository.java
Index: ObjectRepository.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ObjectRepository.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- ObjectRepository.java 27 Jul 2004 00:31:50 -0000 1.6.2.1
+++ ObjectRepository.java 17 Dec 2005 01:39:10 -0000 1.6.2.2
@@ -149,14 +149,33 @@
public static abstract class AB implements Serializable
{
- /** the special attribute telling OJB which concrete class this Object has.
+ private int id;
+ /**
+ * This special attribute telling OJB which concrete class this Object has.
* NOTE: this attribute MUST be called ojbConcreteClass
*/
- protected String ojbConcreteClass;
+ private String ojbConcreteClass;
- public String getConcreteClass()
+ protected AB()
{
- return ojbConcreteClass;
+ // this guarantee that always the correct class name will be set
+ this.ojbConcreteClass = this.getClass().getName();
+ }
+
+ protected AB(int id)
+ {
+ this();
+ this.id = id;
+ }
+
+ public int getId()
+ {
+ return id;
+ }
+
+ public void setId(int id)
+ {
+ this.id = id;
}
public String getOjbConcreteClass()
@@ -176,19 +195,17 @@
public static class A extends AB implements AAlone
{
- int id;
- int someValue;
- String someAField;
+ private int someValue;
+ private String someAField;
public A()
{
- setOjbConcreteClass(A.class.getName());
+ super();
}
- public A(int pId, String pOjbConcreteClass, int pSomeValue)
+ public A(int pId, int pSomeValue)
{
- this.id = pId;
- this.ojbConcreteClass = pOjbConcreteClass;
+ super(pId);
this.someValue = pSomeValue;
}
@@ -202,16 +219,6 @@
this.someAField = someAField;
}
- public int getId()
- {
- return id;
- }
-
- public void setId(int id)
- {
- this.id = id;
- }
-
public int getSomeValue()
{
return someValue;
@@ -225,19 +232,17 @@
public static class B extends AB
{
- int id;
- int someValue;
- String someBField;
+ private int someValue;
+ private String someBField;
public B()
{
- setOjbConcreteClass(B.class.getName());
+ super();
}
- public B(int pId, String pOjbConcreteClass, int pSomeValue)
+ public B(int pId, int pSomeValue)
{
- this.id = pId;
- this.ojbConcreteClass = pOjbConcreteClass;
+ super(pId);
this.someValue = pSomeValue;
}
@@ -251,16 +256,6 @@
this.someBField = someBField;
}
- public int getId()
- {
- return id;
- }
-
- public void setId(int id)
- {
- this.id = id;
- }
-
public int getSomeValue()
{
return someValue;
@@ -277,35 +272,29 @@
public B1()
{
super();
- setOjbConcreteClass(B1.class.getName());
}
- public B1(int pId, String pOjbConcreteClass, int pSomeValue)
+ public B1(int pId, int pSomeValue)
{
- super(pId, pOjbConcreteClass, pSomeValue);
+ super(pId, pSomeValue);
}
}
public static class C implements Serializable
{
- int id;
- String ojbConcreteClass;
- int someValue;
-
- public String getConcreteClass()
- {
- return ojbConcreteClass;
- }
+ private String ojbConcreteClass;
+ private int id;
+ private int someValue;
public C()
{
- ojbConcreteClass = C.class.getName();
+ ojbConcreteClass = this.getClass().getName();
}
- public C(int pId, String pOjbConcreteClass, int pSomeValue)
+ public C(int pId, int pSomeValue)
{
+ this();
this.id = pId;
- this.ojbConcreteClass = pOjbConcreteClass;
this.someValue = pSomeValue;
}
@@ -344,21 +333,19 @@
{
public D()
{
- ojbConcreteClass = D.class.getName();
+ super();
}
- public D(int pId, String pOjbConcreteClass, int pSomeValue)
+ public D(int pId, int pSomeValue)
{
- this.id = pId;
- this.ojbConcreteClass = pOjbConcreteClass;
- this.someValue = pSomeValue;
+ super(pId, pSomeValue);
}
}
public static class E implements Serializable
{
- Integer id;
- protected int someSuperValue;
+ private Integer id;
+ private int someSuperValue;
public Integer getId()
{
1.42.2.7 +10 -14 db-ojb/src/test/org/apache/ojb/broker/PersistenceBrokerTest.java
Index: PersistenceBrokerTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/PersistenceBrokerTest.java,v
retrieving revision 1.42.2.6
retrieving revision 1.42.2.7
diff -u -r1.42.2.6 -r1.42.2.7
--- PersistenceBrokerTest.java 10 Oct 2005 00:35:43 -0000 1.42.2.6
+++ PersistenceBrokerTest.java 17 Dec 2005 01:39:10 -0000 1.42.2.7
@@ -511,19 +511,19 @@
// test retrieval by Identity
Criteria crit = new Criteria();
- crit.addEqualTo("id", new Integer(a1.id));
+ crit.addEqualTo("id", new Integer(a1.getId()));
q = QueryFactory.newQuery(ObjectRepository.AB.class, crit);
ab = (ObjectRepository.AB) broker.getObjectByQuery(q);
- assertEquals(ObjectRepository.A.class.getName(), ab.getConcreteClass());
+ assertEquals(ObjectRepository.A.class.getName(), ab.getOjbConcreteClass());
assertEquals(ObjectRepository.A.class, ab.getClass());
crit = new Criteria();
- crit.addEqualTo("id", new Integer(b1.id));
+ crit.addEqualTo("id", new Integer(b1.getId()));
q = QueryFactory.newQuery(ObjectRepository.AB.class, crit);
ab = (ObjectRepository.AB) broker.getObjectByQuery(q);
- assertEquals(ObjectRepository.B.class.getName(), ab.getConcreteClass());
+ assertEquals(ObjectRepository.B.class.getName(), ab.getOjbConcreteClass());
assertEquals(ObjectRepository.B.class, ab.getClass());
// test retrieval of collections
@@ -606,12 +606,8 @@
broker.commitTransaction();
ObjectRepository.C c1 = new ObjectRepository.C();
- // Identity iC1 = new Identity(c1, broker);
ObjectRepository.C c2 = new ObjectRepository.C();
- // Identity iC2 = new Identity(c2, broker);
-
ObjectRepository.D d1 = new ObjectRepository.D();
- // Identity iD1 = new Identity(d1, broker);
broker.beginTransaction();
broker.store(c1);
@@ -623,25 +619,25 @@
// test retrieval by Identity
crit = new Criteria();
- crit.addEqualTo("id", new Integer(c1.id));
+ crit.addEqualTo("id", new Integer(c1.getId()));
q = QueryFactory.newQuery(ObjectRepository.C.class, crit);
candidate = (ObjectRepository.C) broker.getObjectByQuery(q);
- assertEquals(ObjectRepository.C.class.getName(), candidate.getConcreteClass());
+ assertEquals(ObjectRepository.C.class.getName(), candidate.getOjbConcreteClass());
assertEquals(ObjectRepository.C.class, candidate.getClass());
crit = new Criteria();
- crit.addEqualTo("id", new Integer(d1.id));
+ crit.addEqualTo("id", new Integer(d1.getId()));
q = QueryFactory.newQuery(ObjectRepository.C.class, crit);
candidate = (ObjectRepository.C) broker.getObjectByQuery(q);
- assertEquals(ObjectRepository.D.class.getName(), candidate.getConcreteClass());
+ assertEquals(ObjectRepository.D.class.getName(), candidate.getOjbConcreteClass());
assertEquals(ObjectRepository.D.class, candidate.getClass());
crit = new Criteria();
- crit.addEqualTo("id", new Integer(d1.id));
+ crit.addEqualTo("id", new Integer(d1.getId()));
q = QueryFactory.newQuery(ObjectRepository.D.class, crit);
candidate = (ObjectRepository.D) broker.getObjectByQuery(q);
- assertEquals(ObjectRepository.D.class.getName(), candidate.getConcreteClass());
+ assertEquals(ObjectRepository.D.class.getName(), candidate.getOjbConcreteClass());
assertEquals(ObjectRepository.D.class, candidate.getClass());
// test retrieval of collections
No revision
No revision
1.112.2.19 +6 -1 db-ojb/src/test/org/apache/ojb/repository_junit.xml
Index: repository_junit.xml
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit.xml,v
retrieving revision 1.112.2.18
retrieving revision 1.112.2.19
diff -u -r1.112.2.18 -r1.112.2.19
--- repository_junit.xml 6 Dec 2005 15:22:20 -0000 1.112.2.18
+++ repository_junit.xml 17 Dec 2005 01:39:11 -0000 1.112.2.19
@@ -597,6 +597,11 @@
column="VALUE_"
jdbc-type="INTEGER"
/>
+ <field-descriptor
+ name="someBField"
+ column="B_FIELD"
+ jdbc-type="VARCHAR"
+ />
</class-descriptor>
<!-- Definitions for org.apache.ojb.broker.ObjectRepository$C -->
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org