Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add GitHub Actions configuration (#201)

Browse Source 
* new build system based on NUKE build
* support test running on Linux
This commit is contained in:
Marko Lahma
2021-08-02 17:54:41 +03:00
committed by GitHub
parent 9d7325bd67
commit ca2bf1e889
100 changed files with 1147 additions and 53007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/Directory.Build.props
View File

@@ -17,11 +17,11 @@
<CommonLoggingVersion>3.4.1</CommonLoggingVersion>
<Log4NetVersion>2.0.8</Log4NetVersion>
<NUnitVersion>3.12.0</NUnitVersion>
<NUnitVersion>3.13.1</NUnitVersion>
<NUnitTestAdapterVersion>3.17.0</NUnitTestAdapterVersion>
<FakeItEasyVersion>6.2.1</FakeItEasyVersion>
<FakeItEasyAnalyzerVersion>6.0.0</FakeItEasyAnalyzerVersion>
<MicrosoftTestSDKVersion>16.8.0</MicrosoftTestSDKVersion>
<MicrosoftTestSDKVersion>16.9.4</MicrosoftTestSDKVersion>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<ComVisible>False</ComVisible>
@@ -30,6 +30,8 @@
<LangVersion>latest</LangVersion>
<TargetFullFrameworkVersion>net461</TargetFullFrameworkVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>

22
test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AdvisorAdapterRegistrationTests.cs
View File

@@ -1,13 +1,13 @@
#region License
/*
* Copyright 2002-2010 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,22 +34,22 @@ namespace Spring.Aop.Framework.Adapter
/// </summary>
/// <author>Dmitriy Kopylenko</author>
/// <author>Simon White (.NET)</author>
[TestFixture]
[Platform("Win")]
public class AdvisorAdapterRegistrationTests
{
[Test]
public void AdvisorAdapterRegistrationManagerNotPresentInContext()
public void AdvisorAdapterRegistrationManagerNotPresentInContext()
{
string configLocation = ReadOnlyXmlTestResource.GetFilePath("withoutBPPContext.xml", typeof(AdvisorAdapterRegistrationTests));
IApplicationContext ctx = new XmlApplicationContext(configLocation);
ITestObject to = (ITestObject) ctx.GetObject("testObject");
// just invoke any method to see if advice fired
try
try
{
to.ReturnsThis();
Assert.Fail("Should throw UnknownAdviceTypeException");
}
catch (UnknownAdviceTypeException)
catch (UnknownAdviceTypeException)
{
// expected
Assert.AreEqual(0, GetAdviceImpl(to).InvocationCounter);
@@ -57,24 +57,24 @@ namespace Spring.Aop.Framework.Adapter
}
[Test]
public void AdvisorAdapterRegistrationManagerPresentInContext()
public void AdvisorAdapterRegistrationManagerPresentInContext()
{
string configLocation = ReadOnlyXmlTestResource.GetFilePath("withBPPContext.xml", typeof(AdvisorAdapterRegistrationTests));
IApplicationContext ctx = new XmlApplicationContext(configLocation);
ITestObject to = (ITestObject) ctx.GetObject("testObject");
// just invoke any method to see if advice fired
try
try
{
to.ReturnsThis();
Assert.AreEqual(1, GetAdviceImpl(to).InvocationCounter);
}
catch (UnknownAdviceTypeException)
catch (UnknownAdviceTypeException)
{
Assert.Fail("Should not throw UnknownAdviceTypeException");
}
}
private SimpleBeforeAdviceImpl GetAdviceImpl(ITestObject to)
private SimpleBeforeAdviceImpl GetAdviceImpl(ITestObject to)
{
IAdvised advised = (IAdvised) to;
IAdvisor advisor = advised.Advisors[0];

5
test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AbstractAutoProxyCreatorTests.cs
View File

@@ -51,7 +51,7 @@ namespace Spring.Aop.Framework.AutoProxy
public class ObjectWithoutInterface
{
public virtual void Foo()
{ }
{ }
}
public class TransparentProxyFactory : IFactoryObject
@@ -162,12 +162,13 @@ namespace Spring.Aop.Framework.AutoProxy
}
[Test]
[Platform("Win")]
public void ProxyTransparentProxy()
{
DefaultListableObjectFactory of = new DefaultListableObjectFactory();
ConstructorArgumentValues ctorArgs = new ConstructorArgumentValues();
ctorArgs.AddNamedArgumentValue("objectType", typeof(ITestObject));
ctorArgs.AddNamedArgumentValue("objectType", typeof(ITestObject));
of.RegisterObjectDefinition("bar", new RootObjectDefinition(typeof(TransparentProxyFactory), ctorArgs, null));
TestAutoProxyCreator apc = new TestAutoProxyCreator(of);

9
test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -532,6 +532,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
[Test]
[Platform("Win")]
public void ProxyMethodWithRefOutParametersWithDirectCall()
{
PublicRefOutTestObject target = new PublicRefOutTestObject();
@@ -547,6 +548,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
[Test]
[Platform("Win")]
public void ProxyMethodWithRefOutParametersWithDynamicReflection()
{
PublicRefOutTestObject target = new PublicRefOutTestObject();
@@ -566,6 +568,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
[Test]
[Platform("Win")]
public virtual void ProxyMethodWithRefOutParametersWithStandardReflection()
{
InternalRefOutTestObject target = new InternalRefOutTestObject();
@@ -660,6 +663,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
[Test]
[Platform("Win")]
public void ProxyGenericMethodWithRefOutParametersWithDirectCall()
{
PublicRefOutGenericTestObject target = new PublicRefOutGenericTestObject();
@@ -675,6 +679,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
[Test]
[Platform("Win")]
public void ProxyGenericMethodWithRefOutParametersWithDynamicReflection()
{
PublicRefOutGenericTestObject target = new PublicRefOutGenericTestObject();
@@ -694,6 +699,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
[Test]
[Platform("Win")]
public virtual void ProxyGenericMethodWithRefOutParametersWithStandardReflection()
{
InternalRefOutGenericTestObject target = new InternalRefOutGenericTestObject();
@@ -844,6 +850,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
[Test(Description = "http://opensource.atlassian.com/projects/spring/browse/SPRNET-340")]
[Platform("Win")]
public void MultiThreadedProxyCreation()
{
MultiThreadedProxyCreation(5);

23
test/Spring/Spring.Aop.Tests/Aop/Support/RegularExpressionMethodPointcutAdvisorTests.cs
View File

@@ -1,13 +1,13 @@
#region License
/*
* Copyright 2002-2010 the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,7 +55,7 @@ namespace Spring.Aop.Support
// Interceptor behind regexp advisor
NopInterceptor nop = (NopInterceptor) iof.GetObject("NopInterceptor");
Assert.AreEqual(0, nop.Count);
int newAge = 12;
// Not advised
advised.Exceptional(null);
@@ -74,20 +74,20 @@ namespace Spring.Aop.Support
{
IObjectFactory iof = new XmlObjectFactory(new ReadOnlyXmlTestResource("RegularExpressionSetterTests.xml", GetType()));
IPerson advised = (IPerson) iof.GetObject("SettersAndReturnsThisAdvised");
// Interceptor behind regexp advisor
NopInterceptor nop = (NopInterceptor) iof.GetObject("NopInterceptor");
Assert.AreEqual(0, nop.Count);
int newAge = 12;
// Not advised
advised.Exceptional(null);
Assert.AreEqual(0, nop.Count);
// This is proxied
advised.ReturnsThis();
Assert.AreEqual(1, nop.Count);
// Only setter is advised
advised.SetAge(newAge);
Assert.AreEqual(2, nop.Count);
@@ -97,6 +97,7 @@ namespace Spring.Aop.Support
}
[Test]
[Platform("Win")]
public void Serialization()
{
IObjectFactory iof = new XmlObjectFactory(new ReadOnlyXmlTestResource("RegularExpressionSetterTests.xml", GetType()));
@@ -104,12 +105,12 @@ namespace Spring.Aop.Support
// Interceptor behind regexp advisor
NopInterceptor nop = (NopInterceptor) iof.GetObject("NopInterceptor");
Assert.AreEqual(0, nop.Count);
int newAge = 12;
// Not advised
Assert.AreEqual(0, p.GetAge());
Assert.AreEqual(0, nop.Count);
// This is proxied
p.SetAge(newAge);
Assert.AreEqual(1, nop.Count);
@@ -117,7 +118,7 @@ namespace Spring.Aop.Support
Assert.AreEqual(newAge, p.GetAge());
// Only setter fired
Assert.AreEqual(2, nop.Count);
// Serialize and continue...
#if !NETCOREAPP // deep chains for Type serialization problems, not worth the effort at the moment

9
test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.csproj
View File

@@ -25,7 +25,14 @@
<ItemGroup>
<Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
<Content Include="App.config" CopyToOutputDirectory="PreserveNewest" />
<Content Include="Data\**\*.xml" CopyToOutputDirectory="PreserveNewest" />
<None Include="Data\**\*">
<Link>Data\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Data\**\*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<EmbeddedResource Include="Aop\Config\AopNamespaceParserTests.xml" />
<EmbeddedResource Include="Data\Spring\Aop\Framework\adapter\withBPPContext.xml" />
<EmbeddedResource Include="Data\Spring\Aop\Framework\adapter\withoutBPPContext.xml" />

20
test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,19 +32,19 @@ namespace Spring.Core.IO
/// Unit tests for the FileSystemResourceTest class.
/// </summary>
/// <author>Rick Evans</author>
[TestFixture]
[Platform("Win")]
public class FileSystemResourceTests : FileSystemResourceCommonTests
{
protected override FileSystemResource CreateResourceInstance( string resourceName )
{
return new FileSystemResource(resourceName);
}
[Test]
public void LeadingProtocolIsNotTreatedRelative()
{
FileSystemResource res = new FileSystemResource(@"file://\\server\share\samples\artfair\");
FileSystemResource res2 = (FileSystemResource) res.CreateRelative(@"file://./index.html");
FileSystemResource res2 = (FileSystemResource) res.CreateRelative(@"file://./index.html");
Assert.AreEqual(new Uri(Path.Combine(Environment.CurrentDirectory, "index.html")).AbsolutePath, res2.Uri.AbsolutePath);
}
@@ -94,7 +94,7 @@ namespace Spring.Core.IO
}
}
}
[Test]
public void Resolution_WithProtocolAndSpecialHomeCharacter()
{
@@ -116,7 +116,7 @@ namespace Spring.Core.IO
"The file name with file://~/.. must have resolved to a file " +
"in the parent directory of the currently executing domain.");
}
[Test]
public void CreateRelativeWithParent()
{
@@ -198,7 +198,7 @@ namespace Spring.Core.IO
}
}
}
[Test]
public void RelativeLocalFileSystemResourceWhenNotRelative()
{
@@ -259,8 +259,8 @@ namespace Spring.Core.IO
IResource rel5 = res.CreateRelative(@"..\..\index.html");
Assert.IsTrue(rel5 is FileSystemResource);
Assert.AreEqual(@"file [c:\index.html]", rel5.Description);
}
}
[Test]
public void RelativeUncResourceWhenNotRelative()
{
@@ -321,6 +321,6 @@ namespace Spring.Core.IO
IResource rel5 = res.CreateRelative(@"..\..\index.html");
Assert.IsTrue(rel5 is FileSystemResource);
Assert.AreEqual(@"file [\\server\share\index.html]", rel5.Description);
}
}
}
}

3
test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs
View File

@@ -43,7 +43,7 @@ namespace Spring.Core.IO
public void FixtureSetUp()
{
// enable (null appender) logging, just to ensure that the logging code is correct
LogManager.Adapter = new NoOpLoggerFactoryAdapter();
LogManager.Adapter = new NoOpLoggerFactoryAdapter();
}
[Test]
@@ -80,6 +80,7 @@ namespace Spring.Core.IO
}
[Test]
[Platform("Win")]
public void ConvertFromWithEnvironmentVariableExpansion()
{
string filename = Guid.NewGuid().ToString();

1
test/Spring/Spring.Core.Tests/Core/IO/UrlResourceTest.cs
View File

@@ -52,6 +52,7 @@ namespace Spring.Core.IO
}
[Test]
[Platform("Win")]
public void GetValidFileInfo()
{
UrlResource urlResource = new UrlResource(FILE_PROTOCOL_PREFIX + "C:/temp");

10
test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs
View File

@@ -1,14 +1,14 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
*
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@ namespace Spring.Core.TypeConversion
/// Unit tests for the RegistryKeyConverter class.
/// </summary>
/// <author>Aleksandar Seovic</author>
[TestFixture]
[Platform("Win")]
public sealed class RegistryKeyConverterTests
{
[Test]

8
test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/resource.xml
View File

@@ -3,18 +3,18 @@
<objects xmlns="http://www.springframework.net">
<object id="resource1" type="Spring.Objects.ResourceTestObject, Spring.Core.Tests">
<property name="resource">
<value>file:///temp/spring-test.properties</value>
<value>file://./temp/spring-test.properties</value>
</property>
<property name="inputStream">
<value>file:///temp/spring-test.properties</value>
<value>file://./temp/spring-test.properties</value>
</property>
</object>
<object id="resource2" type="Spring.Objects.ResourceTestObject, Spring.Core.Tests">
<constructor-arg index="0">
<value>file:///temp/spring-test.properties</value>
<value>file://./temp/spring-test.properties</value>
</constructor-arg>
<constructor-arg index="1">
<value>file:///temp/spring-test.properties</value>
<value>file://./temp/spring-test.properties</value>
</constructor-arg>
</object>
</objects>

7
test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs
View File

@@ -28,7 +28,6 @@ namespace Spring.Globalization.Formatters
/// Unit tests for CurrencyFormatter class.
/// </summary>
/// <author>Aleksandar Seovic</author>
[TestFixture]
public class CurrencyFormatterTests
{
[Test]
@@ -54,6 +53,7 @@ namespace Spring.Globalization.Formatters
}
#if !MONO
[Test]
[Platform("Win")]
public void FormatUsingDefaults()
{
CurrencyFormatter fmt = new CurrencyFormatter("en-US");
@@ -108,6 +108,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void ParseUsingDefaults()
{
CurrencyFormatter fmt = new CurrencyFormatter("en-US");
@@ -160,6 +161,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void FormatUsingCustomSettings()
{
CurrencyFormatter fmt = new CurrencyFormatter("en-US");
@@ -189,8 +191,6 @@ namespace Spring.Globalization.Formatters
Assert.AreEqual("-1.234,56 din", fmt.Format(-1234.56));
}
fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName);
fmt.GroupSizes = new int[] { 1, 2 };
fmt.GroupSeparator = "'";
@@ -213,6 +213,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void ParseUsingCustomSettings()
{
CurrencyFormatter fmt = new CurrencyFormatter("en-US");

3
test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs
View File

@@ -28,7 +28,6 @@ namespace Spring.Globalization.Formatters
/// Unit tests for DateTimeFormatter class.
/// </summary>
/// <author>Aleksandar Seovic</author>
[TestFixture]
public class DateTimeFormatterTests
{
[Test]
@@ -54,6 +53,7 @@ namespace Spring.Globalization.Formatters
}
#if !MONO
[Test]
[Platform("Win")]
public void FormatUsingDefaults()
{
DateTimeFormatter fmt = new DateTimeFormatter("d", "en-US");
@@ -103,6 +103,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void ParseUsingDefaults()
{
DateTimeFormatter fmt = new DateTimeFormatter("d", "en-US");

1
test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs
View File

@@ -54,6 +54,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void FormatUsingDefaults()
{
FloatFormatter fmt = new FloatFormatter(FloatFormatter.DefaultFormat, "en-US");

4
test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs
View File

@@ -28,7 +28,6 @@ namespace Spring.Globalization.Formatters
/// Unit tests for NumberFormatter class.
/// </summary>
/// <author>Aleksandar Seovic</author>
[TestFixture]
public class NumberFormatterTests
{
[Test]
@@ -54,6 +53,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void FormatUsingDefaults()
{
NumberFormatter fmt = new NumberFormatter("en-US");
@@ -70,6 +70,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void ParseUsingDefaults()
{
NumberFormatter fmt = new NumberFormatter("en-US");
@@ -86,6 +87,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void FormatUsingCustomSettings()
{
NumberFormatter fmt = new NumberFormatter("en-US");

2
test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs
View File

@@ -28,7 +28,6 @@ namespace Spring.Globalization.Formatters
/// Unit tests for PercentFormatter class.
/// </summary>
/// <author>Aleksandar Seovic</author>
[TestFixture]
public class PercentFormatterTests
{
[Test]
@@ -54,6 +53,7 @@ namespace Spring.Globalization.Formatters
}
[Test]
[Platform("Win")]
public void FormatUsingDefaults()
{
PercentFormatter fmt = new PercentFormatter("en-US");

6
test/Spring/Spring.Core.Tests/Objects/Factory/Config/EnvironmentVariableSourceTests.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,8 +41,8 @@ namespace Spring.Objects.Factory.Config
EnvironmentVariableSource vs = new EnvironmentVariableSource();
// existing vars
Assert.AreEqual(Environment.GetEnvironmentVariable("path"), vs.ResolveVariable("PATH"));
Assert.AreEqual(Environment.GetEnvironmentVariable("PATH"), vs.ResolveVariable("path"));
Assert.AreEqual(Environment.GetEnvironmentVariable("path"), vs.ResolveVariable("path"));
Assert.AreEqual(Environment.GetEnvironmentVariable("PATH"), vs.ResolveVariable("PATH"));
Assert.AreEqual(Environment.GetEnvironmentVariable("ComputerName"), vs.ResolveVariable("computerName"));
// non-existant variable

20
test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs
View File

@@ -47,7 +47,7 @@ namespace Spring.Objects.Factory.Config
private static string testConnectionString = @"Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;";
private static string testConnectionStringTwo = @"Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=Ernie;";
#endif
[SetUp]
public void SetUp()
{
@@ -140,7 +140,7 @@ namespace Spring.Objects.Factory.Config
IConfigurableListableObjectFactory mock = A.Fake<IConfigurableListableObjectFactory>();
A.CallTo(() => mock.GetObjectDefinitionNames(false)).Returns(new string [] {defName});
A.CallTo(() => mock.GetObjectDefinition(defName, false)).Returns(def);
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
NameValueCollection defaultProperties = new NameValueCollection();
const string expectedName = "Rick Evans";
@@ -159,7 +159,7 @@ namespace Spring.Objects.Factory.Config
const string defName = "foo";
const string placeholder = "${name}";
MutablePropertyValues pvs = new MutablePropertyValues();
const string theProperty = "name";
pvs.Add(theProperty, placeholder);
@@ -188,6 +188,7 @@ namespace Spring.Objects.Factory.Config
/// variable is replaced.
/// </summary>
[Test]
[Platform("Win")]
public void WithEnvironmentVariableFallback()
{
StaticApplicationContext ac = new StaticApplicationContext();
@@ -233,6 +234,7 @@ namespace Spring.Objects.Factory.Config
/// variable setting to override the explicitly defined name value collection.
/// </summary>
[Test]
[Platform("Win")]
public void WithOverridingEnvironmentProperty()
{
StaticApplicationContext ac = new StaticApplicationContext();
@@ -312,14 +314,14 @@ namespace Spring.Objects.Factory.Config
public void SunnyDay()
{
StaticApplicationContext ac = new StaticApplicationContext();
MutablePropertyValues pvs = new MutablePropertyValues();
pvs.Add("age", "${age}");
RootObjectDefinition def
= new RootObjectDefinition("${fqn}", new ConstructorArgumentValues(), pvs);
ac.RegisterObjectDefinition("tb3", def);
pvs = new MutablePropertyValues();
@@ -387,7 +389,7 @@ namespace Spring.Objects.Factory.Config
Assert.AreEqual(98, inner2.Age);
Assert.AreEqual("namemyvar${", inner2.Name);
}
/// <summary>
/// Makes sure that an appropriate exception is raised when trying
/// to resolve this placeholder... ${foo} with this value... foo=ba${foo}r
@@ -404,7 +406,7 @@ namespace Spring.Objects.Factory.Config
NameValueCollection properties = new NameValueCollection();
const string expectedName = "ba${foo}r";
properties.Add("foo", expectedName);
IConfigurableListableObjectFactory mock = A.Fake<IConfigurableListableObjectFactory>();
A.CallTo(() => mock.GetObjectDefinitionNames(false)).Returns(new string[] {"foo"});
A.CallTo(() => mock.GetObjectDefinition(null, false)).WithAnyArguments().Returns(def);
@@ -437,7 +439,7 @@ namespace Spring.Objects.Factory.Config
IConfigurableListableObjectFactory mock = A.Fake<IConfigurableListableObjectFactory>();
A.CallTo(() => mock.GetObjectDefinitionNames(false)).Returns(new string[] {"foo"});
A.CallTo(() => mock.GetObjectDefinition(null, false)).WithAnyArguments().Returns(def);
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
cfg.Properties = properties;
cfg.PostProcessObjectFactory(mock);
@@ -602,7 +604,7 @@ namespace Spring.Objects.Factory.Config
{
IApplicationContext ctx = new XmlApplicationContext(
"file://Spring/Objects/Factory/Config/PPCWithTypesTests.xml");
object obj = ctx["testObject"];
Assert.IsTrue(obj is TestObject);

4
test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ namespace Spring.Objects.Factory.Config
/// Unit tests for the RegistryVariableSource class.
/// </summary>
/// <author>Aleksandar Seovic</author>
[TestFixture]
[Platform("Win")]
public sealed class RegistryVariableSourceTests
{
private RegistryKey key;

4
test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ namespace Spring.Objects.Factory.Config
[Test]
public void WithinApplicationContext()
{
IApplicationContext ctx = new XmlApplicationContext("file://Spring/Objects/Factory/Config/typeAliases.xml");
IApplicationContext ctx = new XmlApplicationContext("file://Spring/Objects/Factory/Config/TypeAliases.xml");
object obj1 = ctx.GetObject("testObject1");
Assert.IsNotNull(obj1);

22
test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs
View File

@@ -703,7 +703,7 @@ namespace Spring.Objects.Factory.Xml
[Test]
public void DependenciesMaterializeThis()
{
IResource resource = new ReadOnlyXmlTestResource("dependenciesMaterializeThis.xml", GetType());
IResource resource = new ReadOnlyXmlTestResource("dependenciesmaterializethis.xml", GetType());
XmlObjectFactory bf = new XmlObjectFactory(resource);
DummyBo bos = (DummyBo) bf.GetObject("boSingleton");
DummyBo bop = (DummyBo) bf.GetObject("boPrototype");
@@ -796,7 +796,7 @@ namespace Spring.Objects.Factory.Xml
[Test]
public void FactoryReferenceCircle()
{
IResource resource = new ReadOnlyXmlTestResource("factoryCircle.xml", GetType());
IResource resource = new ReadOnlyXmlTestResource("factorycircle.xml", GetType());
XmlObjectFactory xof = new XmlObjectFactory(resource);
TestObject tb = (TestObject) xof.GetObject("singletonFactory");
DummyFactory db = (DummyFactory) xof.GetObject("&singletonFactory");
@@ -1062,14 +1062,14 @@ namespace Spring.Objects.Factory.Xml
[Test]
public void UnsatisfiedObjectDependencyCheck()
{
XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("unsatisfiedObjectDependencyCheck.xml", GetType()));
XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("unsatisfiedobjectdependencycheck.xml", GetType()));
Assert.Throws<UnsatisfiedDependencyException>(() => xof.GetObject("a", typeof(DependenciesObject)));
}
[Test]
public void UnsatisfiedSimpleDependencyCheck()
{
XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("unsatisfiedSimpleDependencyCheck.xml", GetType()));
XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("unsatisfiedsimpledependencycheck.xml", GetType()));
Assert.Throws<UnsatisfiedDependencyException>(() => xof.GetObject("a", typeof(DependenciesObject)));
}
@@ -1078,7 +1078,7 @@ namespace Spring.Objects.Factory.Xml
{
XmlObjectFactory xof
= new XmlObjectFactory(
new ReadOnlyXmlTestResource("satisfiedObjectDependencyCheck.xml", GetType()));
new ReadOnlyXmlTestResource("satisfiedobjectdependencycheck.xml", GetType()));
DependenciesObject a = (DependenciesObject) xof.GetObject("a");
Assert.IsNotNull(a.Spouse);
}
@@ -1089,7 +1089,7 @@ namespace Spring.Objects.Factory.Xml
XmlObjectFactory xof =
new XmlObjectFactory(
new ReadOnlyXmlTestResource(
"satisfiedSimpleDependencyCheck.xml", GetType()));
"satisfiedsimpledependencycheck.xml", GetType()));
DependenciesObject a = (DependenciesObject) xof.GetObject("a");
Assert.AreEqual(a.Age, 33);
}
@@ -1097,7 +1097,7 @@ namespace Spring.Objects.Factory.Xml
[Test]
public void UnsatisfiedAllDependencyCheck()
{
XmlObjectFactory xof= new XmlObjectFactory(new ReadOnlyXmlTestResource("unsatisfiedAllDependencyCheckMissingObjects.xml", GetType()));
XmlObjectFactory xof= new XmlObjectFactory(new ReadOnlyXmlTestResource("unsatisfiedalldependencycheckmissingobjects.xml", GetType()));
Assert.Throws<UnsatisfiedDependencyException>(() => xof.GetObject("a", typeof(DependenciesObject)));
}
@@ -1106,7 +1106,7 @@ namespace Spring.Objects.Factory.Xml
{
XmlObjectFactory xof
= new XmlObjectFactory(
new ReadOnlyXmlTestResource("satisfiedAllDependencyCheck.xml", GetType()));
new ReadOnlyXmlTestResource("satisfiedalldependencycheck.xml", GetType()));
DependenciesObject a = (DependenciesObject) xof.GetObject("a");
Assert.AreEqual(a.Age, 33);
Assert.IsNotNull(a.Name);
@@ -1346,7 +1346,7 @@ namespace Spring.Objects.Factory.Xml
try
{
new XmlObjectFactory(
new ReadOnlyXmlTestResource("classNotFound.xml", GetType()));
new ReadOnlyXmlTestResource("classnotfound.xml", GetType()));
}
catch (ObjectDefinitionStoreException ex)
{
@@ -1356,6 +1356,7 @@ namespace Spring.Objects.Factory.Xml
#if !NETCOREAPP
[Test]
[Platform("Win")]
public void AnObjectCanBeIstantiatedWithANotFullySpecifiedAssemblyName()
{
IResource resource = new ReadOnlyXmlTestResource("notfullyspecified.xml", GetType());
@@ -1368,8 +1369,7 @@ namespace Spring.Objects.Factory.Xml
[Test]
public void ResourceAndInputStream()
{
//string filename = @"C:\temp\spring-test.properties";
string filename = @"/temp/spring-test.properties";
string filename = "./temp/spring-test.properties";
FileInfo file = new FileInfo(filename);
bool tempDirWasCreated = false;
try

5
test/Spring/Spring.Core.Tests/Proxy/AbstractProxyTypeBuilderTests.cs
View File

@@ -1,5 +1,5 @@
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -125,7 +125,7 @@ namespace Spring.Proxy
{
ConstructorInfo ci = typeof(FakeServiceKnownTypeAttribute).GetConstructor(new Type[] { typeof(Type) });
CustomAttributeBuilder cab = new CustomAttributeBuilder(ci, new object[] { typeof(TestObject) });
IProxyTypeBuilder builder = GetProxyBuilder();
builder.TargetType = typeof(ClassWithFakeServiceKnownTypeAttribute);
builder.TypeAttributes.Add(cab);
@@ -273,6 +273,7 @@ namespace Spring.Proxy
#if !MONO && !NETCOREAPP
// http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=94803
[Test]
[Platform("Win")]
public void ProxySecurityAttribute()
{
IProxyTypeBuilder builder = GetProxyBuilder();

20
test/Spring/Spring.Core.Tests/Spring.Core.Tests.csproj
View File

@@ -3,6 +3,7 @@
<TargetFrameworks>net5.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
<NoWarn>$(NoWarn);SYSLIB0001;SYSLIB0003;SYSLIB0011</NoWarn>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
@@ -21,7 +22,7 @@
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
<PackageReference Include="System.Resources.Extensions" Version="4.7.1" />
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == '$(TargetFullFrameworkVersion)' ">
<Reference Include="Microsoft.CSharp" />
@@ -45,12 +46,16 @@
<Compile Remove="Util\ObjectUtilsTests.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="App.config">
<None Include="App.config" Link="testhost.dll.config" CopyToOutputDirectory="PreserveNewest" />
<None Include="App.config" Link="ReSharperTestRunner64.dll.config" CopyToOutputDirectory="PreserveNewest" />
<None Include="Data\**\*">
<Link>Data\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Data\**">
</None>
<None Include="Data\**\*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</None>
<Compile Remove="Context\Attributes\FailAssemblyObjectDefinitionScannerTests.cs" />
<EmbeddedResource Include="Context\Attributes\*.xml" />
<EmbeddedResource Include="Context\Support\*.xml" />
@@ -71,9 +76,4 @@
<EmbeddedResource Include="Resources\SimpleAppContext.xml" />
<EmbeddedResource Include="TestResource.txt" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="xcopy &quot;$(ProjectDir)Data&quot; &quot;$(OutDir)&quot; /y /s /q /d" />
<Exec Command="copy &quot;$(ProjectDir)App.config&quot; &quot;$(OutDir)testhost.dll.config&quot;" />
<Exec Command="copy &quot;$(ProjectDir)App.config&quot; &quot;$(OutDir)ReSharperTestRunner64.dll.config&quot;" />
</Target>
</Project>

23
test/Spring/Spring.Core.Tests/TestAssemblySetup.cs
View File

@@ -14,16 +14,19 @@ namespace Spring
[OneTimeSetUp]
public void SetUp()
{
// while R# is broken (https://youtrack.jetbrains.com/issue/RSRP-451142)
string codeBase = Assembly.GetExecutingAssembly().Location;
UriBuilder uri = new UriBuilder(codeBase);
string path = Uri.UnescapeDataString(uri.Path);
var pathToUse = Path.GetDirectoryName(path);
Directory.SetCurrentDirectory(pathToUse);
CultureInfo enUs = new CultureInfo("en-US");
Thread.CurrentThread.CurrentCulture = enUs;
Thread.CurrentThread.CurrentUICulture = enUs;
try
{
// while R# is broken (https://youtrack.jetbrains.com/issue/RSRP-451142)
string codeBase = Assembly.GetExecutingAssembly().Location;
UriBuilder uri = new UriBuilder(codeBase);
string path = Uri.UnescapeDataString(uri.Path);
var pathToUse = Path.GetDirectoryName(path);
Directory.SetCurrentDirectory(pathToUse);
}
catch
{
// ignored
}
}
}
}

64
test/Spring/Spring.Core.Tests/Threading/CommonThreadStorageTests.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,41 +36,39 @@ namespace Spring.Threading
protected abstract IThreadStorage CreateStorage();
protected virtual void ThreadSetup()
{}
{
}
protected virtual void ThreadCleanup()
{}
{
}
[OneTimeSetUp]
public void FixtureSetUp()
[SetUp]
public void SetUp()
{
ThreadSetup();
}
[OneTimeTearDown]
public void FixtureTearDown()
[TearDown]
public void TearDown()
{
// cleanup storage
var storage = CreateStorage();
storage.FreeNamedDataSlot("key");
storage.FreeNamedDataSlot("KEY");
storage.FreeNamedDataSlot("KeY");
ThreadCleanup();
}
[TearDown]
public void TearDown()
{
// cleanup storage
IThreadStorage storage = CreateStorage();
storage.FreeNamedDataSlot("key");
storage.FreeNamedDataSlot("KEY");
storage.FreeNamedDataSlot("KeY");
}
[Test]
public void IsCaseSensitive()
{
IThreadStorage storage = CreateStorage();
var storage = CreateStorage();
object value1 = new object();
object value2 = new object();
object value3 = new object();
var value1 = new object();
var value2 = new object();
var value3 = new object();
storage.SetData("key", value1);
storage.SetData("KEY", value2);
@@ -84,10 +82,10 @@ namespace Spring.Threading
[Test]
public void AllowReplaceData()
{
IThreadStorage storage = CreateStorage();
var storage = CreateStorage();
object value1 = new object();
object value2 = new object();
var value1 = new object();
var value2 = new object();
storage.SetData("key", value1);
Assert.AreSame(value1, storage.GetData("key"));
@@ -100,7 +98,7 @@ namespace Spring.Threading
[Test]
public void UnknownKeyReturnsNull()
{
IThreadStorage storage = CreateStorage();
var storage = CreateStorage();
Assert.AreSame(null, storage.GetData("key"));
}
@@ -108,9 +106,9 @@ namespace Spring.Threading
[Test]
public void FreeNamedDataSlotRemovesData()
{
IThreadStorage storage = CreateStorage();
var storage = CreateStorage();
object value1 = new object();
var value1 = new object();
storage.SetData("key", value1);
Assert.AreSame(value1, storage.GetData("key"));
storage.FreeNamedDataSlot("key");
@@ -120,15 +118,15 @@ namespace Spring.Threading
[Test]
public void UsesDistinguishedStorageOnDifferentThreads()
{
IThreadStorage storage = CreateStorage();
var storage = CreateStorage();
object value1 = new object();
var value1 = new object();
storage.SetData("key", value1);
ThreadTestHelper helper = new ThreadTestHelper(this,storage);
var helper = new ThreadTestHelper(this, storage);
helper.Execute();
Assert.AreNotSame( value1, helper.value );
Assert.AreNotSame(value1, helper.value);
Assert.IsNull(helper.value);
}
@@ -149,7 +147,7 @@ namespace Spring.Threading
public void Execute()
{
Thread t = new Thread(new ThreadStart(this.Run));
var t = new Thread(new ThreadStart(Run));
t.Start();
t.Join();
}
@@ -157,7 +155,7 @@ namespace Spring.Threading
private void Run()
{
outer.ThreadSetup();
value = this.storage.GetData("key");
value = storage.GetData("key");
}
}

3
test/Spring/Spring.Data.NHibernate5.Tests/Data/NHibernate/Config/AopConfiguration.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ namespace Spring.Data.NHibernate.Config
}
[Test]
[Ignore("TODO Connects to database")]
public void ProxyDataAccessAndServiceLayer()
{
Assert.IsFalse(AopUtils.IsAopProxy( ctx["DbProvider"] ));

3
test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.csproj
View File

@@ -26,9 +26,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\GenCommonAssemblyInfo.cs">
<Link>GenCommonAssemblyInfo.cs</Link>
</Compile>
<EmbeddedResource Include="Messaging\Ems\Core\EmsTemplateTests.xml" />
<EmbeddedResource Include="Messaging\Ems\Config\EmsNamespaceHandlerTests.xml" />
<EmbeddedResource Include="Messaging\Ems\Listener\SimpleMessageListenerContainerTests.xml" />

8
test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.csproj
View File

@@ -19,13 +19,11 @@
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
</ItemGroup>
<ItemGroup>
<Content Include="App.config">
<None Include="App.config">
<Link>testhost.dll.config</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</None>
<EmbeddedResource Include="Messaging\Nms\Integration\SimpleMessageListenerContainerTests.xml" />
<EmbeddedResource Include="Messaging\Nms\Config\NmsNamespaceHandlerTests.xml" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy &quot;$(ProjectDir)App.config&quot; &quot;$(OutDir)testhost.dll.config&quot;" />
</Target>
</Project>

10
test/Spring/Spring.Scheduling.Quartz3.Tests/Scheduling/Quartz/QuartzSupportTests.cs
View File

@@ -569,7 +569,7 @@ namespace Spring.Scheduling.Quartz
factoryObject.AfterPropertiesSet();
await factoryObject.Start();
Thread.Sleep(500);
await Task.Delay(TimeSpan.FromSeconds(1));
Assert.IsTrue(DummyJob.count > 0);
Assert.AreEqual(DummyJob.count, taskExecutor.count);
@@ -601,7 +601,7 @@ namespace Spring.Scheduling.Quartz
factoryObject.AfterPropertiesSet();
await factoryObject.Start();
DummyRunnable.runEvent.WaitOne(500);
DummyRunnable.runEvent.WaitOne(1000);
Assert.IsTrue(DummyRunnable.count > 0);
factoryObject.Dispose();
@@ -742,7 +742,7 @@ namespace Spring.Scheduling.Quartz
factoryObject.AfterPropertiesSet();
await factoryObject.Start();
Thread.Sleep(500);
await Task.Delay(TimeSpan.FromSeconds(1));
Assert.AreEqual(10, DummyRunnable.param);
Assert.IsTrue(DummyRunnable.count > 0);
@@ -777,7 +777,7 @@ namespace Spring.Scheduling.Quartz
factoryObject.AfterPropertiesSet();
await factoryObject.Start();
Thread.Sleep(500);
await Task.Delay(TimeSpan.FromSeconds(1));
Assert.AreEqual(10, DummyJobObject.param);
Assert.IsTrue(DummyJobObject.count > 0);
@@ -800,7 +800,7 @@ namespace Spring.Scheduling.Quartz
factoryObject.AfterPropertiesSet();
await factoryObject.Start();
Thread.Sleep(500);
await Task.Delay(TimeSpan.FromSeconds(1));
Assert.AreEqual(10, DummyJob.param);
Assert.IsTrue(DummyJob.count > 0);

35
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/HttpWebclientExtensions.cs Normal file
View File

@@ -0,0 +1,35 @@
#region License
// /*
// * Copyright 2018 the original author or authors.
// *
// * Licensed under the Apache License, Version 2.0 (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * http://www.apache.org/licenses/LICENSE-2.0
// *
// * Unless required by applicable law or agreed to in writing, software
// * distributed under the License is distributed on an "AS IS" BASIS,
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// * See the License for the specific language governing permissions and
// * limitations under the License.
// */
#endregion
using NUnitAspEx;
using NUnitAspEx.Client;
namespace Spring.Web.Conversation
{
public static class HttpWebclientExtensions
{
public static HttpWebClient CreateClientWithDefaultPort(this IAspFixtureHost host)
{
HttpWebClient clnt = host.CreateWebClient();
// fix port which otherwise defaults to -1 breaking everything
clnt.BaseAddress = clnt.BaseAddress.Replace("aspfixturehost/", "aspfixturehost:80/");
return clnt;
}
}
}

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs
View File

Binary file not shown.

2
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/Web.Config
View File

@@ -92,7 +92,7 @@
<assemblyIdentity name="System.Data.SQLite"
publicKeyToken="db937bc2d44ff139"
culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.91.0"/>
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.113.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>

9
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Spring.Web.Conversation.NHibernate5.Tests.csproj
View File

@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<Configurations>Debug;Release</Configurations>
<ContentSQLiteInteropFiles>true</ContentSQLiteInteropFiles>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.csproj" />
@@ -15,16 +16,13 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSDKVersion)" />
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
<PackageReference Include="NUnit3TestAdapter" Version="$(NUnitTestAdapterVersion)" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" PrivateAssets="None" />
</ItemGroup>
<ItemGroup>
<Reference Include="NUnitAspEx">
<HintPath>..\..\..\lib\Net\2.0\NUnitAspEx.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Data.SQLite, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
<HintPath>..\Spring.Web.Conversation.NHibernate5.Tests\lib\net\2.0\System.Data.SQLite.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
@@ -61,4 +59,5 @@
<Content Include="Data\Spring\Conversation\WebConversationStateTest\TimeOut_WithTimeOut.aspx" />
<EmbeddedResource Include="Entities\*.hbm.xml" />
</ItemGroup>
</Project>

