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/31 19:53:41 UTC
cvs commit: db-ojb/src/test/org/apache/ojb/odmg CircularTest.java
arminw 2005/12/31 10:53:41
Modified: src/test/org/apache/ojb/broker/sequence Tag: OJB_1_0_RELEASE
NativeIdentifierTest.java
src/test/org/apache/ojb/broker Tag: OJB_1_0_RELEASE
PathTest.java
ProductGroupWithRemovalAwareCollection.java
src/test/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
CircularTest.java
Log:
fix tests (add getter/setter, fix cast)
Revision Changes Path
No revision
No revision
1.10.2.9 +21 -1 db-ojb/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java
Index: NativeIdentifierTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/sequence/NativeIdentifierTest.java,v
retrieving revision 1.10.2.8
retrieving revision 1.10.2.9
diff -u -r1.10.2.8 -r1.10.2.9
--- NativeIdentifierTest.java 6 Oct 2005 21:01:44 -0000 1.10.2.8
+++ NativeIdentifierTest.java 31 Dec 2005 18:53:41 -0000 1.10.2.9
@@ -1256,6 +1256,16 @@
// id = new Long((long)(Math.random() * Integer.MAX_VALUE));
}
+ public String getOjbConcreteClass()
+ {
+ return ojbConcreteClass;
+ }
+
+ public void setOjbConcreteClass(String ojbConcreteClass)
+ {
+ this.ojbConcreteClass = ojbConcreteClass;
+ }
+
public MainObjectIF getMainObject()
{
return mainObject;
@@ -1325,6 +1335,16 @@
this.refName = refName;
}
+ public String getOjbConcreteClass()
+ {
+ return ojbConcreteClass;
+ }
+
+ public void setOjbConcreteClass(String ojbConcreteClass)
+ {
+ this.ojbConcreteClass = ojbConcreteClass;
+ }
+
public Long getRefIdentifier()
{
return refIdentifier;
No revision
No revision
1.4.2.1 +94 -181 db-ojb/src/test/org/apache/ojb/broker/PathTest.java
Index: PathTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/PathTest.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- PathTest.java 25 Jun 2004 15:58:39 -0000 1.4
+++ PathTest.java 31 Dec 2005 18:53:41 -0000 1.4.2.1
@@ -116,13 +116,13 @@
{
A a = new A(A_OFFSET + A_OFFSET * ia);
broker.store(a);
- System.out.println("A - " + a.getAAttrib());
+ System.out.println("A - " + a.getaAttrib());
for (int ib = 0; ib < NUM_B_PER_A; ib++)
{
B b = new B(A_OFFSET + B_OFFSET * ib);
b.setA(a);
broker.store(b);
- System.out.println("\tB - " + b.getBAttrib());
+ System.out.println("\tB - " + b.getbAttrib());
for (int ic = 0; ic < NUM_C_PER_B; ic++)
{
C c = new C(A_OFFSET + B_OFFSET * ib + C_OFFSET * ic);
@@ -133,8 +133,8 @@
c.setD(d);
broker.store(d);
broker.store(c);
- System.out.println("\t\tC - " + c.getCAttrib());
- System.out.println("\t\t\tD - " + d.getDAttrib());
+ System.out.println("\t\tC - " + c.getcAttrib());
+ System.out.println("\t\t\tD - " + d.getdAttrib());
}
}
for (int ic = 0; ic < NUM_C1_PER_B; ic++)
@@ -145,11 +145,11 @@
{
D d = new D(A_OFFSET + B_OFFSET * ib + C_OFFSET * ic + D_OFFSET * id);
c1.setD(d);
- c1.setC1Attrib(c1.getCAttrib() + 1);
+ c1.setC1Attrib(c1.getcAttrib() + 1);
broker.store(d);
broker.store(c1);
System.out.println("\t\tC1 - " + c1.getC1Attrib());
- System.out.println("\t\t\tD - " + d.getDAttrib());
+ System.out.println("\t\t\tD - " + d.getdAttrib());
}
}
}
@@ -254,7 +254,7 @@
while (itr.hasNext())
{
B b = (B) itr.next();
- System.out.println("Found B: " + b.getId() + " " + b.getBAttrib());
+ System.out.println("Found B: " + b.getId() + " " + b.getbAttrib());
}
}
catch (Throwable t)
@@ -288,7 +288,7 @@
while (itr.hasNext())
{
A a = (A) itr.next();
- System.out.println("Found A: " + a.getId() + " " + a.getAAttrib());
+ System.out.println("Found A: " + a.getId() + " " + a.getaAttrib());
}
}
catch (Throwable t)
@@ -323,7 +323,7 @@
while (itr.hasNext())
{
B b = (B) itr.next();
- System.out.println("Found B: " + b.getId() + " " + b.getBAttrib());
+ System.out.println("Found B: " + b.getId() + " " + b.getbAttrib());
}
}
catch (Throwable t)
@@ -364,7 +364,7 @@
while (itr.hasNext())
{
B b = (B) itr.next();
- System.out.println("Found B: " + b.getId() + " " + b.getBAttrib());
+ System.out.println("Found B: " + b.getId() + " " + b.getbAttrib());
}
}
catch (Throwable t)
@@ -406,7 +406,7 @@
while (itr.hasNext())
{
A a = (A) itr.next();
- System.out.println("Found A: " + a.getId() + " " + a.getAAttrib());
+ System.out.println("Found A: " + a.getId() + " " + a.getaAttrib());
}
}
catch (Throwable t)
@@ -448,7 +448,7 @@
while (itr.hasNext())
{
B b = (B) itr.next();
- System.out.println("Found B: " + b.getId() + " " + b.getBAttrib());
+ System.out.println("Found B: " + b.getId() + " " + b.getbAttrib());
}
}
catch (Throwable t)
@@ -492,7 +492,7 @@
while (itr.hasNext())
{
B b = (B) itr.next();
- System.out.println("Found B: " + b.getId() + " " + b.getBAttrib());
+ System.out.println("Found B: " + b.getId() + " " + b.getbAttrib());
}
}
catch (Throwable t)
@@ -534,7 +534,7 @@
while (itr.hasNext())
{
A a = (A) itr.next();
- System.out.println("Found A: " + a.getId() + " " + a.getAAttrib());
+ System.out.println("Found A: " + a.getId() + " " + a.getaAttrib());
}
}
catch (Throwable t)
@@ -583,7 +583,7 @@
while (itr.hasNext())
{
A a = (A) itr.next();
- System.out.println("Found A: " + a.getId() + " " + a.getAAttrib());
+ System.out.println("Found A: " + a.getId() + " " + a.getaAttrib());
}
}
catch (Throwable t)
@@ -615,7 +615,7 @@
while (itr.hasNext())
{
A a = (A) itr.next();
- System.out.println("Found A: " + a.getId() + " " + a.getAAttrib());
+ System.out.println("Found A: " + a.getId() + " " + a.getaAttrib());
}
}
@@ -637,75 +637,35 @@
this.bSet = new ArrayList();
}
- // make javabeans conform
- public int getaAttrib()
- {
- return aAttrib;
- }
- // make javabeans conform
- public Collection getbSet()
- {
- return bSet;
- }
- // make javabeans conform
- public void setbSet(Collection bSet)
- {
- this.bSet = bSet;
- }
- // make javabeans conform
- public void setaAttrib(int aAttrib)
- {
- this.aAttrib = aAttrib;
- }
-
- /**
- * @return
- */
- public int getAAttrib()
+ public long getId()
{
- return aAttrib;
+ return id;
}
- /**
- * @return
- */
- public Collection getBSet()
+ public void setId(long id)
{
- return bSet;
+ this.id = id;
}
- /**
- * @return
- */
- public long getId()
+ public int getaAttrib()
{
- return id;
+ return aAttrib;
}
- /**
- * @param i
- */
- public void setAAttrib(int i)
+ public void setaAttrib(int aAttrib)
{
- aAttrib = i;
+ this.aAttrib = aAttrib;
}
- /**
- * @param collection
- */
- public void setBSet(Collection collection)
+ public Collection getbSet()
{
- bSet = collection;
+ return bSet;
}
- /**
- * @param l
- */
- public void setId(long l)
+ public void setbSet(Collection bSet)
{
- id = l;
+ this.bSet = bSet;
}
-
}
public static class B
@@ -726,71 +686,55 @@
this.cSet = new ArrayList();
}
- /**
- * @return
- */
- public int getBAttrib()
+ public long getId()
{
- return bAttrib;
+ return id;
}
- /**
- * @return
- */
- public Collection getCSet()
+ public void setId(long id)
{
- return cSet;
+ this.id = id;
}
- /**
- * @return
- */
- public long getId()
+ public long getaId()
{
- return id;
+ return aId;
}
- /**
- * @param i
- */
- public void setBAttrib(int i)
+ public void setaId(long aId)
{
- bAttrib = i;
+ this.aId = aId;
}
- /**
- * @param collection
- */
- public void setCSet(Collection collection)
+ public int getbAttrib()
{
- cSet = collection;
+ return bAttrib;
}
- /**
- * @param l
- */
- public void setId(long l)
+ public void setbAttrib(int bAttrib)
{
- id = l;
+ this.bAttrib = bAttrib;
}
- /**
- * @return
- */
public A getA()
{
return a;
}
- /**
- * @param a
- */
public void setA(A a)
{
this.a = a;
- a.getBSet().add(this);
}
+ public Collection getcSet()
+ {
+ return cSet;
+ }
+
+ public void setcSet(Collection cSet)
+ {
+ this.cSet = cSet;
+ }
}
public static class C
@@ -811,82 +755,71 @@
this.cAttrib = cAttrib;
}
- /**
- * @return
- */
- public int getCAttrib()
- {
- return cAttrib;
- }
-
- /**
- * @return
- */
- public D getD()
- {
- return d;
- }
-
- /**
- * @return
- */
public long getId()
{
return id;
}
- /**
- * @param i
- */
- public void setCAttrib(int i)
+ public void setId(long id)
{
- cAttrib = i;
+ this.id = id;
}
- /**
- * @param collection
- */
- public void setD(D d)
+ public long getbId()
{
- this.d = d;
+ return bId;
}
- /**
- * @param l
- */
- public void setId(long l)
+ public void setbId(long bId)
{
- id = l;
+ this.bId = bId;
}
- /**
- * @return
- */
public B getB()
{
return b;
}
- /**
- * @param b
- */
public void setB(B b)
{
this.b = b;
- b.getCSet().add(this);
}
+ public long getdId()
+ {
+ return dId;
+ }
+
+ public void setdId(long dId)
+ {
+ this.dId = dId;
+ }
+
+ public D getD()
+ {
+ return d;
+ }
+
+ public void setD(D d)
+ {
+ this.d = d;
+ }
+
+ public int getcAttrib()
+ {
+ return cAttrib;
+ }
+
+ public void setcAttrib(int cAttrib)
+ {
+ this.cAttrib = cAttrib;
+ }
}
public static class C1 extends C
{
-
private int c1Attrib;
- /**
- * @param cAttrib
- */
-
public C1()
{
}
@@ -896,22 +829,15 @@
super(cAttrib);
}
- /**
- * @return
- */
public int getC1Attrib()
{
return c1Attrib;
}
- /**
- * @param i
- */
- public void setC1Attrib(int i)
+ public void setC1Attrib(int c1Attrib)
{
- c1Attrib = i;
+ this.c1Attrib = c1Attrib;
}
-
}
public static class D
@@ -928,38 +854,25 @@
this.dAttrib = dAttrib;
}
- /**
- * @return
- */
- public int getDAttrib()
- {
- return dAttrib;
- }
-
- /**
- * @return
- */
public long getId()
{
return id;
}
- /**
- * @param i
- */
- public void setDAttrib(int i)
+ public void setId(long id)
{
- dAttrib = i;
+ this.id = id;
}
- /**
- * @param l
- */
- public void setId(long l)
+ public int getdAttrib()
{
- id = l;
+ return dAttrib;
}
+ public void setdAttrib(int dAttrib)
+ {
+ this.dAttrib = dAttrib;
+ }
}
}
1.1.4.2 +3 -5 db-ojb/src/test/org/apache/ojb/broker/ProductGroupWithRemovalAwareCollection.java
Index: ProductGroupWithRemovalAwareCollection.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ProductGroupWithRemovalAwareCollection.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- ProductGroupWithRemovalAwareCollection.java 4 Dec 2004 14:01:07 -0000 1.1.4.1
+++ ProductGroupWithRemovalAwareCollection.java 31 Dec 2005 18:53:41 -0000 1.1.4.2
@@ -21,6 +21,9 @@
/** the name of a group*/
private String groupName;
+ public ProductGroupWithRemovalAwareCollection()
+ {
+ }
/** return group id*/
public int getId()
@@ -28,17 +31,12 @@
return groupId;
}
-
/** return groupname*/
public String getName()
{
return groupName;
}
- public ProductGroupWithRemovalAwareCollection()
- {
- }
-
/** return List of all Articles in productgroup*/
public RemovalAwareList getAllArticles()
{
No revision
No revision
1.1.2.11 +2 -2 db-ojb/src/test/org/apache/ojb/odmg/CircularTest.java
Index: CircularTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/odmg/CircularTest.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- CircularTest.java 21 Dec 2005 22:31:28 -0000 1.1.2.10
+++ CircularTest.java 31 Dec 2005 18:53:41 -0000 1.1.2.11
@@ -2099,7 +2099,7 @@
}
}
- abstract static class BaseObject
+ public abstract static class BaseObject
{
private Integer id;
private String name;
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org