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

Fixed Namespace rules in NVelocity tests project

Browse Source
This commit is contained in:
bbaia
2010-04-19 16:39:36 +00:00
parent bd58a75fc0
commit f6b7596932
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.2010.csproj
View File

@@ -56,6 +56,7 @@
<Compile Include="Template\Velocity\Config\TemplateNamespaceParserTests.cs" />
<Compile Include="Template\Velocity\VelocityEngineFactoryObjectTests.cs" />
<Compile Include="Template\Velocity\VelocityEngineTestBase.cs" />
<Compile Include="VelocityCompilerOptionsTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
@@ -83,8 +84,7 @@
<None Include="Template\Velocity\config.properties">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<EmbeddedResource Include="Template\Velocity\EmbeddedTemplate.vm">
</EmbeddedResource>
<EmbeddedResource Include="Template\Velocity\EmbeddedTemplate.vm" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />

8
test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build
View File

@@ -29,12 +29,12 @@
<include name="Nvelocity.dll" />
<exclude name="${project::get-name()}.dll" />
</references>
<resources basedir="." prefix="Spring.Template.Velocity.Tests" dynamicprefix="true" failonempty="true">
<resources prefix="Spring" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />
<include name="**/*.xsd" />
<include name="**/*.test" />
<include name="**/*.vm" />
<include name="**/*.properties" />
<include name="**/*.test" />
<include name="**/*.vm" />
<include name="**/*.properties" />
<include name="**/*.config" />
</resources>
</csc>

1
test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.csproj
View File

@@ -53,6 +53,7 @@
<Compile Include="Template\Velocity\Config\TemplateNamespaceParserTests.cs" />
<Compile Include="Template\Velocity\VelocityEngineFactoryObjectTests.cs" />
<Compile Include="Template\Velocity\VelocityEngineTestBase.cs" />
<Compile Include="VelocityCompilerOptionsTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">

6
test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/Config/TemplateNamespaceParserTests.cs
View File

@@ -34,7 +34,7 @@ using Spring.Template.Velocity.Config;
#endregion
namespace Spring.Template.Velocity.Tests.Template.Velocity.Config {
namespace Spring.Template.Velocity.Config {
/// <summary>
/// This class contains tests for the template namespace configuration parser
/// </summary>
@@ -90,7 +90,7 @@ namespace Spring.Template.Velocity.Tests.Template.Velocity.Config {
Assert.AreEqual(DEFAULT_CACHE_SIZE, velocityEngine.GetProperty(RuntimeConstants.RESOURCE_MANAGER_DEFAULTCACHE_SIZE), "incorrect default cache size");
Assert.AreEqual(DEFAULT_CACHE_FLAG, velocityEngine.GetProperty(VelocityConstants.Assembly + VelocityConstants.Separator + PropertyResourceLoaderCachce),
"incorrect caching flag");
AssertMergedValue(velocityEngine, "Spring.Template.Velocity.Tests.Template.Velocity.SimpleTemplate.vm");
AssertMergedValue(velocityEngine, "Spring.Template.Velocity.SimpleTemplate.vm");
}
/// <summary>
@@ -155,7 +155,7 @@ namespace Spring.Template.Velocity.Tests.Template.Velocity.Config {
Assert.AreEqual(PropertyMyResourceLoader, getSingleProperty(velocityEngine, RuntimeConstants.RESOURCE_LOADER), "incorrect resource loader");
Assert.AreEqual("Spring.Template.Velocity.Tests.Template.Velocity.Config.TestCustomResourceLoader; Spring.Template.Velocity.Tests",
Assert.AreEqual("Spring.Template.Velocity.Config.TestCustomResourceLoader; Spring.Template.Velocity.Tests",
getSingleProperty(velocityEngine, classProp), "incorrect resource loader type");
Assert.AreEqual(PropertyMyResourceLoader, getSingleProperty(velocityEngine, RuntimeConstants.RESOURCE_LOADER), "incorrect resource loader");
Assert.AreEqual("A custom resource loader",

6
test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.cs
View File

@@ -29,7 +29,7 @@ using NVelocity.Exception;
#endregion
namespace Spring.Template.Velocity.Tests.Template.Velocity {
namespace Spring.Template.Velocity {
/// <summary>
/// This class contains tests for VelocityEngineFactoryObject
@@ -45,7 +45,7 @@ namespace Spring.Template.Velocity.Tests.Template.Velocity {
public void TestMergeUsingAssembly() {
VelocityEngine velocityEngine = appContext.GetObject("assemblyBasedVelocityEngine") as VelocityEngine;
Assert.IsNotNull(velocityEngine, "velocityEngine is null");
AssertMergedValue(velocityEngine, "Spring.Template.Velocity.Tests.Template.Velocity.SimpleTemplate.vm");
AssertMergedValue(velocityEngine, "Spring.Template.Velocity.SimpleTemplate.vm");
}
/// <summary>
@@ -108,7 +108,7 @@ namespace Spring.Template.Velocity.Tests.Template.Velocity {
VelocityEngine velocityEngine =
appContext.GetObject("propertiesFileBasedVelocityEngine") as VelocityEngine;
Assert.IsNotNull(velocityEngine, "velocityEngine is null");
AssertMergedValue(velocityEngine, "Spring.Template.Velocity.Tests.Template.Velocity.SimpleTemplate.vm");
AssertMergedValue(velocityEngine, "Spring.Template.Velocity.SimpleTemplate.vm");
}
/// <summary>

6
test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineFactoryObjectTests.xml
View File

@@ -17,7 +17,7 @@
<nv:engine id="cnSpringVelocityEngine" prefer-file-system-access="false">
<nv:resource-loader default-cache-size="200" modification-check-interval="30" template-caching="true">
<nv:spring uri="file://Template/Velocity/"/>
<nv:spring uri="assembly://Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.Template.Velocity/"/>
<nv:spring uri="assembly://Spring.Template.Velocity.Tests/Spring.Template.Velocity/"/>
</nv:resource-loader>
</nv:engine>
@@ -34,7 +34,7 @@
<nv:resource-loader default-cache-size="200" modification-check-interval="30" template-caching="true">
<nv:custom name="myResourceLoader"
description="A custom resource loader"
type="Spring.Template.Velocity.Tests.Template.Velocity.Config.TestCustomResourceLoader, Spring.Template.Velocity.Tests"
type="Spring.Template.Velocity.Config.TestCustomResourceLoader, Spring.Template.Velocity.Tests"
path="Template/Velocity/"/>
</nv:resource-loader>
</nv:engine>
@@ -68,7 +68,7 @@
<!-- Spring based defualt file fallback to spring definition -->
<object id="springFallbackVelocityEngine" type="Spring.Template.Velocity.VelocityEngineFactoryObject, Spring.Template.Velocity" >
<property name="ResourceLoaderPath " value="assembly://Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.Template.Velocity/" />
<property name="ResourceLoaderPath " value="assembly://Spring.Template.Velocity.Tests/Spring.Template.Velocity/" />
</object>

2
test/Spring/Spring.Template.Velocity.Tests/Template/Velocity/VelocityEngineTestBase.cs
View File

@@ -29,7 +29,7 @@ using Spring.Objects.Factory.Xml;
#endregion
namespace Spring.Template.Velocity.Tests.Template.Velocity {
namespace Spring.Template.Velocity {
/// <summary>
/// Base class for Velocity engine tests.