Skip to content

Commit 379cd9f

Browse files
pianiomarpianiomar
committed
- Bugs saving some types in MongoDB
- Cleaned up MongoDB tests - Disabled RavenDB tests
1 parent 8d41094 commit 379cd9f

12 files changed

Lines changed: 136 additions & 111 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,3 +240,4 @@ _Pvt_Extensions
240240
.fake/
241241
/packages
242242
/packages
243+
/nlog.txt

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Install:
3131

3232
The fastest way is use nunit3 console: you can get console here https://github.com/nunit/nunit-console/releases
3333
After that run tests with:
34-
nunit3-console "SharpRepository.Samples\bin\Debug\SharpRepository.Samples.dll" "SharpRepository.Tests\bin\Debug\SharpRepository.Tests.dll" "SharpRepository.Tests.Integration\bin\Debug\SharpRepository.Tests.Integration.dll"
34+
nunit3-console -v "SharpRepository.Samples\bin\Debug\SharpRepository.Samples.dll" "SharpRepository.Tests\bin\Debug\SharpRepository.Tests.dll" "SharpRepository.Tests.Integration\bin\Debug\SharpRepository.Tests.Integration.dll"
3535

3636

3737
Have Questions?

‎SharpRepository.MongoDbRepository/MongoDbRepositoryBase.cs‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ protected override void DeleteItem(T entity)
309309

