Skip to content

Commit

Permalink
Got rid of copy/pasted files in Unity4/Unity5 projects. Instead added…
Browse files Browse the repository at this point in the history 
… common files as references.
  • Loading branch information
@mykolav
mykolav committed May 30, 2018
1 parent 2cb49d7 commit 6c98342
Show file tree
Hide file tree
Showing 41 changed files with 193 additions and 708 deletions.
13 changes: 9 additions & 4 deletions ...h/Ctor_with_one_dependency_param_where.cs → ...h/Ctor_with_one_dependency_param_where.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
using System;
using FluentAssertions;
using Microsoft.Practices.Unity;
using ParameterizedAutoFactory.Unity4.Tests.Support;
using ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes;
using ParameterizedAutoFactory.Tests.Support;
using ParameterizedAutoFactory.Tests.Support.InjectedTypes;
using Xunit;
#if UNITY4_0_1
using Microsoft.Practices.Unity;
#elif UNITY5_X
using Unity;
#endif


namespace ParameterizedAutoFactory.Unity4.Tests.Automatic_factory.Creates_instance.Of_type_with
namespace ParameterizedAutoFactory.Tests.Automatic_factory.Creates_instance.Of_type_with
{
public class Ctor_with_one_dependency_param_where
{
Expand Down
13 changes: 9 additions & 4 deletions ..._with/Ctor_with_one_simple_param_where.cs → ..._with/Ctor_with_one_simple_param_where.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
using System;
using FluentAssertions;
using Microsoft.Practices.Unity;
using ParameterizedAutoFactory.Unity4.Tests.Support;
using ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes;
using ParameterizedAutoFactory.Tests.Support;
using ParameterizedAutoFactory.Tests.Support.InjectedTypes;
using Xunit;
#if UNITY4_0_1
using Microsoft.Practices.Unity;
#elif UNITY5_X
using Unity;
#endif


namespace ParameterizedAutoFactory.Unity4.Tests.Automatic_factory.Creates_instance.Of_type_with
namespace ParameterizedAutoFactory.Tests.Automatic_factory.Creates_instance.Of_type_with
{
public class Ctor_with_one_simple_param_where
{
Expand Down
10 changes: 7 additions & 3 deletions .../Ctor_with_two_dependency_params_where.cs → .../Ctor_with_two_dependency_params_where.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
using System;
using FluentAssertions;
using ParameterizedAutoFactory.Unity5.Tests.Support;
using ParameterizedAutoFactory.Unity5.Tests.Support.InjectedTypes;
using ParameterizedAutoFactory.Tests.Support;
using ParameterizedAutoFactory.Tests.Support.InjectedTypes;
using Xunit;
#if UNITY4_0_1
using Microsoft.Practices.Unity;
#elif UNITY5_X
using Unity;
#endif

namespace ParameterizedAutoFactory.Unity5.Tests.Automatic_factory.Creates_instance.Of_type_with
namespace ParameterizedAutoFactory.Tests.Automatic_factory.Creates_instance.Of_type_with
{
public class Ctor_with_two_dependency_params_where
{
Expand Down
12 changes: 8 additions & 4 deletions ...e_with_ctor_with_two_dependency_params.cs → ...e_with_ctor_with_two_dependency_params.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
using System;
using FluentAssertions;
using Microsoft.Practices.Unity;
using ParameterizedAutoFactory.Unity4.Tests.Support;
using ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes;
using ParameterizedAutoFactory.Tests.Support;
using ParameterizedAutoFactory.Tests.Support.InjectedTypes;
using Xunit;
#if UNITY4_0_1
using Microsoft.Practices.Unity;
#elif UNITY5_X
using Unity;
#endif

namespace ParameterizedAutoFactory.Unity4.Tests.Automatic_factory.Creates_instance.When_null_supplied
namespace ParameterizedAutoFactory.Tests.Automatic_factory.Creates_instance.When_null_supplied
{
public class To_type_with_ctor_with_two_dependency_params
{
Expand Down
12 changes: 8 additions & 4 deletions ...For_type_with/Ctor_with_dependecy_tree.cs → ...For_type_with/Ctor_with_dependecy_tree.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
using System;
using FluentAssertions;
using Microsoft.Practices.Unity;
using ParameterizedAutoFactory.Unity4.Tests.Support;
using ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes;
using ParameterizedAutoFactory.Tests.Support;
using ParameterizedAutoFactory.Tests.Support.InjectedTypes;
using Xunit;
#if UNITY4_0_1
using Microsoft.Practices.Unity;
#elif UNITY5_X
using Unity;
#endif

namespace ParameterizedAutoFactory.Unity4.Tests.Automatic_factory.For_type_with
namespace ParameterizedAutoFactory.Tests.Automatic_factory.For_type_with
{
public class Ctor_with_dependecy_tree
{
Expand Down
13 changes: 9 additions & 4 deletions ...Ctor_with_two_params_of_same_type_with.cs → ...Ctor_with_two_params_of_same_type_with.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
using System;
using FluentAssertions;
using ParameterizedAutoFactory.Unity5.Tests.Support;
using ParameterizedAutoFactory.Unity5.Tests.Support.InjectedTypes;
using ParameterizedAutoFactory.Tests.Support;
using ParameterizedAutoFactory.Tests.Support.InjectedTypes;
using Xunit;
#if UNITY4_0_1
using Microsoft.Practices.Unity;
#elif UNITY5_X
using Unity;
using Unity.Exceptions;
using Xunit;
#endif


namespace ParameterizedAutoFactory.Unity5.Tests.Automatic_factory.For_type_with
namespace ParameterizedAutoFactory.Tests.Automatic_factory.For_type_with
{
public class Ctor_with_two_params_of_same_type_with
{
Expand Down
12 changes: 8 additions & 4 deletions ...4.Tests/Automatic_factory/Of_same_type.cs → ...y.Tests/Automatic_factory/Of_same_type.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
using System;
using FluentAssertions;
using Microsoft.Practices.Unity;
using ParameterizedAutoFactory.Unity4.Tests.Support;
using ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes;
using ParameterizedAutoFactory.Tests.Support;
using ParameterizedAutoFactory.Tests.Support.InjectedTypes;
using Xunit;
#if UNITY4_0_1
using Microsoft.Practices.Unity;
#elif UNITY5_X
using Unity;
#endif

namespace ParameterizedAutoFactory.Unity4.Tests.Automatic_factory
namespace ParameterizedAutoFactory.Tests.Automatic_factory
{
public class Of_same_type
{
Expand Down
13 changes: 10 additions & 3 deletions ...erizedAutoFactory.Unity4.Tests/Sandbox.cs → ...terizedAutoFactory.Unity.Tests/Sandbox.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
using System;
using FluentAssertions;
using Microsoft.Practices.Unity;
using ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes;
using ParameterizedAutoFactory.Tests.Support.InjectedTypes;
using Xunit;
using ParameterizedAutoFactory.Unity;
#if UNITY4_0_1
using ParameterizedAutoFactory.Unity4;
using Microsoft.Practices.Unity;
#elif UNITY5_X
using Unity;
using ParameterizedAutoFactory.Unity5;
#endif

namespace ParameterizedAutoFactory.Unity4.Tests
namespace ParameterizedAutoFactory.Tests
{
public class Sandbox
{
Expand Down
11 changes: 9 additions & 2 deletions ....Unity5.Tests/Support/ContainerBuilder.cs → ...y.Unity.Tests/Support/ContainerBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
using Unity;
using ParameterizedAutoFactory.Unity;
#if UNITY4_0_1
using Microsoft.Practices.Unity;
using ParameterizedAutoFactory.Unity4;
#elif UNITY5_X
using ParameterizedAutoFactory.Unity5;
using Unity;
#endif

namespace ParameterizedAutoFactory.Unity5.Tests.Support
namespace ParameterizedAutoFactory.Tests.Support
{
internal class ContainerBuilder
{
Expand Down
2 changes: 1 addition & 1 deletion ...pes/TypeWithCtorWithOneDependencyParam.cs → ...pes/TypeWithCtorWithOneDependencyParam.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes
namespace ParameterizedAutoFactory.Tests.Support.InjectedTypes
{
public class TypeWithCtorWithOneDependencyParam
{
Expand Down
2 changes: 1 addition & 1 deletion ...CtorWithOneSimpleAndOneDependencyParam.cs → ...CtorWithOneSimpleAndOneDependencyParam.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes
namespace ParameterizedAutoFactory.Tests.Support.InjectedTypes
{
public class TypeWithCtorWithOneSimpleAndOneDependencyParam
{
Expand Down
2 changes: 1 addition & 1 deletion ...edTypes/TypeWithCtorWithOneSimpleParam.cs → ...edTypes/TypeWithCtorWithOneSimpleParam.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ParameterizedAutoFactory.Unity5.Tests.Support.InjectedTypes
namespace ParameterizedAutoFactory.Tests.Support.InjectedTypes
{
public class TypeWithCtorWithOneSimpleParam
{
Expand Down
2 changes: 1 addition & 1 deletion ...es/TypeWithCtorWithTwoDependencyParams.cs → ...es/TypeWithCtorWithTwoDependencyParams.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes
namespace ParameterizedAutoFactory.Tests.Support.InjectedTypes
{
public class TypeWithCtorWithTwoDependencyParams
{
Expand Down
2 changes: 1 addition & 1 deletion ...hCtorWithTwoDependencyParamsOfSameType.cs → ...hCtorWithTwoDependencyParamsOfSameType.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes
namespace ParameterizedAutoFactory.Tests.Support.InjectedTypes
{
public class TypeWithCtorWithTwoDependencyParamsOfSameType
{
Expand Down
2 changes: 1 addition & 1 deletion ...dTypes/TypeWithCtorWithTwoSimpleParams.cs → ...dTypes/TypeWithCtorWithTwoSimpleParams.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ParameterizedAutoFactory.Unity4.Tests.Support.InjectedTypes
namespace ParameterizedAutoFactory.Tests.Support.InjectedTypes
{
public class TypeWithCtorWithTwoSimpleParams
{
Expand Down
6 changes: 6 additions & 0 deletions ParameterizedAutoFactory.Unity.Tests/Support/InjectedTypes/TypeWithParameterlessCtor.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace ParameterizedAutoFactory.Tests.Support.InjectedTypes
{
public class TypeWithParameterlessCtor
{
}
}
11 changes: 9 additions & 2 deletions ...arameterizedAutoFactoryBuilderStrategy.cs → ...arameterizedAutoFactoryBuilderStrategy.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
using System.Linq;
using Unity.ParameterizedAutoFactory.Core;
#if UNITY4_0_1
using Microsoft.Practices.ObjectBuilder2;
using Microsoft.Practices.Unity;
using ParameterByTypeOverride=ParameterizedAutoFactory.Unity4.ParameterByTypeOverride;
#elif UNITY5_X
using Unity;
using Unity.Builder;
using Unity.Builder.Strategy;
using Unity.ParameterizedAutoFactory.Core;
using Unity.Resolution;
using ParameterByTypeOverride=ParameterizedAutoFactory.Unity5.ParameterByTypeOverride;
#endif

namespace ParameterizedAutoFactory.Unity5
namespace ParameterizedAutoFactory.Unity
{
/// <summary>
/// The <see cref="PreBuildUp" /> method of this class gets
Expand Down
0 ...arameterizedAutoFactoryBuilderStrategy.cs → ...rameterizedAutoFactoryBuilderStrategy4.cs
View file
File renamed without changes.
7 changes: 6 additions & 1 deletion ...ity5/ParameterizedAutoFactoryExtension.cs → ...nity/ParameterizedAutoFactoryExtension.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#if UNITY4_0_1
using Microsoft.Practices.Unity;
using Microsoft.Practices.Unity.ObjectBuilder;
#elif UNITY5_X
using Unity;
using Unity.Builder;
using Unity.Extension;
#endif

namespace ParameterizedAutoFactory.Unity5
namespace ParameterizedAutoFactory.Unity
{
/// <summary>
/// This is a unity extension class.
Expand Down
0 ...ity4/ParameterizedAutoFactoryExtension.cs → ...ity/ParameterizedAutoFactoryExtension4.cs
View file
File renamed without changes.
102 changes: 0 additions & 102 deletions ...ctory/Creates_instance/Of_type_with/To_type_with_ctor_with_two_dependency_params_where.cs
View file

This file was deleted.

Loading

0 comments on commit 6c98342

Please sign in to comment.