Merge pull request #23 from sharwell/refactor-harness

sharwell · web-flow · commit d27832e12661 · 2018-06-25T08:48:28.000-05:00
Refactor test harness
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/AbstractIntegrationTest.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/AbstractIntegrationTest.cs
@@ -10,6 +10,7 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
     using System.Windows.Automation;
     using Microsoft.VisualStudio;
     using Microsoft.Win32.SafeHandles;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness;
     using Xunit;
     using IMessageFilter = Microsoft.VisualStudio.OLE.Interop.IMessageFilter;
     using INTERFACEINFO = Microsoft.VisualStudio.OLE.Interop.INTERFACEINFO;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/CaptureTestNameAttribute.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/CaptureTestNameAttribute.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System.Reflection;
     using Xunit.Sdk;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/DirectoryExtensions.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/DirectoryExtensions.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System.IO;
 
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/IntegrationHelper.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/IntegrationHelper.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
     using System.Collections.Generic;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/NativeMethods.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/NativeMethods.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/SendKeys.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/SendKeys.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/Settings.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/Settings.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     internal class Settings
     {
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/SharedIntegrationHostFixture.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/SharedIntegrationHostFixture.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System.Collections.Immutable;
     using Xunit;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VersionTraitAttribute.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VersionTraitAttribute.cs
@@ -1,12 +1,12 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
     using Xunit.Sdk;
 
-    [TraitDiscoverer("Tvl.VisualStudio.MouseFastScroll.IntegrationTests.VersionTraitDiscoverer", "Tvl.VisualStudio.MouseFastScroll.IntegrationTests")]
+    [TraitDiscoverer("Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness.VersionTraitDiscoverer", "Tvl.VisualStudio.MouseFastScroll.IntegrationTests")]
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
     public sealed class VersionTraitAttribute : Attribute, ITraitAttribute
     {
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VersionTraitDiscoverer.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VersionTraitDiscoverer.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
     using System.Collections.Generic;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/Versions.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/Versions.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
 
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VisualStudioInstance.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VisualStudioInstance.cs
@@ -1,15 +1,15 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
     using System.Collections.Immutable;
     using System.Diagnostics;
-    using System.Runtime.InteropServices;
     using System.Runtime.Remoting.Channels;
     using System.Runtime.Remoting.Channels.Ipc;
-    using Microsoft.VisualStudio;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.OutOfProcess;
     using Tvl.VisualStudio.MouseFastScroll.IntegrationTestService;
     using DTE = EnvDTE.DTE;
 
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VisualStudioInstanceContext.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VisualStudioInstanceContext.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
 
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VisualStudioInstanceFactory.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/VisualStudioInstanceFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     using System;
     using System.Collections.Generic;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/WellKnownCommandNames.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/Harness/WellKnownCommandNames.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness
 {
     public static class WellKnownCommandNames
     {
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/Editor_InProc.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/Editor_InProc.cs
@@ -1,14 +1,13 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess
 {
     using System;
     using System.Runtime.InteropServices;
     using System.Windows;
     using Microsoft.VisualStudio.Text;
     using Microsoft.VisualStudio.Text.Editor;
-    using Microsoft.VisualStudio.Text.Formatting;
     using Microsoft.VisualStudio.TextManager.Interop;
 
     internal class Editor_InProc : TextViewWindow_InProc
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/IBufferGraphExtensions.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/IBufferGraphExtensions.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess
 {
     using System;
     using System.Linq;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/ITextViewExtensions.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/ITextViewExtensions.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess
 {
     using System;
     using Microsoft.VisualStudio.Text;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/InProcComponent.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/InProcComponent.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess
 {
     using System;
     using System.Windows;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/TextViewWindow_InProc.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/TextViewWindow_InProc.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess
 {
     using System;
     using Microsoft.VisualStudio.Text;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/VisualStudio_InProc.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/InProcess/VisualStudio_InProc.cs
@@ -1,11 +1,12 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess
 {
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness;
     using Command = EnvDTE.Command;
     using DTE2 = EnvDTE80.DTE2;
     using vsBuildErrorLevel = EnvDTE80.vsBuildErrorLevel;
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/OutOfProcess/Editor_OutOfProc.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/OutOfProcess/Editor_OutOfProc.cs
@@ -1,10 +1,12 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.OutOfProcess
 {
     using System.Windows;
     using Microsoft.VisualStudio.Text.Formatting;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess;
     using WindowsInput.Native;
 
     public class Editor_OutOfProc : TextViewWindow_OutOfProc
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/OutOfProcess/OutOfProcComponent.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/OutOfProcess/OutOfProcComponent.cs
@@ -1,8 +1,11 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.OutOfProcess
 {
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess;
+
     public abstract class OutOfProcComponent
     {
         protected OutOfProcComponent(VisualStudioInstance visualStudioInstance)
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/OutOfProcess/TextViewWindow_OutOfProc.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/OutOfProcess/TextViewWindow_OutOfProc.cs
@@ -1,8 +1,11 @@
 ﻿// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.
 
-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.OutOfProcess
 {
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.InProcess;
+
     public abstract class TextViewWindow_OutOfProc : OutOfProcComponent
     {
         protected TextViewWindow_OutOfProc(VisualStudioInstance visualStudioInstance)
diff --git a/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/TrivialIntegrationTest.cs b/Tvl.VisualStudio.MouseFastScroll.IntegrationTests/TrivialIntegrationTest.cs
@@ -8,6 +8,7 @@ namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests
     using System.Windows;
     using System.Windows.Media;
     using Microsoft.VisualStudio.Text.Formatting;
+    using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness;
     using Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Threading;
     using WindowsInput.Native;
     using Xunit;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.`
`3`	`3`
`4`		`-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests`
	`4`	`+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness`
`5`	`5`	`{`
`6`	`6`	`using System.Reflection;`
`7`	`7`	`using Xunit.Sdk;`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See LICENSE.txt in the project root for license information.`
`3`	`3`
`4`		`-namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests`
	`4`	`+namespace Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness`
`5`	`5`	`{`
`6`	`6`	`using System;`
`7`	`7`	`using Xunit.Sdk;`
`8`	`8`
`9`		`- [TraitDiscoverer("Tvl.VisualStudio.MouseFastScroll.IntegrationTests.VersionTraitDiscoverer", "Tvl.VisualStudio.MouseFastScroll.IntegrationTests")]`
	`9`	`+ [TraitDiscoverer("Tvl.VisualStudio.MouseFastScroll.IntegrationTests.Harness.VersionTraitDiscoverer", "Tvl.VisualStudio.MouseFastScroll.IntegrationTests")]`
`10`	`10`	`[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]`
`11`	`11`	`public sealed class VersionTraitAttribute : Attribute, ITraitAttribute`
`12`	`12`	`{`