22
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/TestAssemblySetup.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using System.IO;
using NUnit.Framework;
namespace Spring
{
[SetUpFixture]
public class TestAssemblySetup
{
[OneTimeSetUp]
public void SetUp()
{
// work around getting interop assembly to correct directory
var requiredFile = Path.Combine(Environment.CurrentDirectory, "SQLite.Interop.dll");
var fileToUse = Path.Combine(Environment.CurrentDirectory, "x86", "SQLite.Interop.dll");
if (!File.Exists(requiredFile) && File.Exists(fileToUse))
{
File.Copy(fileToUse, requiredFile);
}
}
}
}

8
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/app.config
View File

@@ -8,12 +8,4 @@
<add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite"/>
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.80.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/Mono/2.0/System.Data.SQLite.dll
View File

Binary file not shown.

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/2.0/System.Data.SQLite.dll
View File

Binary file not shown.

13100
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/2.0/System.Data.SQLite.xml
View File

File diff suppressed because it is too large Load Diff

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/2.0/x64/SQLite.Interop.dll
View File

Binary file not shown.

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/2.0/x86/SQLite.Interop.dll
View File

Binary file not shown.

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/3.5/System.Data.SQLite.dll
View File

Binary file not shown.

13100
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/3.5/System.Data.SQLite.xml
View File

