Merge pull request #485 from stakx/cleanup

Clean up solution and build script regarding unit test projects
devlooped · Oct 14, 2017 · bc40732 · bc40732
2 parents ea083c6 + fd51023
commit bc40732
Show file tree

Hide file tree

Showing 74 changed files with 66 additions and 692 deletions.
diff --git a/Moq.VisualBasicTests/IssueReports.vb → Moq.Tests.VisualBasic/IssueReports.vb b/Moq.VisualBasicTests/IssueReports.vb → Moq.Tests.VisualBasic/IssueReports.vb
diff --git a/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj b/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+		<AssemblyOriginatorKeyFile>../Moq.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="xunit" Version="2.3.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Source\Moq.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/UnitTests/AdvancedMatcherAttributeFixture.cs → Moq.Tests/AdvancedMatcherAttributeFixture.cs b/UnitTests/AdvancedMatcherAttributeFixture.cs → Moq.Tests/AdvancedMatcherAttributeFixture.cs
diff --git a/UnitTests/AsInterfaceFixture.cs → Moq.Tests/AsInterfaceFixture.cs b/UnitTests/AsInterfaceFixture.cs → Moq.Tests/AsInterfaceFixture.cs
diff --git a/UnitTests/CallbacksFixture.cs → Moq.Tests/CallbacksFixture.cs b/UnitTests/CallbacksFixture.cs → Moq.Tests/CallbacksFixture.cs
diff --git a/UnitTests/CaptureFixture.cs → Moq.Tests/CaptureFixture.cs b/UnitTests/CaptureFixture.cs → Moq.Tests/CaptureFixture.cs
diff --git a/UnitTests/CaptureMatchFixture.cs → Moq.Tests/CaptureMatchFixture.cs b/UnitTests/CaptureMatchFixture.cs → Moq.Tests/CaptureMatchFixture.cs
diff --git a/UnitTests/ConditionalSetupFixture.cs → Moq.Tests/ConditionalSetupFixture.cs b/UnitTests/ConditionalSetupFixture.cs → Moq.Tests/ConditionalSetupFixture.cs
diff --git a/UnitTests/CustomMatcherFixture.cs → Moq.Tests/CustomMatcherFixture.cs b/UnitTests/CustomMatcherFixture.cs → Moq.Tests/CustomMatcherFixture.cs
diff --git a/UnitTests/Demo.cs → Moq.Tests/Demo.cs b/UnitTests/Demo.cs → Moq.Tests/Demo.cs
diff --git a/...Tests/EmptyDefaultValueProviderFixture.cs → ...Tests/EmptyDefaultValueProviderFixture.cs b/...Tests/EmptyDefaultValueProviderFixture.cs → ...Tests/EmptyDefaultValueProviderFixture.cs
diff --git a/UnitTests/ExpressionExtensionsFixture.cs → Moq.Tests/ExpressionExtensionsFixture.cs b/UnitTests/ExpressionExtensionsFixture.cs → Moq.Tests/ExpressionExtensionsFixture.cs
diff --git a/UnitTests/ExtensibilityFixture.cs → Moq.Tests/ExtensibilityFixture.cs b/UnitTests/ExtensibilityFixture.cs → Moq.Tests/ExtensibilityFixture.cs
diff --git a/UnitTests/ExtensionsFixture.cs → Moq.Tests/ExtensionsFixture.cs b/UnitTests/ExtensionsFixture.cs → Moq.Tests/ExtensionsFixture.cs
diff --git a/...ests/GeneratedReturnsExtensionsFixture.cs → ...ests/GeneratedReturnsExtensionsFixture.cs b/...ests/GeneratedReturnsExtensionsFixture.cs → ...ests/GeneratedReturnsExtensionsFixture.cs
diff --git a/UnitTests/Linq/MockRepositoryQuerying.cs → Moq.Tests/Linq/MockRepositoryQuerying.cs b/UnitTests/Linq/MockRepositoryQuerying.cs → Moq.Tests/Linq/MockRepositoryQuerying.cs
diff --git a/UnitTests/Linq/QueryableMocksFixture.cs → Moq.Tests/Linq/QueryableMocksFixture.cs b/UnitTests/Linq/QueryableMocksFixture.cs → Moq.Tests/Linq/QueryableMocksFixture.cs
diff --git a/UnitTests/Linq/SupportedQuerying.cs → Moq.Tests/Linq/SupportedQuerying.cs b/UnitTests/Linq/SupportedQuerying.cs → Moq.Tests/Linq/SupportedQuerying.cs
diff --git a/UnitTests/Linq/UnsupportedQuerying.cs → Moq.Tests/Linq/UnsupportedQuerying.cs b/UnitTests/Linq/UnsupportedQuerying.cs → Moq.Tests/Linq/UnsupportedQuerying.cs
diff --git a/UnitTests/MatcherAttributeFixture.cs → Moq.Tests/MatcherAttributeFixture.cs b/UnitTests/MatcherAttributeFixture.cs → Moq.Tests/MatcherAttributeFixture.cs
diff --git a/UnitTests/Matchers/AnyMatcherFixture.cs → Moq.Tests/Matchers/AnyMatcherFixture.cs b/UnitTests/Matchers/AnyMatcherFixture.cs → Moq.Tests/Matchers/AnyMatcherFixture.cs
diff --git a/UnitTests/MatchersFixture.cs → Moq.Tests/MatchersFixture.cs b/UnitTests/MatchersFixture.cs → Moq.Tests/MatchersFixture.cs
diff --git a/UnitTests/MockBehaviorFixture.cs → Moq.Tests/MockBehaviorFixture.cs b/UnitTests/MockBehaviorFixture.cs → Moq.Tests/MockBehaviorFixture.cs
@@ -47,7 +47,7 @@ public void ShouldReturnEmptyArrayOnLoose()
 			var mock = new Mock<IFoo>(MockBehavior.Loose);
 
 			Assert.NotNull(mock.Object.GetArray());
