Skip to content

Commit

Permalink
#3 moving tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukas Gerbenis committed Oct 1, 2015
1 parent 6c98850 commit 862d993
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 64 deletions.
2 changes: 1 addition & 1 deletion vNext/src/BetterModules.Sample.Module/BetterModules.Sample.Module.xproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<ProduceOutputsOnBuild>False</ProduceOutputsOnBuild>
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
7 changes: 4 additions & 3 deletions vNext/test/BetterModules.Core.Tests/BetterModules.Core.Tests.xproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>

<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>00b11517-daeb-43aa-b826-b2aa545ae166</ProjectGuid>
<RootNamespace>BetterModules.Core.Tests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
</Project>
0 ...ventListeners/EventListenerHelperTests.cs → ...ventListeners/EventListenerHelperTests.cs
View file
File renamed without changes.
0 ...s/DataContext/Fetching/EagerFetchTests.cs → ...s/DataContext/Fetching/EagerFetchTests.cs
View file
File renamed without changes.
0 ...s/DataContext/QueryableExtensionsTests.cs → ...s/DataContext/QueryableExtensionsTests.cs
View file
File renamed without changes.
0 ...Tests/DataAccess/PredicateBuilderTests.cs → ...Tests/DataAccess/PredicateBuilderTests.cs
View file
File renamed without changes.
60 changes: 30 additions & 30 deletions vNext/test/BetterModules.Core.Tests/Environment/Assemblies/DefaultAssemblyLoaderTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
using System.Linq;
using System.Reflection;
using BetterModules.Core.Environment.Assemblies;
using NUnit.Framework;
using Microsoft.Framework.Logging;
using Xunit;

namespace BetterModules.Core.Tests.Environment.Assemblies
{
[TestFixture]
public class DefaultAssemblyLoaderTests : TestBase
public class DefaultAssemblyLoaderTests
{
[Test]
[Fact]
public void ShouldLoad_Assembly_FileByStringName()
{
var loader = new DefaultAssemblyLoader();
var loader = new DefaultAssemblyLoader(new LoggerFactory());
var assembly = loader.LoadFromFile("BetterModules.Sample.Module.dll");

Assert.IsNotNull(assembly);
Assert.IsTrue(assembly.FullName.StartsWith("BetterModules.Sample.Module"));
Assert.NotNull(assembly);
Assert.True(assembly.FullName.StartsWith("BetterModules.Sample.Module"));
}

[Test]
[Fact]
public void ShouldLoad_Assembly_FileByAssemblyName()
{
var loader = new DefaultAssemblyLoader();
var loader = new DefaultAssemblyLoader(new LoggerFactory());
var assemblyName = AssemblyName.GetAssemblyName("BetterModules.Sample.Module.dll");
var assembly = loader.Load(assemblyName);

Assert.IsNotNull(assembly);
Assert.IsTrue(assembly.FullName.StartsWith("BetterModules.Sample.Module"));
Assert.NotNull(assembly);
Assert.True(assembly.FullName.StartsWith("BetterModules.Sample.Module"));
}

[Test]
[Fact]
public void ShouldLoad_Assembly_GetLoadableTypes()
{
var type = GetType();
var assembly = type.Assembly;
var loader = new DefaultAssemblyLoader();
var loader = new DefaultAssemblyLoader(new LoggerFactory());
var types = loader.GetLoadableTypes(assembly);

Assert.IsNotNull(types);
Assert.Greater(types.Count(), 1);
Assert.IsTrue(types.Contains(GetType()));
Assert.NotNull(types);
Assert.True(types.Any());
Assert.True(types.Contains(GetType()));
}

[Test]
public void ShouldLoad_Assembly_GetLoadableTypes_Generic()
{
var type = GetType();
var assembly = type.Assembly;
var loader = new DefaultAssemblyLoader();
var testBaseType = typeof(TestBase);
var types = loader.GetLoadableTypes(assembly, testBaseType);

Assert.IsNotNull(types);
Assert.Greater(types.Count(), 1);
Assert.IsTrue(types.Contains(GetType()));
Assert.IsTrue(types.All(testBaseType.IsAssignableFrom));
}
//[Fact]
//public void ShouldLoad_Assembly_GetLoadableTypes_Generic()
//{
// var type = GetType();
// var assembly = type.Assembly;
// var loader = new DefaultAssemblyLoader(new LoggerFactory());
// var testBaseType = typeof(TestBase);
// var types = loader.GetLoadableTypes(assembly, testBaseType);

// Assert.IsNotNull(types);
// Assert.Greater(types.Count(), 1);
// Assert.IsTrue(types.Contains(GetType()));
// Assert.IsTrue(types.All(testBaseType.IsAssignableFrom));
//}
}
}
32 changes: 18 additions & 14 deletions vNext/test/BetterModules.Core.Tests/Environment/Assemblies/DefaultAssemblyManagerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,23 @@
using BetterModules.Core.Environment.Assemblies;
using BetterModules.Core.Environment.FileSystem;
using BetterModules.Core.Modules.Registration;
using Microsoft.Dnx.Runtime;
using Microsoft.Framework.Logging;
using Moq;
using NUnit.Framework;
using Xunit;
using IAssemblyLoader = BetterModules.Core.Environment.Assemblies.IAssemblyLoader;

