Skip to content

Commit d4e8f28

Browse files
ngbrownngbrown
committed
NH-3900 - Splitting NHibernate.Test.Linq namespace into separate project
because NUnit 3 doesn't guarantee order of SetUpFixture in relation to other tests.
1 parent b0b4f1c commit d4e8f28

File tree

68 files changed

+367
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+367
-78
lines changed

‎NHibernate.nunit

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
44
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
55
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
6+
<assembly path="src\NHibernate.Test.Linq\bin\Debug-2.0\NHibernate.Test.Linq.dll" />
67
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
78
</Config>
89
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
910
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
1011
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
12+
<assembly path="src\NHibernate.Test.Linq\bin\Release-2.0\NHibernate.Test.Linq.dll" />
1113
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
1214
</Config>
1315
</NUnitProject>

‎default.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</target>
4545

4646
<target name="test" depends="init build" description="Runs all NHibernate tests for the current framework" unless="${skip.tests}">
47-
<property name="testfiles.all" value="NHibernate.TestDatabaseSetup NHibernate.Test NHibernate.Test.VisualBasic" />
47+
<property name="testfiles.all" value="NHibernate.TestDatabaseSetup NHibernate.Test NHibernate.Test.Linq NHibernate.Test.VisualBasic" />
4848
<foreach item="String" in="${testfiles.all}" delim=" " property="test.file">
4949
<call target="common.run-database-tests"/>
5050
</foreach>

‎src/NHibernate.Test.Linq/App.config

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
4+
<configSections>
5+
<section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" />
6+
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
7+
</configSections>
8+
9+
<connectionStrings>
10+
<add name="TestConnectionString" connectionString="Server=localhost\sqlexpress;Database=nhibernate;Integrated Security=SSPI" />
11+
<add name="DummyConnectionString" connectionString="TestConnectionString-TestConnectionString" />
12+
</connectionStrings>
13+
14+
<runtime>
15+
<!-- Required by ReflectHelperFixture.TypeFoundInNotLoadedAssembly test -->
16+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" applies-to="v2.0.50727">
17+
<qualifyAssembly partialName="System.Web" fullName="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
18+
</assemblyBinding>
19+
</runtime>
20+
21+
22+
23+
<!--
24+
NHiberate configuration
25+
You don't need to change this section for your own use. You can write your own hibernate.cfg.xml to override all
26+
session-factory configuration. Templates are available in NHibernate.Config.Templates folder.
27+
-->
28+
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
29+
<session-factory name="NHibernate.Test">
30+
31+
<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
32+
33+
<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
34+
<property name="connection.connection_string_name">TestConnectionString</property>
35+
<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
36+
<property name="connection.isolation">ReadCommitted</property> <!-- See System.Data.IsolationLevel for valid values -->
37+
<!--property name="connection.connection_string" /-->
38+
39+
<property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property>
40+
<property name="cache.use_query_cache">true</property>
41+
42+
<property name="query.startup_check">false</property>
43+
<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
44+
45+
<property name="adonet.batch_size">10</property>
46+
<property name="adonet.wrap_result_sets">false</property>
47+
48+
<property name="hbm2ddl.keywords">none</property>
49+
<property name="format_sql">true</property>
50+
<property name="show_sql">false</property>
51+
<property name="command_timeout">444</property>
52+
53+
</session-factory>
54+
</hibernate-configuration>
55+
56+
<log4net debug="false">
57+
58+
<!-- Appenders -->
59+
<appender name="trace" type="log4net.Appender.TraceAppender, log4net">
60+
<layout type="log4net.Layout.PatternLayout, log4net">
61+
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
62+
</layout>
63+
</appender>
64+
<appender name="console" type="log4net.Appender.ConsoleAppender, log4net">
65+
<layout type="log4net.Layout.PatternLayout, log4net">
66+
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
67+
</layout>
68+
</appender>
69+
<appender name="rollingFile" type="log4net.Appender.RollingFileAppender, log4net" >
70+
<param name="File" value="log.txt" />
71+
<param name="AppendToFile" value="false" />
72+
<param name="RollingStyle" value="Date" />
73+
<param name="DatePattern" value="yyyy.MM.dd" />
74+
<param name="StaticLogFileName" value="true" />
75+
<layout type="log4net.Layout.PatternLayout, log4net">
76+
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
77+
</layout>
78+
</appender>
79+
80+
<root>
81+
<priority value="WARN" />
82+
<appender-ref ref="console" />
83+
</root>
84+
85+
<!-- Loggers -->
86+
<logger name="NHibernate.Hql.Ast.ANTLR">
87+
<priority value="OFF" />
88+
</logger>
89+
<logger name="NHibernate.SQL">
90+
<level value="OFF" />
91+
</logger>
92+
<logger name="NHibernate.AdoNet.AbstractBatcher">
93+
<level value="OFF" />
94+
</logger>
95+
<logger name="NHibernate.Tool.hbm2ddl.SchemaExport">
96+
<level value="ERROR" />
97+
</logger>
98+
99+
</log4net>
100+
101+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
102+
<runtime>
103+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
104+
<dependentAssembly>
105+
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral"/>
106+
<bindingRedirect oldVersion="0.0.0.0-2.6.1.12217" newVersion="2.6.1.12217"/>
107+
</dependentAssembly>
108+
</assemblyBinding>
109+
</runtime>
110+
111+
</configuration>

‎src/NHibernate.Test.Linq/AssemblyInfo.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
using System.Reflection;
3+
4+
[assembly: CLSCompliantAttribute(false)]
5+
[assembly: AssemblyTitleAttribute("NHibernate.Test.Linq")]
6+
[assembly: AssemblyDescriptionAttribute("The Unit Tests for NHibernate.")]
7+
[assembly: AssemblyCompanyAttribute("NHibernate.info")]
8+
[assembly: AssemblyProductAttribute("NHibernate.Test.Linq")]
9+
[assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
10+
[assembly: AssemblyDelaySignAttribute(false)]
11+

‎src/NHibernate.Test/DbScripts/MsSql2008DialectLinqReadonlyCreateScript.sql renamed to ‎src/NHibernate.Test.Linq/DbScripts/MsSql2008DialectLinqReadonlyCreateScript.sql

File renamed without changes.

‎src/NHibernate.Test/DbScripts/MsSql2008DialectLinqReadonlyDropScript.sql renamed to ‎src/NHibernate.Test.Linq/DbScripts/MsSql2008DialectLinqReadonlyDropScript.sql

File renamed without changes.

‎src/NHibernate.Test/DbScripts/MsSql2012DialectLinqReadonlyCreateScript.sql renamed to ‎src/NHibernate.Test.Linq/DbScripts/MsSql2012DialectLinqReadonlyCreateScript.sql

File renamed without changes.

‎src/NHibernate.Test/DbScripts/MsSql2012DialectLinqReadonlyDropScript.sql renamed to ‎src/NHibernate.Test.Linq/DbScripts/MsSql2012DialectLinqReadonlyDropScript.sql

File renamed without changes.

‎src/NHibernate.Test/DbScripts/PostgreSQL82DialectLinqReadonlyCreateScript.sql renamed to ‎src/NHibernate.Test.Linq/DbScripts/PostgreSQL82DialectLinqReadonlyCreateScript.sql

File renamed without changes.

‎src/NHibernate.Test/DbScripts/PostgreSQL82DialectLinqReadonlyDropScript.sql renamed to ‎src/NHibernate.Test.Linq/DbScripts/PostgreSQL82DialectLinqReadonlyDropScript.sql

File renamed without changes.

0 commit comments

Comments
 (0)