Permalink
Browse files

Merged Simple.OData and Simple.Data.OData projects.

  • Loading branch information...
1 parent b3dca3e commit 46600eeee59b504ff575487af45d2a4221585f52 @object object committed Aug 26, 2012
Showing with 6,384 additions and 6,492 deletions.
  1. +3 −3 CommonAssemblyInfo.cs
  2. +1 −1 NugetPack.cmd
  3. +1 −1 NugetPushOData.cmd
  4. +1 −1 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/DeleteTest.cs
  5. +38 −38 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/EntityPluralizer.cs
  6. +88 −88 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/FindAllTest.cs
  7. +85 −85 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/FindAssociationTest.cs
  8. +71 −71 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/FindExpandTest.cs
  9. +80 −80 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/FindExtraClausesTest.cs
  10. +92 −92 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/FindOneTest.cs
  11. +2 −2 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/GetTest.cs
  12. +1 −1 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/InsertTest.cs
  13. +1 −1 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/Properties/AssemblyInfo.cs
  14. +26 −26 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/SchemaTest.cs
  15. +108 −112 ...grationTest.csproj → Simple.Data.OData.IntegrationTests/Simple.Data.OData.IntegrationTests.csproj
  16. +2 −2 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/SpecialTest.cs
  17. +54 −54 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/TestBase.cs
  18. +57 −57 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/TestService.cs
  19. +1 −1 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/UpdateTest.cs
  20. +9 −9 {Simple.Data.OData.IntegrationTest → Simple.Data.OData.IntegrationTests}/packages.config
  21. +29 −29 {Simple.OData.Test → Simple.Data.OData.UnitTests}/CommandBuilderTest.cs
  22. +129 −129 {Simple.OData.Test → Simple.Data.OData.UnitTests}/DataServicesHelperTests.cs
  23. +1 −1 {Simple.OData.Test → Simple.Data.OData.UnitTests}/ExpressionFormatterTest.cs
  24. 0 {Simple.OData.Test → Simple.Data.OData.UnitTests}/Properties/AssemblyInfo.cs
  25. +2,309 −2,309 {Simple.OData.Test → Simple.Data.OData.UnitTests}/Resources/MultipleCategoriesWithProducts.xml
  26. +547 −547 {Simple.OData.Test → Simple.Data.OData.UnitTests}/Resources/MultipleProducts.xml
  27. +987 −987 {Simple.OData.Test → Simple.Data.OData.UnitTests}/Resources/MultipleProductsWithCategory.xml
  28. +352 −352 {Simple.OData.Test → Simple.Data.OData.UnitTests}/Resources/SingleCategoryWithProducts.xml
  29. +27 −27 {Simple.OData.Test → Simple.Data.OData.UnitTests}/Resources/SingleProduct.xml
  30. +49 −49 {Simple.OData.Test → Simple.Data.OData.UnitTests}/Resources/SingleProductWithCategory.xml
  31. 0 ....Test → Simple.Data.OData.UnitTests}/Resources/SingleProductWithCollectionOfComplexProperties.xml
  32. 0 ...est → Simple.Data.OData.UnitTests}/Resources/SingleProductWithCollectionOfPrimitiveProperties.xml
  33. 0 {Simple.OData.Test → Simple.Data.OData.UnitTests}/Resources/SingleProductWithComplexProperty.xml
  34. +92 −92 ...ta.Test/Simple.OData.Test.csproj → Simple.Data.OData.UnitTests/Simple.Data.OData.UnitTests.csproj
  35. +4 −4 {Simple.OData.Test → Simple.Data.OData.UnitTests}/packages.config
  36. +284 −284 {Simple.OData → Simple.Data.OData}/CommandBuilder.cs
  37. +270 −272 {Simple.OData → Simple.Data.OData}/DataServicesHelper.cs
  38. +1 −1 {Simple.OData → Simple.Data.OData}/Edm/EdmHelper.cs
  39. +1 −1 {Simple.OData → Simple.Data.OData}/Edm/EdmSchema.cs
  40. +1 −1 {Simple.OData → Simple.Data.OData}/Edm/EdmType.cs
  41. +8 −8 {Simple.OData → Simple.Data.OData}/ExpressionFormatter.cs
  42. +2 −2 {Simple.OData → Simple.Data.OData}/FunctionNameConverter.cs
  43. +1 −2 Simple.Data.OData/ODataTableAdapter.cs
  44. +13 −13 Simple.Data.OData/Properties/AssemblyInfo.cs
  45. +3 −3 {Simple.OData → Simple.Data.OData}/Properties/Resources.Designer.cs
  46. +17 −17 {Simple.OData → Simple.Data.OData}/Properties/Resources.resx
  47. +1 −1 {Simple.OData → Simple.Data.OData}/RequestRunner.cs
  48. 0 {Simple.OData → Simple.Data.OData}/Resources/DataServicesAtomEntryXml.txt
  49. +1 −1 {Simple.OData → Simple.Data.OData}/RestVerbs.cs
  50. +33 −33 {Simple.OData → Simple.Data.OData}/Schema/Association.cs
  51. +44 −44 {Simple.OData → Simple.Data.OData}/Schema/AssociationCollection.cs
  52. +6 −6 {Simple.OData → Simple.Data.OData}/Schema/Column.cs
  53. +1 −1 {Simple.OData → Simple.Data.OData}/Schema/ColumnCollection.cs
  54. +66 −66 Simple.Data.OData/Schema/DatabaseSchema.cs
  55. +3 −3 {Simple.OData → Simple.Data.OData}/Schema/ISchemaProvider.cs
  56. +1 −1 {Simple.OData → Simple.Data.OData}/Schema/Key.cs
  57. +2 −2 Simple.Data.OData/Schema/ODataTable.cs
  58. +68 −71 Simple.Data.OData/Schema/SchemaProvider.cs
  59. +94 −94 {Simple.OData → Simple.Data.OData}/Schema/Table.cs
  60. +1 −1 {Simple.OData → Simple.Data.OData}/Schema/TableCollection.cs
  61. +34 −5 Simple.Data.OData/Simple.Data.OData.csproj
  62. +0 −1 Simple.Data.OData/Simple.Data.OData.nuspec
  63. +135 −135 {Simple.OData → Simple.Data.OData}/SimpleReferenceFormatter.cs
  64. +1 −1 {Simple.OData → Simple.Data.OData}/TableServiceException.cs
  65. +1 −1 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/DateTimeExtensionsTests.cs
  66. +1 −1 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Linq/EnumerableExtensionTests.cs
  67. 0 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Properties/AssemblyInfo.cs
  68. +5 −4 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Properties/Resources.Designer.cs
  69. 0 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Properties/Resources.resx
  70. 0 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Resources/TwitterStatusesSample.txt
  71. 0 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Resources/XmlWithDefaultNamespace.txt
  72. 0 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Resources/XmlWithNoNamespace.txt
  73. 0 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Resources/XmlWithPrefixedNamespace.txt
  74. +2 −2 ...tLib.Tests/Simple.NExtLib.Tests.csproj → Simple.NExtLib.UnitTests/Simple.NExtLib.UnitTests.csproj
  75. +1 −1 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/StringExtensionTests.cs
  76. +1 −1 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Xml/Linq/XElementExtensionsTests.cs
  77. +1 −1 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Xml/XmlAttributesAsDictionaryReadTests.cs
  78. +1 −1 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Xml/XmlAttributesAsDictionaryWriteTests.cs
  79. +2 −2 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Xml/XmlElementAsDictionaryReadTests.cs
  80. +1 −1 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/Xml/XmlElementAsDictionaryWriteTests.cs
  81. 0 {Simple.NExtLib.Tests → Simple.NExtLib.UnitTests}/packages.config
  82. +29 −37 Simple.OData.sln
  83. +0 −12 Simple.OData/Properties/AssemblyInfo.cs
  84. +0 −103 Simple.OData/Simple.OData.csproj
  85. +0 −4 Simple.OData/packages.config
