Fix tests

src/vs/editor/test/common/services/modelService.test.ts

@@ -35,12 +35,12 @@ suite('ModelService', () => {
 
 	test('EOL setting respected depending on root', () => {
 		const model1 = modelService.createModel('farboo', null, null);
-		// const model2 = modelService.createModel('farboo', null, URI.file(platform.isWindows ? 'c:\\myroot\\myfile.txt' : '/myroot/myfile.txt'));
-		// const model3 = modelService.createModel('farboo', null, URI.file(platform.isWindows ? 'c:\\other\\myfile.txt' : '/other/myfile.txt'));
+		const model2 = modelService.createModel('farboo', null, URI.file(platform.isWindows ? 'c:\\myroot\\myfile.txt' : '/myroot/myfile.txt'));
+		const model3 = modelService.createModel('farboo', null, URI.file(platform.isWindows ? 'c:\\other\\myfile.txt' : '/other/myfile.txt'));
 
 		assert.equal(model1.getOptions().defaultEOL, DefaultEndOfLine.LF);
-		// assert.equal(model2.getOptions().defaultEOL, DefaultEndOfLine.CRLF);
-		// assert.equal(model3.getOptions().defaultEOL, DefaultEndOfLine.LF);
+		assert.equal(model2.getOptions().defaultEOL, DefaultEndOfLine.CRLF);
+		assert.equal(model3.getOptions().defaultEOL, DefaultEndOfLine.LF);
 	});
 
 	test('_computeEdits no change', function () {

src/vs/platform/configuration/test/common/testConfigurationService.ts

@@ -19,15 +19,18 @@ export class TestConfigurationService implements IConfigurationService {
 	}
 
 	public getValue(arg1?: any, arg2?: any): any {
-		if (arg1 && typeof arg1 === 'string') {
-			return this.inspect(<string>arg1).value;
-		}
+		let configuration;
 		const overrides = isConfigurationOverrides(arg1) ? arg1 : isConfigurationOverrides(arg2) ? arg2 : void 0;
-		if (overrides && overrides.resource) {
-			const configForResource = this.configurationByRoot.findSubstr(overrides.resource.fsPath);
-			return configForResource || this.configuration;
+		if (overrides) {
+			if (overrides.resource) {
+				configuration = this.configurationByRoot.findSubstr(overrides.resource.fsPath);
+			}
+		}
+		configuration = configuration ? configuration : this.configuration;
+		if (arg1 && typeof arg1 === 'string') {
+			return getConfigurationValue(configuration, arg1);
 		}
-		return this.configuration;
+		return configuration;
 	}
 
 	public updateValue(key: string, overrides?: IConfigurationOverrides): Promise<void> {