[Nhibernate-commit] SF.net SVN: nhibernate:[5371] trunk/nhibernate/src/NHibernate.Test

[<jul...@us...>]

Revision: 5371
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5371&view=rev
Author:   julian-maughan
Date:     2011-01-26 15:02:50 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
Attempting to resolve test failures (in r5368 and r5369) by changing NHibernate.Test build script to include JPEG file types as resources. Currently only XML resources are included.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2484/Fixture.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build

Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2484/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2484/Fixture.cs	2011-01-24 17:51:11 UTC (rev 5370)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2484/Fixture.cs	2011-01-26 15:02:50 UTC (rev 5371)
@@ -7,7 +7,7 @@
 
 namespace NHibernate.Test.NHSpecificTest.NH2484
 {
-[TestFixture]
+	[TestFixture]
 	public class Fixture : BugTestCase
 	{
 		protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
@@ -16,7 +16,6 @@
 		}
 
 		[Test]
-		[Ignore("Unable to locate embedded image resource on TeamCity")]
 		public void TestPersistenceOfClassWithUnknownSerializableType()
 		{
 			Assembly assembly = Assembly.Load(MappingsAssembly);
@@ -49,7 +48,6 @@
 		}
 		
 		[Test]
-		[Ignore("Unable to locate embedded image resource on TeamCity")]
 		public void TestPersistenceOfClassWithSerializableType()
 		{
 			Assembly assembly = Assembly.Load(MappingsAssembly);

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build	2011-01-24 17:51:11 UTC (rev 5370)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.build	2011-01-26 15:02:50 UTC (rev 5371)
@@ -1,8 +1,11 @@
 <?xml version="1.0" ?>
 <project name="NHibernate.Test" default="build" xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
+
 	<property name="root.dir" value="../.." />
 	<property name="config.FileName" value="hibernate.cfg.xml" />
+	
 	<include buildfile="${root.dir}/build-common/common-project.xml" />
+	
 	<target name="init" depends="common.init">
 		<property name="assembly.description" value="The Unit Tests for NHibernate." />
 		<property name="assembly.is-cls-compliant" value="false" />
@@ -23,28 +26,32 @@
 			<include name="NHibernate.dll" />
 			<include name="LinFu.DynamicProxy.dll" />
 			<include name="nunit.framework.dll" />
-      <include name="SharpTestsEx.NUnit.dll" />
-      <include name="Antlr3.Runtime.dll" />
+			<include name="SharpTestsEx.NUnit.dll" />
+			<include name="Antlr3.Runtime.dll" />
  			<include name="System.Linq.Dynamic.dll" />
 		</assemblyfileset>
 		<resourcefileset id="project.resources" prefix="NHibernate.Test" dynamicprefix="true">
 			<include name="**/*.xml" />
+			<include name="**/*.jpg" />
 			<exclude name="bin/**/*.xml" />
 		</resourcefileset>
 	</target>
+	
 	<target name="generate-assemblyinfo" depends="init common.generate-assemblyinfo" />
+	
 	<target name="build" depends="init generate-assemblyinfo common.compile-tests">
-
-    <if test="${file::exists(config.FileName)}">
+		<if test="${file::exists(config.FileName)}">
 			<copy file="hibernate.cfg.xml" tofile="${bin.dir}/hibernate.cfg.xml" />
 		</if>
 		<copy file="TestEnbeddedConfig.cfg.xml" tofile="${bin.dir}/TestEnbeddedConfig.cfg.xml" />
-    <copy todir="${bin.dir}/DbScripts">
-      <fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
-        <include name="*.sql" />
-      </fileset>
-    </copy>
-    <copy file="${root.dir}/src/NHibernate.DomainModel/ABC.hbm.xml" tofile="${bin.dir}/ABC.hbm.xml" />
+		<copy todir="${bin.dir}/DbScripts">
+			<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
+				<include name="*.sql" />
+			</fileset>
+		</copy>
+		<copy file="${root.dir}/src/NHibernate.DomainModel/ABC.hbm.xml" tofile="${bin.dir}/ABC.hbm.xml" />
 	</target>
+
 	<target name="test" depends="init build common.run-database-tests" />
-</project>
+
+</project>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.