-			Assert.Equal(0, mock.Object.GetArray().Length);
+			Assert.Empty(mock.Object.GetArray());
 		}
 
 		[Fact]
@@ -56,7 +56,7 @@ public void ShouldReturnEmptyArrayTwoDimensionsOnLoose()
 			var mock = new Mock<IFoo>(MockBehavior.Loose);
 
 			Assert.NotNull(mock.Object.GetArrayTwoDimensions());
-			Assert.Equal(0, mock.Object.GetArrayTwoDimensions().Length);
+			Assert.Empty(mock.Object.GetArrayTwoDimensions());
 		}
 
 		[Fact]
@@ -73,7 +73,7 @@ public void ShouldReturnEmptyEnumerableStringOnLoose()
 			var mock = new Mock<IFoo>(MockBehavior.Loose);
 
 			Assert.NotNull(mock.Object.GetEnumerable());
-			Assert.Equal(0, mock.Object.GetEnumerable().Count());
+			Assert.Empty(mock.Object.GetEnumerable());
 		}
 
 		[Fact]
@@ -82,7 +82,7 @@ public void ShouldReturnEmptyEnumerableObjectsOnLoose()
 			var mock = new Mock<IFoo>(MockBehavior.Loose);
 
 			Assert.NotNull(mock.Object.GetEnumerableObjects());
-			Assert.Equal(0, mock.Object.GetEnumerableObjects().Cast<object>().Count());
+			Assert.Empty(mock.Object.GetEnumerableObjects().Cast<object>());
 		}
 
 		[Fact]
@@ -140,7 +140,7 @@ public void ReturnsEmptyArrayOnLooseWithMockDefaultValue()
 			var mock = new Mock<IFoo>(MockBehavior.Loose) { DefaultValue = DefaultValue.Mock };
 
 			Assert.NotNull(mock.Object.GetArray());
-			Assert.Equal(0, mock.Object.GetArray().Length);
+			Assert.Empty(mock.Object.GetArray());
 		}
 
 		[Fact]
@@ -149,7 +149,7 @@ public void ReturnsEmptyArrayTwoDimensionsOnLooseWithMockDefaultValue()
 			var mock = new Mock<IFoo>(MockBehavior.Loose) { DefaultValue = DefaultValue.Mock };
 
 			Assert.NotNull(mock.Object.GetArrayTwoDimensions());
