Code changes for dotnet cli conversion

begoldsm · Jul 8, 2016 · 19f629b · 19f629b
1 parent 32f7ccb
commit 19f629b
Show file tree

Hide file tree

Showing 8 changed files with 392 additions and 199 deletions.
diff --git a/src/core/AutoRest/Properties/Resources.Designer.cs b/src/core/AutoRest/Properties/Resources.Designer.cs
diff --git a/src/core/AutoRest/Properties/Resources.resx b/src/core/AutoRest/Properties/Resources.resx
@@ -129,11 +129,57 @@
   <data name="GenerationFailed" xml:space="preserve">
     <value>Code generation failed.</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="HelpMarkdownTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\HelpMarkdownTemplate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+
+  <data name="HelpMarkdownTemplate" xml:space="preserve">
+    <value>#AutoRest Command Line Interface Documentation
+
+##Syntax
+```bash
+$syntax$
+```
+
+##Parameters
+$parameters-start$
+**-$parameter$** $parameter-desc$
+
+$parameters-end$
+
+##Code Generators
+$generators-start$
+**-$generator$** $generator-desc$
+
+$generators-end$
+
+##Examples
+$examples-start$
+- $example-desc$
+```bash
+$example$
+```
+
+$examples-end$</value>
   </data>
-  <data name="HelpTextTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\HelpTextTemplate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="HelpTextTemplate" xml:space="preserve">
+    <value>Microsoft (R) AutoRest $version$
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+Usage: $syntax$
+
+Parameters:
+$parameters-start$
+  -$parameter$: $parameter-desc$
+$parameters-end$
+
+Code Generators:
+$generators-start$
+  -$generator$: $generator-desc$
+$generators-end$
+
+Examples:
+$examples-start$
+  $example-desc$
+  >$example$
+
+$examples-end$</value>
   </data>
 </root>
diff --git a/src/generator/AutoRest.CSharp.Azure.Tests/AcceptanceTests.cs b/src/generator/AutoRest.CSharp.Azure.Tests/AcceptanceTests.cs
@@ -5,7 +5,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+//using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.IO;
 using System.Net;
@@ -249,8 +249,11 @@ public void LroHappyPathTests()
                                     new Product { Location = "West US" }, customHeaders).Result);
             }
         }
-
+#if PORTABLE
         [Fact(Skip = "Failing in CoreCLR - TODO: debug and fix")]
+#else 
+        [Fact]
+#endif
         public void LroHappyPathTestsRest()
         {
             SwaggerSpecRunner.RunTests(
@@ -341,26 +344,26 @@ public void LroSadPathTests()
 
                 Assert.Throws<CloudException>(
                     () => client.LROSADs.PutAsyncRelativeRetryInvalidJsonPolling(new Product {Location = "West US"}));
-                // TODO: 4103936 Fix exception type
+
 #if !PORTABLE
-                Assert.Throws<RestException>(
+                Assert.Throws<SerializationException>(
                     () => client.LROSADs.PutAsyncRelativeRetryInvalidHeader(new Product {Location = "West US"}));
-                // TODO: 4103936 Fix exception type
+
                 // UriFormatException invalidHeader = null;
-                var invalidHeader = Assert.Throws<UriFormatException>(() => client.LROSADs.Delete202RetryInvalidHeader());
+                var invalidHeader = Assert.Throws<SerializationException>(() => client.LROSADs.Delete202RetryInvalidHeader());
                 Assert.NotNull(invalidHeader.Message);
 
-                // TODO: 4103936 Fix exception type
+
                 var invalidAsyncHeader =
-                    Assert.Throws<UriFormatException>(() => client.LROSADs.DeleteAsyncRelativeRetryInvalidHeader());
+                    Assert.Throws<SerializationException>(() => client.LROSADs.DeleteAsyncRelativeRetryInvalidHeader());
                 Assert.NotNull(invalidAsyncHeader.Message);
 
-                // TODO: 4103936 Fix exception type
-                invalidHeader = Assert.Throws<UriFormatException>(() => client.LROSADs.Post202RetryInvalidHeader());
+
+                invalidHeader = Assert.Throws<SerializationException>(() => client.LROSADs.Post202RetryInvalidHeader());
                 Assert.NotNull(invalidHeader.Message);
-                // TODO: 4103936 Fix exception type
+
                 invalidAsyncHeader =
-                    Assert.Throws<UriFormatException>(() => client.LROSADs.PostAsyncRelativeRetryInvalidHeader());
+                    Assert.Throws<SerializationException>(() => client.LROSADs.PostAsyncRelativeRetryInvalidHeader());
                 Assert.NotNull(invalidAsyncHeader.Message);
 #endif
                 var invalidPollingBody =
@@ -483,6 +486,7 @@ public void EnsureTestCoverage()
 #if PORTABLE
                 float totalTests = report.Count - 6;
 #else
+                // TODO: This is fudging some numbers. Fixing the actual problem is a priority.
                 float totalTests = report.Count;
 #endif
                 float executedTests = report.Values.Count(v => v > 0);
@@ -496,7 +500,7 @@ public void EnsureTestCoverage()
                     _interceptor.Information(string.Format(CultureInfo.CurrentCulture,
                         "The test coverage for Azure is {0}/{1}",
                         executedTests, totalTests));
-                    Assert.Equal(executedTests, totalTests);
+                    Assert.Equal(totalTests,executedTests);
                 }
             }
         }