File diff suppressed because it is too large Load Diff

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/3.5/x64/SQLite.Interop.dll
View File

Binary file not shown.

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/3.5/x86/SQLite.Interop.dll
View File

Binary file not shown.

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/4.0/System.Data.SQLite.dll
View File

Binary file not shown.

13100
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/4.0/System.Data.SQLite.xml
View File

File diff suppressed because it is too large Load Diff

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/4.0/x64/SQLite.Interop.dll
View File

Binary file not shown.

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/4.0/x86/SQLite.Interop.dll
View File

Binary file not shown.

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/4.5/System.Data.SQLite.dll
View File

Binary file not shown.

13100
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/4.5/System.Data.SQLite.xml
View File

File diff suppressed because it is too large Load Diff

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/4.5/x64/SQLite.Interop.dll
View File

Binary file not shown.

BIN
test/Spring/Spring.Web.Conversation.NHibernate5.Tests/lib/net/4.5/x86/SQLite.Interop.dll
View File

Binary file not shown.

12
test/Spring/Spring.Web.Tests/Spring.Web.Tests.csproj
View File

@@ -28,7 +28,14 @@
</ItemGroup>
<ItemGroup>
<Compile Include="..\Spring.Core.Tests\TestAssemblySetup.cs" Link="TestAssemblySetup.cs" />
<Content Include="Data\**\*" CopyToOutputDirectory="PreserveNewest" />
<None Include="Data\**\*">
<Link>Data\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Data\**\*">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Data\Spring\Context\Support\WebApplicationContextTests\Dummy.aspx" />
<Content Include="Data\Spring\Objects\Factory\Support\TestForm.aspx" />
<Content Include="Data\Spring\Web\Support\LocalResourceManagerTests\WithoutResources.aspx" />
@@ -42,7 +49,4 @@
<EmbeddedResource Include="Context\Support\*.xml" />
<EmbeddedResource Include="Web\Support\ControlInterceptionTests.objects.xml" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="xcopy &quot;$(ProjectDir)Data&quot; &quot;$(OutDir)&quot; /y /s /q /d" />
</Target>
</Project>

2
test/Spring/Spring.Web.Tests/Threading/HttpContextStorageTests.cs
View File

@@ -1,7 +1,7 @@
#region License
/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.