Merge pull request #3 from manuelseeger/moretests

Moretests

README.md

@@ -18,11 +18,13 @@ In the first release this extension adds the capabilities listed below. Only sta
 ## Metadata Awareness
 The extension provides basic IntelliSense for the OData query language based on service metadata. 
 ### Metadata driven code completion
-Provide basic Intellisense based on OData metadata: 
+Provide basic Intellisense based on OData metadata.
+
 ![odata-combine](./images/metadata-complete.gif)
 
 ### Metadata driven code navigation
-Navigate to metadata definitions from entities and properties: 
+Navigate to metadata definitions from entities and properties.
+
 ![odata-combine](./images/metadata-definition.gif)
 
 ## Commands

src/odataCommands.ts

@@ -40,6 +40,7 @@ export function odataFormatUrl(text: string) {
         .filter(t => !t.match(/^\s*\/\//))
         // Remove extra whitespaces and join into a single line.
         .map(t => t.trim())
+        .filter(t => t != '')
         .join(' ')
         // Make sure there are no spaces in the fragment part or the URI.
         .replace(/\s+\?/, "?");
@@ -137,18 +138,9 @@ export function odataOpen() {
 function getActiveRange(editor: TextEditor): Range {
     let selection = editor.selection;
     if (selection.isEmpty) {
-        // Empy selection indicates line selection mode.
-        let startLine = selection.start.line;
-        let endLine = selection.end.line;
-        // Extend selection to not-empty previous lines.
-        while (startLine > 0 && editor.document.lineAt(startLine - 1).isEmptyOrWhitespace == false) {
-            startLine -= 1;
-        }
-        // Extend selection to non-empty next lines.
-        while (endLine < editor.document.lineCount - 1 && editor.document.lineAt(endLine + 1).isEmptyOrWhitespace == false) {
-            endLine += 1;
-        }
-        return new Range(new Position(startLine, 0), editor.document.lineAt(endLine).range.end);
+        let firstLine = editor.document.lineAt(0);
+        let lastLine = editor.document.lineAt(editor.document.lineCount - 1);
+        return new Range(firstLine.range.start, lastLine.range.end);
     } else {
         return selection;
     }

src/odataCompletions.ts

@@ -17,6 +17,9 @@ export class ODataDefaultCompletionItemProvider implements vscode.CompletionItem
         if (document.getWordRangeAtPosition(position, /\$select=.*/)) {
             return null;
         }
+        if (document.getWordRangeAtPosition(position, /\/[a-zA-Z]*/)) {
+            return null;
+        }
         if (document.getWordRangeAtPosition(position, /\$inlinecount=.*/)) {
             return new CompletionList([new CompletionItem("allpages", CompletionItemKind.EnumMember)])
         }

src/test/fixtures/northwind$metadata.xml

@@ -380,9 +380,6 @@
                 <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
                 <Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" />
             </EntityType>
-            <Annotations Target="ODataWebExperimental.Northwind.Model.NorthwindEntities">
-                <Annotation Term="Com.Microsoft.OData.Service.Conventions.V1.UrlConventions" String="KeyAsSegment" />
-            </Annotations>
         </Schema>
         <Schema Namespace="ODataWebExperimental.Northwind.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm">
             <EntityContainer Name="NorthwindEntities" p4:LazyLoadingEnabled="true" xmlns:p4="http://schemas.microsoft.com/ado/2009/02/edm/annotation">

src/test/fixtures/northwind.odata

@@ -0,0 +1,5 @@
+https://services.odata.org/V4/Northwind/Northwind.svc/Customers?
+    $select=CompanyName,ContactTitle,CustomerID
+    &$top=10
+    &$skip=10
+    &$expand=Orders($select=OrderID,CustomerID,Freight)

src/test/runTests.ts

@@ -6,7 +6,7 @@ async function main() {
 	try {
 		// The folder containing the Extension Manifest package.json
 		// Passed to `--extensionDevelopmentPath`
-		const extensionDevelopmentPath = path.resolve(__dirname, '../../');
+		const extensionDevelopmentPath = path.resolve(__dirname, '../../../');
 
 		// The path to the extension test script
 		// Passed to --extensionTestsPath

src/test/suite/odataCommands.test.ts

@@ -1,16 +1,44 @@
 import * as assert from 'assert';
+import * as vscode from 'vscode';
+import * as path from 'path';
+import * as extension from '../../extension';
 
 import { odataFormatUrl } from '../../odataCommands';
 
 suite('OData Commands Tests', () => {
-    let odataQueryDocument = `https://my555555-sso.crm.ondemand.com/sap/c4c/odata-sso/v1/customer/IndividualCustomerCollection?
+
+    const testsPath = path.resolve(__dirname, '../');
+    const fixturesPath = path.join(testsPath, 'fixtures');
+
+    const odataQueryDocument = `https://my555555-sso.crm.ondemand.com/sap/c4c/odata-sso/v1/customer/IndividualCustomerCollection?
     $filter=OwnerID eq '2341978'
     &$select=FirstName,LastName,CustomerID
     &$top=10
     &$format=json
     `
     let combinedUrl = `https://my555555-sso.crm.ondemand.com/sap/c4c/odata-sso/v1/customer/IndividualCustomerCollection?%24format=json&%24filter=OwnerID+eq+%272341978%27&%24select=FirstName%2CLastName%2CCustomerID&%24top=10`
+
+    const northWindCombined = 'https://services.odata.org/V4/Northwind/Northwind.svc/Customers?%24expand=Orders%28%24select%3DOrderID%2CCustomerID%2CFreight%29&%24select=CompanyName%2CContactTitle%2CCustomerID&%24top=10&%24skip=10';
+
     test('Can Format Url', () => {
         assert.equal(odataFormatUrl(odataQueryDocument), combinedUrl)
     })
+
+    test('Can run combine Url Command', async () => {
+        const uri = vscode.Uri.file(path.join(fixturesPath, 'northwind.odata'));
+        const document = await vscode.workspace.openTextDocument(uri);
+        const editor = await vscode.window.showTextDocument(document);
+        await sleep(200);
+        vscode.commands.executeCommand("odata.combine");
+        await sleep(1000);
+        const combinedText = editor.document.getText();
+        assert.equal(combinedText.trim(), northWindCombined)
+        vscode.commands.executeCommand("workbench.action.closeActiveEditor");
+    })
 });
+
+function sleep(ms: number): Promise<void> {
+    return new Promise((resolve) => {
+      setTimeout(resolve, ms);
+    });
+}

src/test/suite/odataMetadata.test.ts

@@ -10,7 +10,7 @@ suite("Metadata Tests", () => {
     let configuration = <odataMetadata.ODataMetadataConfiguration>{
         map: [
             {
-                url: 'https://services.odata.org/Experimental/Northwind/Northwind.svc',
+                url: 'https://services.odata.org/V4/Northwind/Northwind.svc',
                 path: path.join(fixturesPath, 'northwind$metadata.xml')
             },
             {
@@ -23,7 +23,7 @@ suite("Metadata Tests", () => {
     const metadataService = new odataMetadata.LocalODataMetadataService(configuration);
 
     test('Can parse Northwind', (done) => {
-        const metadata = metadataService.getMetadataDocument('https://services.odata.org/Experimental/Northwind/Northwind.svc');
+        const metadata = metadataService.getMetadataDocument('https://services.odata.org/V4/Northwind/Northwind.svc');
         const containerEntities = metadata.getEntityContainerItems();
         assert.equal(containerEntities.length, 26);
         assert.ok(containerEntities.find(c => c.name == 'CustomerDemographics'));