Skip to content

Commit

Permalink
Merge pull request #7 from DafnyVSCode/improvement/test-namespace
Browse files Browse the repository at this point in the history
Move the tests into the Microsoft.Dafny.LanguageServer namespace.
  • Loading branch information
camrein committed Nov 6, 2020
2 parents de46c5f + 41ddefa commit caa7bfb
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<RootNamespace>Microsoft.Dafny.LanguageServer.IntegrationTest</RootNamespace>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using System.IO;
using System.IO.Pipelines;

namespace DafnyLS.IntegrationTest {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest {
public class DafnyLanguageServerTestBase : LanguageServerTestBase {
public const string LanguageId = "dafny";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading;
using System.Threading.Tasks;

namespace DafnyLS.IntegrationTest.Extensions {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions {
/// <summary>
/// Extension methods for simplified interaction with the language client.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using DafnyLS.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer;
using Microsoft.Dafny.LanguageServer.Language;
using Microsoft.Dafny.LanguageServer.Language.Symbols;
Expand All @@ -7,7 +7,7 @@
using System.Linq;
using System.Threading.Tasks;

namespace DafnyLS.IntegrationTest.Synchronization {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
[TestClass]
public class DeclarationLocationMigrationTest : SynchronizationTestBase {
// The assertion Assert.IsFalse(document.SymbolTable.Resolved) is used to ensure that
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using DafnyLS.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using System.Threading.Tasks;

namespace DafnyLS.IntegrationTest.Synchronization {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
[TestClass]
public class LookupMigrationTest : SynchronizationTestBase {
// The assertion Assert.IsFalse(document.SymbolTable.Resolved) is used to ensure that
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using DafnyLS.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
using Microsoft.Dafny;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using OmniSharp.Extensions.LanguageServer.Protocol.Client;
using System.Threading.Tasks;

namespace DafnyLS.IntegrationTest {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest {
[TestClass]
public class OpenDocumentTest : DafnyLanguageServerTestBase {
private ILanguageClient _client;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using DafnyLS.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer.Language.Symbols;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using System.Linq;
using System.Threading.Tasks;

namespace DafnyLS.IntegrationTest.Synchronization {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
[TestClass]
public class SymbolMigrationTest : SynchronizationTestBase {
[TestMethod]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using DafnyLS.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using OmniSharp.Extensions.LanguageServer.Protocol.Client;
using OmniSharp.Extensions.LanguageServer.Protocol.Document;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using System.Threading.Tasks;

namespace DafnyLS.IntegrationTest.Synchronization {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
public class SynchronizationTestBase : DafnyLanguageServerTestBase {
protected ILanguageClient Client { get; private set; }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using DafnyLS.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using System.Threading.Tasks;

namespace DafnyLS.IntegrationTest.Synchronization {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
[TestClass]
public class TextInsertionTest : SynchronizationTestBase {
[TestMethod]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using DafnyLS.IntegrationTest.Extensions;
using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using System.Threading.Tasks;

namespace DafnyLS.IntegrationTest.Synchronization {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
[TestClass]
public class TextReplacementTest : SynchronizationTestBase {
[TestMethod]
Expand Down
2 changes: 1 addition & 1 deletion Source/DafnyLS.IntegrationTest/TestLogger.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging;

namespace DafnyLS.IntegrationTest {
namespace Microsoft.Dafny.LanguageServer.IntegrationTest {
/// <summary>
/// Utility collection to simplify the test implementation.
/// </summary>
Expand Down

0 comments on commit caa7bfb

Please sign in to comment.