-			Assert.Equal(0, mock.Object.GetArrayTwoDimensions().Length);
+			Assert.Empty(mock.Object.GetArrayTwoDimensions());
 		}
 
 		[Fact]
@@ -172,7 +172,7 @@ public void ReturnsEmptyEnumerableStringOnLooseWithMockDefaultValue()
 			var mock = new Mock<IFoo>(MockBehavior.Loose) { DefaultValue = DefaultValue.Mock };
 
 			Assert.NotNull(mock.Object.GetEnumerable());
-			Assert.Equal(0, mock.Object.GetEnumerable().Count());
+			Assert.Empty(mock.Object.GetEnumerable());
 		}
 
 		[Fact]
@@ -190,7 +190,7 @@ public void ReturnsEmptyEnumerableObjectsOnLooseWithMockDefaultValue()
 			var mock = new Mock<IFoo>(MockBehavior.Loose) { DefaultValue = DefaultValue.Mock };
 
 			Assert.NotNull(mock.Object.GetEnumerableObjects());
-			Assert.Equal(0, mock.Object.GetEnumerableObjects().Cast<object>().Count());
+			Assert.Empty(mock.Object.GetEnumerableObjects().Cast<object>());
 		}
 
 		[Fact]

diff --git a/UnitTests/MockDefaultValueProviderFixture.cs → Moq.Tests/MockDefaultValueProviderFixture.cs b/UnitTests/MockDefaultValueProviderFixture.cs → Moq.Tests/MockDefaultValueProviderFixture.cs
diff --git a/UnitTests/MockFixture.cs → Moq.Tests/MockFixture.cs b/UnitTests/MockFixture.cs → Moq.Tests/MockFixture.cs
@@ -897,12 +897,6 @@ public void DistinguishesSameMethodsWithDifferentGenericArguments()
 			Assert.Equal(3, mock.Object.Generic<string>());
 		}
 
-		[Fact]
-		public void CanCreateMockOfInternalInterface()
-		{
-			Assert.NotNull(new Mock<ClassLibrary1.IFooInternal>().Object);
-		}
-
 		/// <summary>
 		/// Mostly testing that these casts compile, but also that there are no runtime failures.
 		/// </summary>

diff --git a/UnitTests/MockRepositoryFixture.cs → Moq.Tests/MockRepositoryFixture.cs b/UnitTests/MockRepositoryFixture.cs → Moq.Tests/MockRepositoryFixture.cs
diff --git a/UnitTests/MockSequenceFixture.cs → Moq.Tests/MockSequenceFixture.cs b/UnitTests/MockSequenceFixture.cs → Moq.Tests/MockSequenceFixture.cs
diff --git a/UnitTests/MockedDelegatesFixture.cs → Moq.Tests/MockedDelegatesFixture.cs b/UnitTests/MockedDelegatesFixture.cs → Moq.Tests/MockedDelegatesFixture.cs
diff --git a/UnitTests/MockedEventsFixture.cs → Moq.Tests/MockedEventsFixture.cs b/UnitTests/MockedEventsFixture.cs → Moq.Tests/MockedEventsFixture.cs
diff --git a/UnitTests/MockedFixture.cs → Moq.Tests/MockedFixture.cs b/UnitTests/MockedFixture.cs → Moq.Tests/MockedFixture.cs
diff --git a/UnitTests/Moq.Tests.csproj → Moq.Tests/Moq.Tests.csproj b/UnitTests/Moq.Tests.csproj → Moq.Tests/Moq.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
+		<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
 		<AssemblyName>Moq.Tests</AssemblyName>
 		<AssemblyOriginatorKeyFile>../Moq.snk</AssemblyOriginatorKeyFile>
 		<DebugSymbols>True</DebugSymbols>
@@ -11,36 +11,34 @@
 		<SignAssembly>true</SignAssembly>
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
 		<DefineConstants>$(DefineConstants);DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION</DefineConstants>
 	</PropertyGroup>
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
 		<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Castle.Core" Version="4.2.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-		<PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+		<PackageReference Include="xunit" Version="2.3.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
 		<ProjectReference Include="..\Source\Moq.csproj" />
