Skip to content
Browse files

Fix to a test and adjustments to Makefile etc.

  • Loading branch information...
1 parent a6486a4 commit dfd86acaa354ae7c260926196c7fcf696f7f7ece @gokr gokr committed Nov 30, 2009
Showing with 8 additions and 5 deletions.
  1. +1 −1 Tests/CouchTest.cs
  2. +4 −4 src/Divan.csproj
  3. +3 −0 src/Makefile
View
2 Tests/CouchTest.cs
@@ -282,7 +282,7 @@ public void ShouldThrowConflictExceptionOnStaleWrite()
db.SaveDocument(doc2);
}
- [Test, ExpectedException(typeof(CouchConflictException))]
+ [Test, ExpectedException(typeof(CouchNotFoundException))]
public void ShouldHaveExtendedExceptionMessages()
{
try
View
8 src/Divan.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,7 +46,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="CouchViewResultStream.cs" />
<Compile Include="CouchBulkDeleteDocuments.cs" />
<Compile Include="CouchBulkDocuments.cs" />
<Compile Include="CouchBulkKeys.cs" />
@@ -60,7 +59,6 @@
<Compile Include="CouchPermanentViewResult.cs" />
<Compile Include="CouchQuery.cs" />
<Compile Include="CouchQueryDocument.cs" />
- <Compile Include="CouchRecord.cs" />
<Compile Include="CouchRequest.cs" />
<Compile Include="CouchServer.cs" />
<Compile Include="CouchViewDefinitionBase.cs" />
@@ -69,7 +67,6 @@
<Compile Include="CouchDesignDocument.cs" />
<Compile Include="ICanJson.cs" />
<Compile Include="ICouchDocument.cs" />
- <Compile Include="IReconcilingDocument.cs" />
<Compile Include="Lucene\CouchLuceneHit.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Linq\CouchLinqQuery.cs" />
@@ -81,6 +78,9 @@
<Compile Include="Lucene\CouchLuceneViewResult.cs" />
<Compile Include="CouchDocumentWrapper.cs" />
<Compile Include="ISelfContained.cs" />
+ <Compile Include="IReconcilingDocument.cs" />
+ <Compile Include="CouchRecord.cs" />
+ <Compile Include="CouchViewResultStream.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
View
3 src/Makefile
@@ -73,13 +73,16 @@ FILES = \
CouchPermanentViewResult.cs \
CouchQuery.cs \
CouchQueryDocument.cs \
+ CouchRecord.cs \
CouchRequest.cs \
CouchServer.cs \
CouchViewDefinition.cs \
CouchViewDefinitionBase.cs \
CouchViewResult.cs \
+ CouchViewResultStream.cs \
ICanJson.cs \
ICouchDocument.cs \
+ IReconcilingDocument.cs \
ISelfContained.cs \
Linq/CouchLinqQuery.cs \
Linq/CouchQueryProvider.cs \

0 comments on commit dfd86ac

Please sign in to comment.
Something went wrong with that request. Please try again.