Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate EntityOne.cs EntityOne.hbm.xml EntityTwo.cs EntityTwo.hbm.xml
|
From: Chris M. <cm...@us...> - 2006-08-17 20:28:35
|
User: cmicali
Date: 06/08/17 13:28:34
Modified: andromda-nhibernate/src/test/expected cartridge-output.zip
andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate
EntityOne.cs EntityOne.hbm.xml EntityTwo.cs
EntityTwo.hbm.xml
Log:
- Fixed test failures
Revision Changes Path
1.3 +22 -17 cartridges/andromda-nhibernate/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +4 -4 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs
Index: EntityOne.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EntityOne.cs 15 Aug 2006 22:48:48 -0000 1.1
+++ EntityOne.cs 17 Aug 2006 20:28:34 -0000 1.2
@@ -33,7 +33,7 @@
#region Attributes and Associations
private long _longAttribute;
- private org.andromda.cartridges.nhibernate.string _stringAttribute;
+ private String _stringAttribute;
private DateTime? _dateAttribute;
private long? _id;
private Iesi.Collections.ISet _entityTwos = new Iesi.Collections.HashedSet();
@@ -54,7 +54,7 @@
/// <summary>
///
/// </summary>
- public virtual org.andromda.cartridges.nhibernate.string StringAttribute
+ public virtual String StringAttribute
{
get { return _stringAttribute; }
set { this._stringAttribute = value; }
@@ -111,11 +111,11 @@
{
return true;
}
- if (GetType() != obj.GetType())
+ EntityOne that = (EntityOne)obj;
+ if (that == null)
{
return false;
}
- EntityOne that = (EntityOne)obj;
if (this.Id == null || that.Id == null || !this.Id.Equals(that.Id))
{
return false;
1.2 +2 -2 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.hbm.xml
Index: EntityOne.hbm.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EntityOne.hbm.xml 15 Aug 2006 22:48:48 -0000 1.1
+++ EntityOne.hbm.xml 17 Aug 2006 20:28:34 -0000 1.2
@@ -29,8 +29,8 @@
<column name="LONG_ATTRIBUTE" not-null="true" unique="false" sql-type="NUMERIC(19,0)"/>
</property>
- <property name="StringAttribute" type="long">
- <column name="STRING_ATTRIBUTE" not-null="true" unique="false" sql-type="org::andromda::cartridges::nhibernate::string"/>
+ <property name="StringAttribute" type="String">
+ <column name="STRING_ATTRIBUTE" not-null="true" unique="false" sql-type="VARCHAR(255)"/>
</property>
<property name="DateAttribute" type="DateTime?">
1.2 +4 -4 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.cs
Index: EntityTwo.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EntityTwo.cs 15 Aug 2006 22:48:48 -0000 1.1
+++ EntityTwo.cs 17 Aug 2006 20:28:34 -0000 1.2
@@ -32,7 +32,7 @@
#region Attributes and Associations
- private org.andromda.cartridges.nhibernate.string _title;
+ private String _title;
private long? _id;
private org.andromda.cartridges.nhibernate.EntityOne _entityOne;
@@ -43,7 +43,7 @@
/// <summary>
///
/// </summary>
- public virtual org.andromda.cartridges.nhibernate.string Title
+ public virtual String Title
{
get { return _title; }
set { this._title = value; }
@@ -86,11 +86,11 @@
{
return true;
}
- if (GetType() != obj.GetType())
+ EntityTwo that = (EntityTwo)obj;
+ if (that == null)
{
return false;
}
- EntityTwo that = (EntityTwo)obj;
if (this.Id == null || that.Id == null || !this.Id.Equals(that.Id))
{
return false;
1.2 +2 -2 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.hbm.xml
Index: EntityTwo.hbm.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityTwo.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EntityTwo.hbm.xml 15 Aug 2006 22:48:48 -0000 1.1
+++ EntityTwo.hbm.xml 17 Aug 2006 20:28:34 -0000 1.2
@@ -25,8 +25,8 @@
<version name="version" type="Int32" column="version"/>
- <property name="Title" type="$fullyQualifiedPropertyType">
- <column name="TITLE" not-null="true" unique="false" sql-type="org::andromda::cartridges::nhibernate::string"/>
+ <property name="Title" type="String">
+ <column name="TITLE" not-null="true" unique="false" sql-type="VARCHAR(255)"/>
</property>
<many-to-one name="EntityOne" class="org.andromda.cartridges.nhibernate.EntityOneImpl, ${coreAssemblyName}" outer-join="auto" foreign-key="ENTITY_TWO_ENTITY_ONE_FKC">
|