310310
if (IsValidKey(pkValue))
311311
{
312-
var keyPropertyName = BsonClassMap.LookupClassMap(typeof(T)).IdMemberMap.ElementName;
312+
var keyPropertyName = BsonClassMap.LookupClassMap(typeof(T)).IdMemberMap.MemberName;
313313
var keyPair = GetMongoProperty(entity, keyPropertyName);
314314
var filter = Builders<T>.Filter.Eq(keyPair.Key, keyPair.Value);
315315

@@ -323,8 +323,11 @@ protected override void UpdateItem(T entity)
323323
GetPrimaryKey(entity, out pkValue);
324324
if (IsValidKey(pkValue))
325325
{
326-
var keyPropertyName = BsonClassMap.LookupClassMap(typeof(T)).IdMemberMap.ElementName;
327-
var keyPair = GetMongoProperty(entity, keyPropertyName);
326+
var keyMap = BsonClassMap.LookupClassMap(typeof(T)).IdMemberMap;
327+
var keyPropertyName = keyMap.MemberName;
328+
var keyBsonType = ((StringSerializer)keyMap.GetSerializer()).Representation;
329+
var keyBsonPropertyValue = BsonTypeMapper.MapToBsonValue(pkValue, keyBsonType);
330+
var keyPair = new KeyValuePair<string, BsonValue>(keyPropertyName, keyBsonPropertyValue);
328331
var filter = Builders<T>.Filter.Eq(keyPair.Key, keyPair.Value);
329332

330333

@@ -344,13 +347,39 @@ protected override void UpdateItem(T entity)
344347
public static KeyValuePair<string, BsonValue> GetMongoProperty(T entity, string propertyName)
345348
{
346349
var value = typeof(T).GetProperty(propertyName).GetValue(entity);
347-
var memberMap = BsonClassMap.LookupClassMap(typeof(TKey)).GetMemberMap(propertyName);
348-
var keyBsonType = ((StringSerializer)memberMap.GetSerializer()).Representation;
349-
var bsonPropertyValue = BsonTypeMapper.MapToBsonValue(value, keyBsonType);
350-
350+
var memberMap = BsonClassMap.LookupClassMap(typeof(T)).GetMemberMap(propertyName);
351+
var memberBsonType = GetBsonType(value, memberMap);
352+
353+
// some "non-string types are mapped to string"
354+
if (memberBsonType == BsonType.String)
355+
{
356+
value = value.ToString();
357+
}
358+
359+
var bsonPropertyValue = BsonTypeMapper.MapToBsonValue(value, memberBsonType);
351360
return new KeyValuePair<string, BsonValue>(propertyName, bsonPropertyValue);
352361
}
353362

363+
protected static BsonType GetBsonType(object value, BsonMemberMap memberMap)
364+
{
365+
BsonType keyBsonType;
366+
367+
if (value == null) {
368+
keyBsonType = BsonType.Null;
369+
} else {
370+
var propertyInfo = memberMap.GetSerializer().GetType().GetProperty("Representation");
371+
if (propertyInfo != null)
372+
{
373+
keyBsonType = (BsonType)propertyInfo.GetValue(memberMap.GetSerializer());
374+
} else
375+
{
376+
keyBsonType = BsonType.Array;
377+
}
378+
}
379+
380+
return keyBsonType;
381+
}
382+
354383
protected override void SaveChanges()
355384
{
356385
}

‎SharpRepository.RavenDbRepository/RavenDbRepositoryBase.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,13 @@ protected override IQueryable<T> BaseQuery(IFetchStrategy<T> fetchStrategy = nul
6666

6767
protected override T GetQuery(TKey key, IFetchStrategy<T> fetchStrategy)
6868
{
69-
return typeof(TKey) == typeof(string) ? Session.Load<T>(key as string) : base.GetQuery(key, fetchStrategy);
69+
try
70+
{
71+
return typeof(TKey) == typeof(string) ? Session.Load<T>(key as string) : base.GetQuery(key, fetchStrategy);
72+
} catch (ArgumentException)
73+
{
74+
return null;
75+
}
7076
}
7177

7278
public override IEnumerable<T> GetMany(params TKey[] keys)

‎SharpRepository.Tests.Integration/App.config‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<!-- Raven Db Section-->
54
<section name="sharpRepository" type="SharpRepository.Repository.Configuration.SharpRepositorySection, SharpRepository.Repository" />
65
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
76
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
8-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
107
</configSections>
8+
<entityFramework>
9+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
10+
<parameters>
11+
<parameter value="System.Data.SqlServerCe.4.0" />
12+
</parameters>
13+
</defaultConnectionFactory>
14+
<providers>
15+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
16+
<provider invariantName="System.Data.SqlServerCe.4.0" type="System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact" />
17+
</providers>
18+
</entityFramework>
19+
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
20+
<targets>
21+
<target name="file" xsi:type="File" layout="${longdate} ${logger} ${message}" fileName="nlog.txt" keepFileOpen="false" encoding="iso-8859-2" />
22+
</targets>
23+
<rules>
24+
<logger name="*" minlevel="Debug" writeTo="file" />
25+
</rules>
26+
</nlog>
27+
<appSettings>
28+
<add key="Raven/RunInMemory" value="true"/>
29+
</appSettings>
1130
<connectionStrings>
1231
<add name="Ef5ConnectionString" connectionString="Data Source=test.mdf" />
1332
</connectionStrings>
@@ -16,12 +35,6 @@
1635
<repository name="EfRepository" connectionString="Ef5ConnectionString" factory="SharpRepository.EfRepository.EfConfigRepositoryFactory, SharpRepository.EfRepository" />
1736
</repositories>
1837
</sharpRepository>
19-
<!-- <efRepositoryTest>-->
20-
<!-- <repositories>-->
21-
<!-- <default name="ef" />-->
22-
<!-- <efRepository name="ef" connectionString="Ef5ConnectionString" dbContextType="SharpRepository.Tests.Integration.TestObjects.TestObjectEntities, SharpRepository.Tests.Integration" />-->
23-
<!-- </repositories>-->
24-
<!-- </efRepositoryTest>-->
2538
<runtime>
2639
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2740
<dependentAssembly>
@@ -42,25 +55,7 @@
4255
</dependentAssembly>
4356
</assemblyBinding>
4457
</runtime>
45-
<entityFramework>
46-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
47-
<parameters>
48-
<parameter value="System.Data.SqlServerCe.4.0" />
49-
</parameters>
50-
</defaultConnectionFactory>
51-
<providers>
52-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
53-
<provider invariantName="System.Data.SqlServerCe.4.0" type="System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact" />
54-
</providers>
55-
</entityFramework>
56-
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
57-
<targets>
58-
<target name="file" xsi:type="File" layout="${longdate} ${logger} ${message}" fileName="nlog.txt" keepFileOpen="false" encoding="iso-8859-2" />
59-
</targets>
60-
<rules>
61-
<logger name="*" minlevel="Debug" writeTo="file" />
62-
</rules>
63-
</nlog>
58+
6459
<startup>
6560
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
6661
</startup>

‎SharpRepository.Tests.Integration/Data/RepositoryTestCaseDataFactory.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,15 @@ public static IEnumerable<TestCaseData> Build(RepositoryType[] includeType)
6262
if (includeType.Contains(RepositoryType.RavenDb))
6363
{
6464
var documentStore = new EmbeddableDocumentStore
65-
{
66-
RunInMemory = true,
67-
Conventions = { DefaultQueryingConsistency = ConsistencyOptions.AlwaysWaitForNonStaleResultsAsOfLastWrite }
68-
};
65+
{
66+
RunInMemory = true,
67+
DataDirectory = "~\\Data\\RavenDb"
68+
};
6969
if (IntPtr.Size == 4)
7070
{
7171
documentStore.Configuration.Storage.Voron.AllowOn32Bits = true;
7272
}
73-
74-
//
73+
7574
yield return new TestCaseData(new RavenDbRepository<Contact, string>(documentStore)).SetName("RavenDbRepository Test");
7675
}
7776

‎SharpRepository.Tests.Integration/RepositoryGetTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void TryGet_Should_Return_False_If_Item_Does_Not_Exists(IRepository<Conta
115115
repository.Exists(string.Empty).ShouldBeFalse();
116116
}
117117

118-
[ExecuteForAllRepositories]
118+
[ExecuteForAllRepositoriesExcept(RepositoryType.MongoDb, Reason = "ContactId is the ObjectId, must be a 24 hex string")]
119119
public void GetMany_Params_Should_Return_Multiple_Items(IRepository<Contact, string> repository)
120120
{
121121
for (var i = 1; i <= 5; i++)
@@ -128,7 +128,7 @@ public void GetMany_Params_Should_Return_Multiple_Items(IRepository<Contact, str
128128
items.Count().ShouldEqual(4);
129129
}
130130

131-
[ExecuteForAllRepositories]
131+
[ExecuteForAllRepositoriesExcept(RepositoryType.MongoDb, Reason = "ContactId is the ObjectId, must be a 24 hex string")]
132132
public void GetMany_List_Should_Return_Multiple_Items(IRepository<Contact, string> repository)
133133
{
134134
for (var i = 1; i <= 5; i++)
@@ -141,7 +141,7 @@ public void GetMany_List_Should_Return_Multiple_Items(IRepository<Contact, strin
141141
items.Count().ShouldEqual(4);
142142
}
143143

144-
[ExecuteForAllRepositories]
144+
[ExecuteForAllRepositoriesExcept(RepositoryType.MongoDb, Reason = "ContactId is the ObjectId, must be a 24 hex string")]
145145
public void GetManyAsDictionary_Params_Should_Return_Multiple_Items(IRepository<Contact, string> repository)
146146
{
147147
for (var i = 1; i <= 5; i++)
@@ -159,7 +159,7 @@ public void GetManyAsDictionary_Params_Should_Return_Multiple_Items(IRepository<
159159
items.ContainsKey("5").ShouldBeTrue();
160160
}
161161

162-
[ExecuteForAllRepositories]
162+
[ExecuteForAllRepositoriesExcept(RepositoryType.MongoDb, Reason = "ContactId is the ObjectId, must be a 24 hex string")]
163163
public void GetManyAsDictionary_List_Should_Return_Multiple_Items(IRepository<Contact, string> repository)
164164
{
165165
for (var i = 1; i <= 5; i++)

‎SharpRepository.Tests.Integration/RepositoryUpdateTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public void Update_Should_Save_Modified_Business_Name(IRepository<Contact, strin
4141
public void Update_Should_Update_Multiple_Items(IRepository<Contact, string> repository)
4242
{
4343
IList<Contact> contacts = new List<Contact>
44-
{
45-
new Contact {Name = "Contact 1"},
46-
new Contact {Name = "Contact 2"},
47-
new Contact {Name = "Contact 3"},
48-
};
44+
{
45+
new Contact {Name = "Contact 1"},
46+
new Contact {Name = "Contact 2"},
47+
new Contact {Name = "Contact 3"},
48+
};
4949

5050
repository.Add(contacts);
5151
var items = repository.GetAll().ToList();

‎SharpRepository.Tests.Integration/SharpRepository.Tests.Integration.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
<Compile Include="Spikes\EfLazyLoadSpike.cs" />
179179
<Compile Include="Spikes\MongoRepositorySpikes.cs" />
180180
<Compile Include="RepositoryJoinTests.cs" />
181-
<Compile Include="Spikes\RavenDbEmbeddedTests.cs" />
182181
<Compile Include="Spikes\RepositoryDependencySpikes.cs" />
183182
<Compile Include="Spikes\StandardCachingSpikes.cs" />
184183
<Compile Include="TestAttributes\AllRepositories.cs" />
@@ -211,10 +210,6 @@
211210
<Compile Include="TestObjects\TestObjectEntities.cs" />
212211
</ItemGroup>
213212
<ItemGroup>
214-
<None Include="..\packages\RavenDB.Database.3.5.3\tools\Raven.Studio.Html5.zip">
215-
<Link>Raven.Studio.Html5.zip</Link>
216-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
217-
</None>
218213
<None Include="packages.config">
219214
<SubType>Designer</SubType>
220215
</None>

‎SharpRepository.Tests.Integration/Spikes/MongoRepositorySpikes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void MongoDb_Supports_Basic_Crud_Operations()
8080

8181
var read_updated = orders.Find(filter).ToList().FirstOrDefault();
8282
read_updated.OrderId.ShouldEqual(read.OrderId);
83-
read_updated.Name.ShouldEqual(read.Name);
83+
read_updated.Name.ShouldEqual("Really big sale");
8484

8585
Console.WriteLine("* DELETE *");
8686

0 commit comments

Comments
 (0)