Merge branch 'jrotello-tika-1.7'

KevM · Feb 6, 2015 · 0b04586 · 0b04586
2 parents 44fab3b + 6e198a9
commit 0b04586
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-BUILD_VERSION = "1.6.4"
+BUILD_VERSION = "1.7.0"
diff --git a/lib/tika-app.dll b/lib/tika-app.dll
diff --git a/ripple.config b/ripple.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ripple xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ripple xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>tikaondotnet</Name>
   <NugetSpecFolder>packaging/nuget</NugetSpecFolder>
   <SourceFolder>src</SourceFolder>
@@ -22,8 +22,5 @@
     <Dependency Name="structuremap.automocking" Version="2.6.3" Mode="Fixed" />
   </Nugets>
   <Groups />
-  <References>
-    <IgnoreAssemblies />
-  </References>
   <Nuspecs />
 </ripple>
diff --git a/src/TikaOnDotNet.Tests/TikaOnDotNet.Tests.csproj b/src/TikaOnDotNet.Tests/TikaOnDotNet.Tests.csproj
@@ -121,9 +121,6 @@
     <Reference Include="pnunit.framework">
       <HintPath>..\packages\NUnit\lib\pnunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Rhino.Mocks">
-      <HintPath>..\packages\RhinoMocks\lib\net40\Rhino.Mocks.dll</HintPath>
-    </Reference>
     <Reference Include="StructureMap">
       <HintPath>..\packages\structuremap\lib\StructureMap.dll</HintPath>
     </Reference>

diff --git a/src/TikaOnDotNet.Tests/ripple.dependencies.config b/src/TikaOnDotNet.Tests/ripple.dependencies.config
@@ -1,6 +1,5 @@
 FubuCore
 FubuTestingSupport
 NUnit
-RhinoMocks
 structuremap
 structuremap.automocking
diff --git a/src/TikaOnDotNet.Tests/text_extraction.cs b/src/TikaOnDotNet.Tests/text_extraction.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Reflection;
 using FubuTestingSupport;
 using NUnit.Framework;
 using System.Linq;
@@ -43,16 +44,17 @@ public void should_extract_mp4()
 			textExtractionResult.ContentType.ShouldEqual("video/mp4");
 		}
 
-		[Test, Explicit("Issue #11")]
+		[Test]
 		public void should_be_able_to_delete_the_mp4_after_extraction()
 		{
-			_cut.Extract("files/badgers.mp4");
+			var original = new FileInfo(Path.Combine(Directory.GetCurrentDirectory(), @"files\badgers.mp4"));
+			var mp4 = original.CopyTo(Path.Combine(Directory.GetCurrentDirectory(), @"files\badgers.bak.mp4"));
 
-			var fileInfo = new FileInfo(@"C:\projects\tikaondotnet\src\TikaOnDotNet.Tests\bin\Debug\files\badgers.mp4");
-			fileInfo.Delete();
-			fileInfo.Exists.ShouldBeFalse();
-		}
+			_cut.Extract("files/badgers.bak.mp4");
 
+			mp4.Delete();
+			mp4.Exists.ShouldBeFalse();
+		}
 
 		[Test]
 		public void extract_by_filepath_should_add_filepath_to_metadata()