@@ -19,6 +19,6 @@
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-[assembly: AssemblyVersion("0.3.0.1")]
-[assembly: AssemblyFileVersion("0.3.0.1")]
-[assembly: AssemblyInformationalVersion("0.3.0.1")]
+[assembly: AssemblyVersion("0.3.1.0")]
+[assembly: AssemblyFileVersion("0.3.1.0")]
+[assembly: AssemblyInformationalVersion("0.3.1.0")]
View
@@ -1,3 +1,3 @@
cd .\%1
-call nuget pack -sym %1.csproj -Properties Configuration=Release
+call nuget pack -sym %1.csproj -Symbols -Properties Configuration=Release
cd ..\
View
@@ -1 +1 @@
-call .\NugetPush.cmd Simple.Data.OData\Simple.Data.OData %1 %2
+call .\NugetPush.cmd Simple.Data.OData %1 %2
@@ -3,7 +3,7 @@
using System.Linq;
using System.Text;
-namespace Simple.Data.OData.IntegrationTest
+namespace Simple.Data.OData.IntegrationTests
{
using Xunit;
@@ -1,38 +1,38 @@
-using System;
-using System.Collections.Generic;
-using System.Data.Entity.Design.PluralizationServices;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using Simple.Data.Extensions;
-
-namespace Simple.Data.OData.IntegrationTest
-{
- class EntityPluralizer : IPluralizer
- {
- private readonly PluralizationService _pluralizationService =
- PluralizationService.CreateService(new CultureInfo("en-US"));
-
- public bool IsPlural(string word)
- {
- return _pluralizationService.IsPlural(word);
- }
-
- public bool IsSingular(string word)
- {
- return _pluralizationService.IsSingular(word);
- }
-
- public string Pluralize(string word)
- {
- bool upper = (word.IsAllUpperCase());
- word = _pluralizationService.Pluralize(word);
- return upper ? word.ToUpper(_pluralizationService.Culture) : word;
- }
-
- public string Singularize(string word)
- {
- return _pluralizationService.Singularize(word);
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Data.Entity.Design.PluralizationServices;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Simple.Data.Extensions;
+
+namespace Simple.Data.OData.IntegrationTests
+{
+ class EntityPluralizer : IPluralizer
+ {
+ private readonly PluralizationService _pluralizationService =
+ PluralizationService.CreateService(new CultureInfo("en-US"));
+
+ public bool IsPlural(string word)
+ {
+ return _pluralizationService.IsPlural(word);
+ }
+
+ public bool IsSingular(string word)
+ {
+ return _pluralizationService.IsSingular(word);
+ }
+
+ public string Pluralize(string word)
+ {
+ bool upper = (word.IsAllUpperCase());
+ word = _pluralizationService.Pluralize(word);
+ return upper ? word.ToUpper(_pluralizationService.Culture) : word;
+ }
+
+ public string Singularize(string word)
+ {
+ return _pluralizationService.Singularize(word);
+ }
+ }
+}
@@ -1,88 +1,88 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Simple.Data.OData.IntegrationTest
-{
- using Xunit;
-
- public class FindAllTest : TestBase
- {
- [Fact]
- public void FindAllByName()
- {
- IEnumerable<dynamic> products = _db.Products.FindAllByProductName("Chai");
-
- Assert.NotEmpty(products);
- }
-
- [Fact]
- public void FindAllByHomogenizedName()
- {
- IEnumerable<dynamic> products = _db.Products.FindAllByProduct_Name("Chai");
-
- Assert.NotEmpty(products);
- }
-
- [Fact]
- public void FindAllByNameWithSpecificLength()
- {
- IEnumerable<dynamic> products = _db.Products.FindAll(_db.Products.ProductName.Length() == 4);
-
- Assert.NotEmpty(products);
- }
-
- [Fact]
- public void FindAllByNameCount()
- {
- var count = _db.Products.FindAllByProductName("Chai").Count();
-
- Assert.Equal(1, count);
- }
-
- [Fact]
- public void FindAllByNameWithTotalCount()
- {
- Promise<int> count;
- IEnumerable<dynamic> products = _db.Products.FindAllByProductName("Chai").WithTotalCount(out count).Take(1);
-
- Assert.NotEmpty(products);
- Assert.Equal(1, count);
- }
-
- [Fact]
- public void All()
- {
- IEnumerable<dynamic> products = _db.Products.All();
-
- Assert.NotEmpty(products);
- }
-
- [Fact]
- public void AllWithHomogenizedName()
- {
- IEnumerable<dynamic> orderDetails = _db.Order_Details.All();
-
- Assert.NotEmpty(orderDetails);
- }
-
- [Fact]
- public void AllCount()
- {
- var count = _db.Products.All().Count();
-
- Assert.True(count > 0);
- }
-
- [Fact]
- public void AllWithTotalCount()
- {
- Promise<int> count;
- IEnumerable<dynamic> products = _db.Products.All().WithTotalCount(out count).Take(1);
-
- Assert.NotEmpty(products);
- Assert.True(count > 1);
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Simple.Data.OData.IntegrationTests
+{
+ using Xunit;
+
+ public class FindAllTest : TestBase
+ {
+ [Fact]
+ public void FindAllByName()
+ {
+ IEnumerable<dynamic> products = _db.Products.FindAllByProductName("Chai");
+
+ Assert.NotEmpty(products);
+ }
+
+ [Fact]
+ public void FindAllByHomogenizedName()
+ {
+ IEnumerable<dynamic> products = _db.Products.FindAllByProduct_Name("Chai");
+
+ Assert.NotEmpty(products);
+ }
+
+ [Fact]
+ public void FindAllByNameWithSpecificLength()
+ {
+ IEnumerable<dynamic> products = _db.Products.FindAll(_db.Products.ProductName.Length() == 4);
+
+ Assert.NotEmpty(products);
+ }
+
+ [Fact]
+ public void FindAllByNameCount()
+ {
+ var count = _db.Products.FindAllByProductName("Chai").Count();
+
+ Assert.Equal(1, count);
+ }
+
+ [Fact]
+ public void FindAllByNameWithTotalCount()
+ {
+ Promise<int> count;
+ IEnumerable<dynamic> products = _db.Products.FindAllByProductName("Chai").WithTotalCount(out count).Take(1);
+
+ Assert.NotEmpty(products);
+ Assert.Equal(1, count);
+ }
+
+ [Fact]
+ public void All()
+ {
+ IEnumerable<dynamic> products = _db.Products.All();
+
+ Assert.NotEmpty(products);
+ }
+
+ [Fact]
+ public void AllWithHomogenizedName()
+ {
+ IEnumerable<dynamic> orderDetails = _db.Order_Details.All();
+
+ Assert.NotEmpty(orderDetails);
+ }
+
+ [Fact]
+ public void AllCount()
+ {
+ var count = _db.Products.All().Count();
+
+ Assert.True(count > 0);
+ }
+
+ [Fact]
+ public void AllWithTotalCount()
+ {
+ Promise<int> count;
+ IEnumerable<dynamic> products = _db.Products.All().WithTotalCount(out count).Take(1);
+
+ Assert.NotEmpty(products);
+ Assert.True(count > 1);
+ }
+ }
+}
Oops, something went wrong.

0 comments on commit 46600ee

Please sign in to comment.