-		<ProjectReference Include="Library\ClassLibrary1\ClassLibrary1.csproj" />
-		<ProjectReference Include="Library\ClassLibrary2\ClassLibrary2.csproj" />
-		<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />
+		<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
 		<Reference Include="System.Web" />
 		<Reference Include="System.Windows.Forms" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
 		<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
 		<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
 		<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
 		<PackageReference Include="System.ServiceModel.Primitives" Version="4.3.0" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<Compile Remove="Library\**\*.cs;Pex\**\*.cs;Properties\**\*.cs" />
+		<Compile Remove="Pex\**\*.cs;Properties\**\*.cs" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/UnitTests/OccurrenceFixture.cs → Moq.Tests/OccurrenceFixture.cs b/UnitTests/OccurrenceFixture.cs → Moq.Tests/OccurrenceFixture.cs
diff --git a/UnitTests/OutRefFixture.cs → Moq.Tests/OutRefFixture.cs b/UnitTests/OutRefFixture.cs → Moq.Tests/OutRefFixture.cs
diff --git a/UnitTests/Pex/Moq.UnitTests.Pex.csproj → Moq.Tests/Pex/Moq.UnitTests.Pex.csproj b/UnitTests/Pex/Moq.UnitTests.Pex.csproj → Moq.Tests/Pex/Moq.UnitTests.Pex.csproj
diff --git a/UnitTests/Pex/Moq.UnitTests.Pex.sln → Moq.Tests/Pex/Moq.UnitTests.Pex.sln b/UnitTests/Pex/Moq.UnitTests.Pex.sln → Moq.Tests/Pex/Moq.UnitTests.Pex.sln
diff --git a/UnitTests/Pex/ShouldExpectCallReturn.cs → Moq.Tests/Pex/ShouldExpectCallReturn.cs b/UnitTests/Pex/ShouldExpectCallReturn.cs → Moq.Tests/Pex/ShouldExpectCallReturn.cs
diff --git a/...Tests/Pex/ShouldExpectCallWithArgument.cs → ...Tests/Pex/ShouldExpectCallWithArgument.cs b/...Tests/Pex/ShouldExpectCallWithArgument.cs → ...Tests/Pex/ShouldExpectCallWithArgument.cs
diff --git a/...uldExpectCallWithReferenceLazyEvaluate.cs → ...uldExpectCallWithReferenceLazyEvaluate.cs b/...uldExpectCallWithReferenceLazyEvaluate.cs → ...uldExpectCallWithReferenceLazyEvaluate.cs
diff --git a/...ts/Pex/ShouldExpectReturnPropertyValue.cs → ...ts/Pex/ShouldExpectReturnPropertyValue.cs b/...ts/Pex/ShouldExpectReturnPropertyValue.cs → ...ts/Pex/ShouldExpectReturnPropertyValue.cs
diff --git a/...Tests/Pex/ShouldMatchPredicateArgument.cs → ...Tests/Pex/ShouldMatchPredicateArgument.cs b/...Tests/Pex/ShouldMatchPredicateArgument.cs → ...Tests/Pex/ShouldMatchPredicateArgument.cs
diff --git a/UnitTests/Properties/AssemblyInfo.cs → Moq.Tests/Properties/AssemblyInfo.cs b/UnitTests/Properties/AssemblyInfo.cs → Moq.Tests/Properties/AssemblyInfo.cs
diff --git a/UnitTests/PropertiesFixture.cs → Moq.Tests/PropertiesFixture.cs b/UnitTests/PropertiesFixture.cs → Moq.Tests/PropertiesFixture.cs
diff --git a/UnitTests/ProtectedMockFixture.cs → Moq.Tests/ProtectedMockFixture.cs b/UnitTests/ProtectedMockFixture.cs → Moq.Tests/ProtectedMockFixture.cs
diff --git a/UnitTests/RecursiveMocksFixture.cs → Moq.Tests/RecursiveMocksFixture.cs b/UnitTests/RecursiveMocksFixture.cs → Moq.Tests/RecursiveMocksFixture.cs
diff --git a/UnitTests/Regressions/FluentMockIssues.cs → Moq.Tests/Regressions/FluentMockIssues.cs b/UnitTests/Regressions/FluentMockIssues.cs → Moq.Tests/Regressions/FluentMockIssues.cs
diff --git a/UnitTests/Regressions/IssueReportsFixture.cs → Moq.Tests/Regressions/IssueReportsFixture.cs b/UnitTests/Regressions/IssueReportsFixture.cs → Moq.Tests/Regressions/IssueReportsFixture.cs
@@ -3185,29 +3185,6 @@ private void SetupOperationStub<T>(Func<T, string> valueFunction)
 
 		#endregion
 
