Restructure project directories

.gitignore

@@ -171,7 +171,6 @@ ClientBin/
 *.dbproj.schemaview
 *.pfx
 *.publishsettings
-node_modules/
 orleans.codegen.cs
 
 # RIA/Silverlight projects
@@ -210,3 +209,7 @@ FakesAssemblies/
 GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
+
+node_modules/
+coverage/
+output/

.vscode/launch.json

@@ -20,7 +20,7 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "Run Unit Tests with Coverage",
+            "name": "Run Merge and Validate Unit Tests with Coverage",
             "program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
             "stopOnEntry": false,
             "env": {
@@ -33,6 +33,22 @@
             "console": "integratedTerminal",
             "cwd": "${workspaceRoot}"
         },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Run All Unit Tests with Coverage",
+            "program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
+            "stopOnEntry": false,
+            "env": {
+                "RUN_TRANSFORM": "true"
+            },
+            "args": [
+                "run-tests-with-coverage"
+            ],
+            "protocol": "inspector",
+            "console": "integratedTerminal",
+            "cwd": "${workspaceRoot}"
+        },
         {
             "type": "node",
             "request": "launch",

gulpfile.js

@@ -14,7 +14,7 @@ gulp.doneCallback = () => {
 };
 
 gulp.task('pre-test', () =>{
-    return gulp.src(['core/**/*.js'])
+    return gulp.src(['src/core/**/*.js'])
         .pipe(istanbul())
         .pipe(istanbul.hookRequire());
 });
@@ -25,7 +25,7 @@ gulp.task('run-tests-with-coverage', ['pre-test'], () => {
         runTransform : (process.env.RUN_TRANSFORM) ? (process.env.RUN_TRANSFORM === 'true') : true
     };
 
-    return gulp.src('spec/**/*.js')
+    return gulp.src('test/**/*.js')
         .pipe(jasmine())
         .pipe(istanbul.writeReports());
         //.pipe(nyc({}));
@@ -36,13 +36,13 @@ gulp.task('run-tests', () => {
         runTransform : true
     };
 
-    return gulp.src('spec/**/*.js')
+    return gulp.src('test/**/*.js')
         .pipe(jasmine());
         //.pipe(nyc({}));
 });
 
 gulp.task('run-eslint', () => {
-    return gulp.src(['*.js', 'core/**/*.js', 'spec/*.js'])
+    return gulp.src(['src/**/*.js', 'test/**/*.js'])
         .pipe(eslint())
         .pipe(eslint.format())
         .pipe(eslint.failAfterError());

test/availabilitySetSpec.js

@@ -1,7 +1,7 @@
 describe('availabilitySetSettings:', () => {
-    let availabilitySetSettings = require('../core/availabilitySetSettings.js');
+    let availabilitySetSettings = require('../src/core/availabilitySetSettings.js');
     let _ = require('lodash');
-    let v = require('../core/validation.js');
+    let v = require('../src/core/validation.js');
 
     let availabilitySetParams = {
         name: 'test-as',

test/connectionSettingsSpec.js

@@ -1,8 +1,8 @@
 describe('connectionSettings', () => {
     let _ = require('lodash');
     let rewire = require('rewire');
-    let connectionSettings = rewire('../core/connectionSettings.js');
-    let validation = require('../core/validation.js');
+    let connectionSettings = rewire('../src/core/connectionSettings.js');
+    let validation = require('../src/core/validation.js');
 
     describe('isValidConnectionType', () => {
         let isValidConnectionType = connectionSettings.__get__('isValidConnectionType');

test/loadBalancerSettingsSpec.js

@@ -1,7 +1,7 @@
 describe('loadBalancerSettings', () => {
     let rewire = require('rewire');
-    let loadBalancerSettings = rewire('../core/loadBalancerSettings.js');
-    let validation = require('../core/validation.js');
+    let loadBalancerSettings = rewire('../src/core/loadBalancerSettings.js');
+    let validation = require('../src/core/validation.js');
     let _ = require('lodash');
 
     describe('isValidLoadBalancerType', () => {

test/localNetworkGatewaySettingsSpec.js

@@ -1,7 +1,7 @@
 describe('localNetworkGatewaySettings', () => {
-    let localNetworkGatewaySettings = require('../core/localNetworkGatewaySettings.js');
+    let localNetworkGatewaySettings = require('../src/core/localNetworkGatewaySettings.js');
     let _ = require('lodash');
-    let validation = require('../core/validation.js');
+    let validation = require('../src/core/validation.js');
 
     describe('merge', () => {
         let merge = localNetworkGatewaySettings.merge;

test/networkInterfaceSettingsSpec.js

@@ -1,7 +1,7 @@
 describe('networkInterfaceSettings:', () => {
-    let networkInterfaceSettings = require('../core/networkInterfaceSettings.js');
+    let networkInterfaceSettings = require('../src/core/networkInterfaceSettings.js');
     let _ = require('lodash');
-    let v = require('../core/validation.js');
+    let v = require('../src/core/validation.js');
 
     let buildingBlockSettings = {
         resourceGroupName: 'test-rg',

test/networkSecurityGroupSettingsSpec.js

@@ -1,8 +1,8 @@
 describe('networkSecurityGroupSettings', () => {
     let rewire = require('rewire');
     let _ = require('lodash');
-    let nsgSettings = rewire('../core/networkSecurityGroupSettings.js');
-    let validation = require('../core/validation.js');
+    let nsgSettings = rewire('../src/core/networkSecurityGroupSettings.js');
+    let validation = require('../src/core/validation.js');
 
     describe('isValidProtocol', () => {
         let isValidProtocol = nsgSettings.__get__('isValidProtocol');

test/publicIpAddressSettingsSpec.js

@@ -1,8 +1,8 @@
 describe('publicIpAddressSettings', () => {
     let rewire = require('rewire');
-    let publicIpAddressSettings = rewire('../core/publicIpAddressSettings.js');
+    let publicIpAddressSettings = rewire('../src/core/publicIpAddressSettings.js');
     let _ = require('lodash');
-    let validation = require('../core/validation.js');
+    let validation = require('../src/core/validation.js');
 
     describe('isValidIPAllocationMethod', () => {
         let isValidIPAllocationMethod = publicIpAddressSettings.__get__('isValidIPAllocationMethod');

test/resourcesSpec.js

@@ -1,5 +1,5 @@
-let resources = require('../core/resources.js');
-let validationMessages = require('../core/validationMessages.js');
+let resources = require('../src/core/resources.js');
+let validationMessages = require('../src/core/validationMessages.js');
 
 describe('resources', () => {
     describe('resourceId function', () => {

test/routeTableSettingsSpec.js

@@ -1,8 +1,8 @@
 describe('routeTableSettings', () => {
     let rewire = require('rewire');
-    let routeTableSettings = rewire('../core/routeTableSettings.js');
+    let routeTableSettings = rewire('../src/core/routeTableSettings.js');
     let _ = require('lodash');
-    let validation = require('../core/validation.js');
+    let validation = require('../src/core/validation.js');
 
     describe('isValidNextHop', () => {
         let isValidNextHop = routeTableSettings.__get__('isValidNextHop');

test/storageSettingsSpec.js

@@ -1,8 +1,8 @@
 describe('storageSettings:', () => {
     let rewire = require('rewire');
-    let storageSettings = rewire('../core/storageSettings.js');
+    let storageSettings = rewire('../src/core/storageSettings.js');
     let _ = require('lodash');
-    let v = require('../core/validation.js');
+    let v = require('../src/core/validation.js');
 
     let storageParams = {
         nameSuffix: 'ST',

test/validationSpec.js

@@ -1,5 +1,5 @@
 describe('validation', () => {
-    let validation = require('../core/validation.js');
+    let validation = require('../src/core/validation.js');
     let _ = require('lodash');
 
     describe('utilities', () => {

test/virtualMachineExtensionsSettingsSpec.js

@@ -1,8 +1,8 @@
 describe('extensionSettings:', () => {
     let rewire = require('rewire');
-    let extensionSettings = rewire('../core/virtualMachineExtensionsSettings.js');
+    let extensionSettings = rewire('../src/core/virtualMachineExtensionsSettings.js');
     let _ = require('lodash');
-    let v = require('../core/validation.js');
+    let v = require('../src/core/validation.js');
 
     let buildingBlockSettings = {
         subscriptionId: '00000000-0000-1000-8000-000000000000',

test/virtualMachineScaleSetSettingsSpec.js

@@ -1,6 +1,6 @@
 describe('virtualMachineScaleSetSettings:', () => {
-    let virtualMachineScaleSetSettings = require('../core/virtualMachineScaleSetSettings.js');
-    let v = require('../core/validation');
+    let virtualMachineScaleSetSettings = require('../src/core/virtualMachineScaleSetSettings.js');
+    let v = require('../src/core/validation');
     let _ = require('lodash');
     let testSettings = {
         name: 'scaleSet1',

test/virtualMachineSettingsSpec.js

@@ -1,6 +1,6 @@
 describe('virtualMachineSettings:', () => {
     let rewire = require('rewire');
-    let virtualMachineSettings = rewire('../core/virtualMachineSettings.js');
+    let virtualMachineSettings = rewire('../src/core/virtualMachineSettings.js');
     let _ = require('lodash');
     let testSettings = {
         vmCount: 2,

test/virtualNetworkGatewaySettingsSpec.js

@@ -1,8 +1,8 @@
 describe('virtualNetworkGatewaySettings', () => {
     let rewire = require('rewire');
-    let virtualNetworkGatewaySettings = rewire('../core/virtualNetworkGatewaySettings.js');
+    let virtualNetworkGatewaySettings = rewire('../src/core/virtualNetworkGatewaySettings.js');
     let _ = require('lodash');
-    let validation = require('../core/validation.js');
+    let validation = require('../src/core/validation.js');
 
     describe('isValidGatewayType', () => {
         let isValidGatewayType = virtualNetworkGatewaySettings.__get__('isValidGatewayType');

test/virtualNetworkSettingsSpec.js

@@ -1,8 +1,8 @@
 describe('virtualNetworkSettings', () => {
     let rewire = require('rewire');
-    let virtualNetworkSettings = rewire('../core/virtualNetworkSettings.js');
+    let virtualNetworkSettings = rewire('../src/core/virtualNetworkSettings.js');
     let _ = require('lodash');
-    let validation = require('../core/validation.js');
+    let validation = require('../src/core/validation.js');
 
     describe('validations', () => {
         let virtualNetworkSettingsValidations = virtualNetworkSettings.__get__('virtualNetworkSettingsValidations');