From bbb2b3b1001647c877f41ad8d4bb44741c1be41a Mon Sep 17 00:00:00 2001
From: Troy Dai <troy.dai@outlook.com>
Date: Tue, 31 May 2016 13:51:15 -0700
Subject: [PATCH] Update namespace of test endpoints to V2

---
 src/omnisharpUtils.ts |  8 ++++----
 src/protocol.ts       | 40 +++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/omnisharpUtils.ts b/src/omnisharpUtils.ts
index d8733cb68..d1b1e8822 100644
--- a/src/omnisharpUtils.ts
+++ b/src/omnisharpUtils.ts
@@ -73,10 +73,10 @@ export function updateBuffer(server: OmnisharpServer, request: protocol.UpdateBu
     return server.makeRequest<boolean>(protocol.Requests.UpdateBuffer, request);
 }
 
-export function getTestStartInfo(server: OmnisharpServer, request: protocol.GetTestStartInfoRequest) {
-    return server.makeRequest<protocol.GetTestStartInfoResponse>(protocol.Requests.GetTestStartInfo, request);
+export function getTestStartInfo(server: OmnisharpServer, request: protocol.V2.GetTestStartInfoRequest) {
+    return server.makeRequest<protocol.V2.GetTestStartInfoResponse>(protocol.V2.Requests.GetTestStartInfo, request);
 }
 
-export function runDotNetTest(server: OmnisharpServer, request: protocol.RunDotNetTestRequest) {
-    return server.makeRequest<protocol.RunDotNetTestResponse>(protocol.Requests.RunDotNetTest, request);
+export function runDotNetTest(server: OmnisharpServer, request: protocol.V2.RunDotNetTestRequest) {
+    return server.makeRequest<protocol.V2.RunDotNetTestResponse>(protocol.V2.Requests.RunDotNetTest, request);
 }
\ No newline at end of file
diff --git a/src/protocol.ts b/src/protocol.ts
index beb54ceb5..76bb72bd1 100644
--- a/src/protocol.ts
+++ b/src/protocol.ts
@@ -26,9 +26,6 @@ export module Requests {
     export const SignatureHelp = '/signatureHelp';
     export const TypeLookup = '/typelookup';
     export const UpdateBuffer = '/updatebuffer';
-
-    export const GetTestStartInfo = '/v2/getteststartinfo';
-    export const RunDotNetTest = '/v2/runtest';
 }
 
 export interface Request {
@@ -375,6 +372,8 @@ export namespace V2 {
     export module Requests {
         export const GetCodeActions = '/v2/getcodeactions';
         export const RunCodeAction = '/v2/runcodeaction';
+        export const GetTestStartInfo = '/v2/getteststartinfo';
+        export const RunDotNetTest = '/v2/runtest';
     }
 
     export interface Point {
@@ -448,26 +447,25 @@ export namespace V2 {
         Name: string;
         Version: string;
     }
-}
 
-// dotnet-test endpoints
-
-export interface GetTestStartInfoRequest {
-    FileName: string;
-    MethodName: string;
-}
+    // dotnet-test endpoints
+    export interface GetTestStartInfoRequest {
+        FileName: string;
+        MethodName: string;
+    }
 
-export interface GetTestStartInfoResponse {
-    Executable: string;
-    Argument: string;
-}
+    export interface GetTestStartInfoResponse {
+        Executable: string;
+        Argument: string;
+    }
 
-export interface RunDotNetTestRequest {
-    FileName: string;
-    MethodName: string;
-}
+    export interface RunDotNetTestRequest {
+        FileName: string;
+        MethodName: string;
+    }
 
-export interface RunDotNetTestResponse {
-    Failure: string;
-    Pass: boolean;
+    export interface RunDotNetTestResponse {
+        Failure: string;
+        Pass: boolean;
+    }
 }
\ No newline at end of file