namespace BetterModules.Core.Tests.Environment.Assemblies
{
[TestFixture]
public class DefaultAssemblyManagerTests : TestBase
public class DefaultAssemblyManagerTests
{
[Test]
[Fact]
public void ShouldAddReferencedModulesCorrectly()
{
var registrationMock = new Mock<IModulesRegistration>();
var assemblyLoaderMock = new Mock<IAssemblyLoader>();
var workingDirectoryMock = new Mock<IWorkingDirectory>();
var libraryManegerMock = new Mock<ILibraryManager>();

var allAssemblies = new List<string>();

Expand All @@ -37,22 +40,23 @@ public void ShouldAddReferencedModulesCorrectly()
}
});

var manager = new DefaultAssemblyManager(workingDirectoryMock.Object, registrationMock.Object, assemblyLoaderMock.Object);
var manager = new DefaultAssemblyManager(workingDirectoryMock.Object, registrationMock.Object, assemblyLoaderMock.Object, libraryManegerMock.Object, new LoggerFactory());
manager.AddReferencedModules();

Assert.IsTrue(allAssemblies.Any(a => a.Contains("BetterModules.Sample.Module")));
Assert.True(allAssemblies.Any(a => a.Contains("BetterModules.Sample.Module")));
}

/// <summary>
/// Should retrieve the lists of modules from working directory, copy them to bin folder
/// and load them using assembly loader
/// </summary>
[Test]
[Fact]
public void ShouldAddUploadedModulesCorrectly()
{
var registrationMock = new Mock<IModulesRegistration>();
var assemblyLoaderMock = new Mock<IAssemblyLoader>();
var workingDirectoryMock = new Mock<IWorkingDirectory>();
var libraryManegerMock = new Mock<ILibraryManager>();

var assemblyLoaded = false;
var assemblyCopied = false;
Expand All @@ -61,14 +65,14 @@ public void ShouldAddUploadedModulesCorrectly()
workingDirectoryMock
.Setup(d => d.GetAvailableModules())
.Returns(() => files);

workingDirectoryMock
.Setup(d => d.RecopyModulesToRuntimeFolder(It.IsAny<FileInfo>()))
.Returns<FileInfo>(
file =>
{
assemblyCopied = true;
Assert.AreEqual(files[0], file);
Assert.Equal(files[0], file);

return file;
});
Expand All @@ -79,14 +83,14 @@ public void ShouldAddUploadedModulesCorrectly()
file =>
{
assemblyLoaded = true;
Assert.AreEqual(file.Name, "ClassLibrary1");
} );
Assert.Equal(file.Name, "ClassLibrary1");
});

var manager = new DefaultAssemblyManager(workingDirectoryMock.Object, registrationMock.Object, assemblyLoaderMock.Object);
var manager = new DefaultAssemblyManager(workingDirectoryMock.Object, registrationMock.Object, assemblyLoaderMock.Object, libraryManegerMock.Object, new LoggerFactory());
manager.AddUploadedModules();

Assert.IsTrue(assemblyLoaded);
Assert.IsTrue(assemblyCopied);
Assert.True(assemblyLoaded);
Assert.True(assemblyCopied);
}
}
}
34 changes: 18 additions & 16 deletions vNext/test/BetterModules.Core.Tests/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
{
"version": "1.0.0-*",
"description": "BetterModules.Core.Tests Class Library",
"authors": [ "user" ],
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",
"version": "1.0.0-*",
"description": "BetterModules.Core.Tests Class Library",
"authors": [ "user" ],
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",

"dependencies": {
"System.Collections": "4.0.10-beta-23109",
"System.Linq": "4.0.0-beta-23109",
"System.Threading": "4.0.10-beta-23109",
"System.Runtime": "4.0.10-beta-23109",
"Microsoft.CSharp": "4.0.0-beta-23109",
"xunit": "2.1.0",
"xunit.runner.dnx": "2.1.0-beta5a-build188"
"xunit.runner.dnx": "2.1.0-beta5a-build188",
"BetterModules.Core": "1.0.0-*",
"BetterModules.Sample.Module": "1.0.0-*",
"Moq": "4.2.1506.2515"
},

"frameworks": {
"dnx451": { }
}
}
"commands": {
"test": "xunit.runner.dnx"
},

"frameworks": {
"dnx451": { }
}
}

0 comments on commit 862d993

Please sign in to comment.