Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[3898] trunk/nhibernate/src/NHibernate.Test
|
From: <fab...@us...> - 2008-11-08 15:58:16
|
Revision: 3898
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3898&view=rev
Author: fabiomaulo
Date: 2008-11-08 15:58:07 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
Fix NH-1551 (better coverage for Oracle; by Jaroslav Mart?\195?\161sek)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/GeneratedTest/PartiallyGeneratedComponentTest.cs
trunk/nhibernate/src/NHibernate.Test/GeneratedTest/TriggerGeneratedValuesWithCachingTest.cs
trunk/nhibernate/src/NHibernate.Test/GeneratedTest/TriggerGeneratedValuesWithoutCachingTest.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1039/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1408/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH364/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH732/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH732/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH940/Mappings.hbm.xml
trunk/nhibernate/src/NHibernate.Test/TypeParameters/TypeParameterTest.cs
Modified: trunk/nhibernate/src/NHibernate.Test/GeneratedTest/PartiallyGeneratedComponentTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/GeneratedTest/PartiallyGeneratedComponentTest.cs 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/GeneratedTest/PartiallyGeneratedComponentTest.cs 2008-11-08 15:58:07 UTC (rev 3898)
@@ -21,7 +21,7 @@
protected override bool AppliesTo(Dialect.Dialect dialect)
{
- return dialect is MsSql2000Dialect || dialect is FirebirdDialect;
+ return dialect is MsSql2000Dialect || dialect is FirebirdDialect || dialect is Oracle9Dialect;
}
[Test]
Modified: trunk/nhibernate/src/NHibernate.Test/GeneratedTest/TriggerGeneratedValuesWithCachingTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/GeneratedTest/TriggerGeneratedValuesWithCachingTest.cs 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/GeneratedTest/TriggerGeneratedValuesWithCachingTest.cs 2008-11-08 15:58:07 UTC (rev 3898)
@@ -17,7 +17,7 @@
protected override bool AppliesTo(Dialect.Dialect dialect)
{
- return dialect is MsSql2000Dialect;
+ return dialect is MsSql2000Dialect || dialect is Oracle9Dialect;
}
}
}
Modified: trunk/nhibernate/src/NHibernate.Test/GeneratedTest/TriggerGeneratedValuesWithoutCachingTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/GeneratedTest/TriggerGeneratedValuesWithoutCachingTest.cs 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/GeneratedTest/TriggerGeneratedValuesWithoutCachingTest.cs 2008-11-08 15:58:07 UTC (rev 3898)
@@ -17,7 +17,7 @@
protected override bool AppliesTo(Dialect.Dialect dialect)
{
- return dialect is MsSql2000Dialect;
+ return dialect is MsSql2000Dialect || dialect is Oracle9Dialect;
}
protected override string CacheConcurrencyStrategy
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1039/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1039/Mappings.hbm.xml 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1039/Mappings.hbm.xml 2008-11-08 15:58:07 UTC (rev 3898)
@@ -13,7 +13,7 @@
<dynamic-component name="Properties">
<set name="Phones" table="NH1039_Phone">
<key column="PersonId"/>
- <element column="Number" type="string"/>
+ <element column="`Number`" type="string"/>
</set>
</dynamic-component>
</class>
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1408/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1408/Mappings.hbm.xml 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1408/Mappings.hbm.xml 2008-11-08 15:58:07 UTC (rev 3898)
@@ -6,7 +6,7 @@
<class name="DbResource" table="Resources">
<cache usage="nonstrict-read-write" />
<id name="Oid" column="ID">
- <generator class="identity"/>
+ <generator class="native"/>
</id>
<discriminator column="Type" type="String(25)" not-null="true" />
<version name="Version" column="Version" />
@@ -27,7 +27,7 @@
<class name="DbResourceKey" table="ResourceKeys">
<cache usage="nonstrict-read-write" />
<id name="Oid" column="ID">
- <generator class="identity"/>
+ <generator class="native"/>
</id>
<version name="Version" column="Version" />
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/Mappings.hbm.xml 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1413/Mappings.hbm.xml 2008-11-08 15:58:07 UTC (rev 3898)
@@ -5,7 +5,7 @@
<class name="Foo" table="XFoos">
<id name="Oid" column="ID">
- <generator class="identity"/>
+ <generator class="native"/>
</id>
<version name="Version" column="Version" />
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH364/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH364/Mappings.hbm.xml 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH364/Mappings.hbm.xml 2008-11-08 15:58:07 UTC (rev 3898)
@@ -37,7 +37,7 @@
<id name="Id">
<generator class="native"/>
</id>
- <property name="Number"/>
+ <property name="Number" column="`Number`"/>
<idbag name="Items" table="InvoiceItem364" lazy="true" access="field.pascalcase-underscore">
<collection-id column="Id" type="Int32">
<generator class="native"/>
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH732/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH732/Fixture.cs 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH732/Fixture.cs 2008-11-08 15:58:07 UTC (rev 3898)
@@ -2,6 +2,7 @@
using System.Data;
using Iesi.Collections.Generic;
using NHibernate;
+using NHibernate.Dialect;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;
using NUnit.Framework;
@@ -11,6 +12,12 @@
[TestFixture]
public class Fixture : BugTestCase
{
+
+ protected override bool AppliesTo(Dialect.Dialect dialect)
+ {
+ return dialect is MsSql2000Dialect;
+ }
+
[Test]
public void CaseInsensitiveId()
{
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH732/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH732/Mappings.hbm.xml 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH732/Mappings.hbm.xml 2008-11-08 15:58:07 UTC (rev 3898)
@@ -15,7 +15,7 @@
</class>
<class name="UserToRole">
<id name="Id">
- <generator class="identity"/>
+ <generator class="native"/>
</id>
<many-to-one class="User" column="UserName"
name="User"/>
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH940/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH940/Mappings.hbm.xml 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH940/Mappings.hbm.xml 2008-11-08 15:58:07 UTC (rev 3898)
@@ -2,7 +2,7 @@
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
namespace="NHibernate.Test.NHSpecificTest.NH940" assembly="NHibernate.Test">
<class name="A">
- <id name="Id" column="uid" type="Int64">
+ <id name="Id" column="`uid`" type="Int64">
<generator class="increment"/>
</id>
@@ -10,7 +10,7 @@
</class>
<class name="B">
- <id name="Id" column="uid" type="Int64">
+ <id name="Id" column="`uid`" type="Int64">
<generator class="increment"/>
</id>
</class>
Modified: trunk/nhibernate/src/NHibernate.Test/TypeParameters/TypeParameterTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/TypeParameters/TypeParameterTest.cs 2008-11-08 15:24:29 UTC (rev 3897)
+++ trunk/nhibernate/src/NHibernate.Test/TypeParameters/TypeParameterTest.cs 2008-11-08 15:58:07 UTC (rev 3898)
@@ -70,7 +70,7 @@
"Default value should have been mapped to null");
Assert.IsTrue(reader.GetValue(reader.GetOrdinal("VALUE_TWO")) == DBNull.Value,
"Default value should have been mapped to null");
- Assert.AreEqual(reader.GetInt32(reader.GetOrdinal("VALUE_THREE")), 5,
+ Assert.AreEqual(Convert.ToInt32(reader.GetValue(reader.GetOrdinal("VALUE_THREE"))), 5,
"Non-Default value should not be changed");
Assert.IsTrue(reader.GetValue(reader.GetOrdinal("VALUE_FOUR")) == DBNull.Value,
"Default value should have been mapped to null");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