-		#region #273
-
-		public class _273
-		{
-			[Fact]
-			public void WhenMockingAnExternalInterface_ThenItWorks()
-			{
-				Assert.NotNull(new Mock<ClassLibrary1.IFoo>().Object);
-				Assert.NotNull(Mock.Of<ClassLibrary1.IFoo>());
-				Assert.NotNull(new Mock<ClassLibrary1.Foo>().Object);
-				Assert.NotNull(new Mock<ClassLibrary2.IBar>().Object);
-				Assert.NotNull(Mock.Of<ClassLibrary2.IBar>());
-				Assert.NotNull(new Mock<ClassLibrary2.Bar>().Object);
-				Assert.NotNull(new Mock<Baz>().Object);
-			}
-
-			public class Baz : ClassLibrary2.Bar
-			{
-			}
-		}
-
-		#endregion
-
 		#region #325
 
 		public class _325

diff --git a/UnitTests/Regressions/StreamFixture.cs → Moq.Tests/Regressions/StreamFixture.cs b/UnitTests/Regressions/StreamFixture.cs → Moq.Tests/Regressions/StreamFixture.cs
diff --git a/UnitTests/ReturnsExtensionsFixture.cs → Moq.Tests/ReturnsExtensionsFixture.cs b/UnitTests/ReturnsExtensionsFixture.cs → Moq.Tests/ReturnsExtensionsFixture.cs
diff --git a/UnitTests/ReturnsFixture.cs → Moq.Tests/ReturnsFixture.cs b/UnitTests/ReturnsFixture.cs → Moq.Tests/ReturnsFixture.cs
diff --git a/UnitTests/SequenceExtensionsFixture.cs → Moq.Tests/SequenceExtensionsFixture.cs b/UnitTests/SequenceExtensionsFixture.cs → Moq.Tests/SequenceExtensionsFixture.cs
diff --git a/...ests/SequentialActionExtensionsFixture.cs → ...ests/SequentialActionExtensionsFixture.cs b/...ests/SequentialActionExtensionsFixture.cs → ...ests/SequentialActionExtensionsFixture.cs
diff --git a/UnitTests/StubExtensionsFixture.cs → Moq.Tests/StubExtensionsFixture.cs b/UnitTests/StubExtensionsFixture.cs → Moq.Tests/StubExtensionsFixture.cs
diff --git a/UnitTests/TimesFixture.cs → Moq.Tests/TimesFixture.cs b/UnitTests/TimesFixture.cs → Moq.Tests/TimesFixture.cs
diff --git a/UnitTests/VerifyFixture.cs → Moq.Tests/VerifyFixture.cs b/UnitTests/VerifyFixture.cs → Moq.Tests/VerifyFixture.cs
diff --git a/Moq.VisualBasicTests/Moq.VisualBasicTests.vbproj b/Moq.VisualBasicTests/Moq.VisualBasicTests.vbproj
diff --git a/Moq.VisualBasicTests/My Project/Application.Designer.vb b/Moq.VisualBasicTests/My Project/Application.Designer.vb
diff --git a/Moq.VisualBasicTests/My Project/Application.myapp b/Moq.VisualBasicTests/My Project/Application.myapp
diff --git a/Moq.VisualBasicTests/My Project/AssemblyInfo.vb b/Moq.VisualBasicTests/My Project/AssemblyInfo.vb