attachment integration tests WIP

Author: russcam

src/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs

@@ -13,9 +13,9 @@ namespace Tests.Aggregations.Bucket.DateHistogram
 	 * From a functionality perspective, this histogram supports the same features as the normal histogram. 
 	 * The main difference is that the interval can be specified by date/time expressions.
 	 *
-	 * When specifying a format and extended_bounds, in order for Elasticsearch to be able to parse
-	 * the serialized DateTimes of extended_bounds correctly, the date_optional_time format is included
-	 * as part of the format value.
+	 * When both format and extended_bounds are specified, the `date_optional_time` format is included
+	 * as part of the format value so that Elasticsearch to be able to parse
+	 * the serialized DateTimes of extended_bounds correctly.
 	 *
 	 * Be sure to read the elasticsearch documentation {ref}/search-aggregations-bucket-datehistogram-aggregation.html[on this subject here]
 	*/

src/Tests/Aggregations/Bucket/Filters/FiltersAggregationUsageTests.cs

@@ -9,15 +9,14 @@
 
 namespace Tests.Aggregations.Bucket.Filters
 {
-	/**
+	/** == Named filters
+	 *
 	 * Defines a multi bucket aggregations where each bucket is associated with a filter. 
 	 * Each bucket will collect all documents that match its associated filter. For documents
 	 * that do not match any filter, these will be collected in the other bucket.
 	 *
 	 * Be sure to read the elasticsearch documentation {ref}/search-aggregations-bucket-filters-aggregation.html[on this subject here]
 	*/
-
-	/** == Named filters **/
 	public class FiltersAggregationUsageTests : AggregationUsageTestBase
 	{
 		public FiltersAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
@@ -111,7 +110,6 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 	}
 
 	/** == Anonymous filters **/
-
 	public class AnonymousUsage : AggregationUsageTestBase
 	{
 		public AnonymousUsage(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }

src/Tests/ClientConcepts/LowLevel/PostData.doc.cs

@@ -13,7 +13,7 @@ namespace Tests.ClientConcepts.LowLevel
 {
 	public class PostingData
 	{
-		/** # Post data
+		/** ## Post data
 		 * The low level allows you to post a string, byte[] array directly. On top of this if you pass a list of strings or objects
 		 * they will be serialized in Elasticsearch's special bulk/multi format.
 		 */

src/Tests/Document/Single/Attachment/AttachmentApiTests.cs

@@ -22,10 +22,12 @@ public class ElasticsearchNode : IDisposable
 	{
 		private static readonly object _lock = new object();
 		// <installpath> <> <plugin folder prefix>
-		private readonly Dictionary<string, string> SupportedPlugins = new Dictionary<string, string>
+		private readonly Dictionary<string, Func<string, string>> SupportedPlugins = new Dictionary<string, Func<string, string>>
 		{
-			{ "delete-by-query", "delete-by-query" },
-			{ "cloud-azure", "cloud-azure" }
+			{ "delete-by-query", _ => "delete-by-query" },
+			{ "cloud-azure", _ => "cloud-azure" },
+			{ "mapper-attachments", MapperAttachmentPlugin.GetVersion },
+			{ "mapper-murmur3", _ => "mapper-murmur3" },
 		};
 
 		private readonly bool _doNotSpawnIfAlreadyRunning;
@@ -253,7 +255,7 @@ private void DownloadAndExtractElasticsearch()
 
 				if (!Directory.Exists(this.RoamingClusterFolder))
 				{
-					Console.WriteLine($"Unziping elasticsearch: {this.Version} ...");
+					Console.WriteLine($"Unzipping elasticsearch: {this.Version} ...");
 					ZipFile.ExtractToDirectory(localZip, this.RoamingFolder);
 				}
 
@@ -288,40 +290,40 @@ private void InstallPlugins()
 			foreach (var plugin in SupportedPlugins)
 			{
 				var installPath = plugin.Key;
-				var localPath = plugin.Value;
-				var pluginFolder = Path.Combine(this.RoamingClusterFolder, "plugins", localPath);
+				var command = plugin.Value(this.Version);
+				var pluginFolder = Path.Combine(this.RoamingClusterFolder, "plugins", installPath);
 
 				if (!Directory.Exists(this.RoamingClusterFolder)) continue;
 
 				// assume plugin already installed
 				if (Directory.Exists(pluginFolder)) continue;
 
-				Console.WriteLine($"Installing elasticsearch plugin: {localPath} ...");
-				var timeout = TimeSpan.FromSeconds(60);
+				Console.WriteLine($"Installing elasticsearch plugin: {installPath} ...");
+				var timeout = TimeSpan.FromSeconds(120);
 				var handle = new ManualResetEvent(false);
 				Task.Run(() =>
 				{
-					using (var p = new ObservableProcess(pluginBat, "install", installPath))
+					using (var p = new ObservableProcess(pluginBat, "install", command))
 					{
 						var o = p.Start();
-						Console.WriteLine($"Calling: {pluginBat} install {installPath}");
+						Console.WriteLine($"Calling: {pluginBat} install {command}");
 						o.Subscribe(e=>Console.WriteLine(e),
 							(e) =>
 							{
-								Console.WriteLine($"Failed installing elasticsearch plugin: {localPath} ");
+								Console.WriteLine($"Failed installing elasticsearch plugin: {command}");
 								handle.Set();
 								throw e;
 							},
 							() => {
-								Console.WriteLine($"Finished installing elasticsearch plugin: {localPath} exit code: {p.ExitCode}");
+								Console.WriteLine($"Finished installing elasticsearch plugin: {installPath} exit code: {p.ExitCode}");
 								handle.Set();
 							});
 						if (!handle.WaitOne(timeout, true))
-							throw new Exception($"Could not install ${installPath} within {timeout}");
+							throw new Exception($"Could not install {command} within {timeout}");
 					}
 				});
 				if (!handle.WaitOne(timeout, true))
-					throw new Exception($"Could not install ${installPath} within {timeout}");
+					throw new Exception($"Could not install {command} within {timeout}");
 			}
 		}
 
@@ -361,7 +363,7 @@ public void Stop()
 			this._process?.Dispose();
 			this._processListener?.Dispose();
 
-			if (this.Info != null && this.Info.Pid.HasValue)
+			if (this.Info?.Pid != null)
 			{
 				var esProcess = Process.GetProcessById(this.Info.Pid.Value);
 				Console.WriteLine($"Killing elasticsearch PID {this.Info.Pid}");

src/Tests/Document/Single/Attachment/Attachment_Test_Document.pdf

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+
+namespace Tests.Framework.Integration
+{
+	public class MapperAttachmentPlugin
+	{
+		private static readonly Dictionary<string, string> Versions = new Dictionary<string, string>
+		{
+			{"2.1.2", "elasticsearch/elasticsearch-mapper-attachments/3.1.2"},
+			{"2.1.1", "elasticsearch/elasticsearch-mapper-attachments/3.1.1"},
+			{"2.1.0", "elasticsearch/elasticsearch-mapper-attachments/3.1.0"},
+			{"2.0.2", "elasticsearch/elasticsearch-mapper-attachments/3.0.4"},
+			{"2.0.1", "elasticsearch/elasticsearch-mapper-attachments/3.0.3"},
+			{"2.0.0", "elasticsearch/elasticsearch-mapper-attachments/3.0.2"},
+			{"2.0.0-beta2", "elasticsearch/elasticsearch-mapper-attachments/3.0.1"},
+			{"2.0.0-beta1", "elasticsearch/elasticsearch-mapper-attachments/3.0.0"},
+			{"1.7", "elasticsearch/elasticsearch-mapper-attachments/2.7.1"},
+			{"1.6", "elasticsearch/elasticsearch-mapper-attachments/2.6.0"},
+			{"1.5", "elasticsearch/elasticsearch-mapper-attachments/2.5.0"},
+			{"1.4", "elasticsearch/elasticsearch-mapper-attachments/2.4.3"},
+			{"1.3", "elasticsearch/elasticsearch-mapper-attachments/2.3.2"},
+			{"1.2", "elasticsearch/elasticsearch-mapper-attachments/2.2.1"},
+			{"1.1", "elasticsearch/elasticsearch-mapper-attachments/2.0.0"},
+			{"1.0", "elasticsearch/elasticsearch-mapper-attachments/2.0.0"},
+			{"0.90", "elasticsearch/elasticsearch-mapper-attachments/1.9.0"}
+		};
+
+		public static string GetVersion(string elasticsearchVersion)
+		{
+			string attachmentVersion;
+			if (!Versions.TryGetValue(elasticsearchVersion, out attachmentVersion))
+			{
+				// assume latest version in elasticsearch repository
+				attachmentVersion = "mapper-attachments";
+			}
+
+			return attachmentVersion;
+		}
+	}
+}

src/Tests/Framework/Integration/Process/ElasticsearchNode.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Tests.Framework.Integration
+{
+    public static class ProjectDirectory
+    {
+		static ProjectDirectory()
+		{
+			var directoryInfo = new DirectoryInfo(Directory.GetCurrentDirectory());
+
+			// If running the classic .NET solution, tests run from bin/{config} directory,
+			// but when running DNX solution, tests run from the test project root
+			Root = directoryInfo.Name == "Tests" &&
+										directoryInfo.Parent != null &&
+										directoryInfo.Parent.Name == "src"
+				? @".\"
+				: @"..\..\";
+		}
+
+		public static string Root { get; }
+    }
+}

src/Tests/Framework/Integration/Process/MapperAttachmentPlugin.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace Tests.Framework.MockData
+{
+	public class Attachment
+	{
+		public string File { get; set; }
+
+		public string Author { get; set; }
+
+		public long? ContentLength { get; set; }
+
+		public string ContentType { get; set; }
+
+		public DateTime? Date { get; set; }
+
+		public string Keywords { get; set; }
+
+		public string Language { get; set; }
+
+		public string Name { get; set; }
+
+		public string Title { get; set; }
+	}
+}

src/Tests/Framework/Integration/ProjectDirectory.cs

@@ -4,31 +4,11 @@
 using System.Threading.Tasks;
 using Nest;
 using Xunit;
+using Tests.Framework.MockData;
 
 namespace Tests.Mapping.Types.Specialized.Attachment
 {
-	public class AttachmentTest
-	{
-		public string File { get; set; }
-
-		public string Author { get; set; }
-
-		public long ContentLength { get; set; }
-
-		public string ContentType { get; set; }
-
-		public DateTime Date { get; set; }
-
-		public string Keywords { get; set; }
-
-		public string Language { get; set; }
-
-		public string Name { get; set; }
-
-		public string Title { get; set; }
-	}
-
-	public class AttachmentMappingTests : TypeMappingTestBase<AttachmentTest>
+	public class AttachmentMappingTests : TypeMappingTestBase<Tests.Framework.MockData.Attachment>
 	{
 		protected override object ExpectJson => new
 		{
@@ -87,7 +67,7 @@ protected override void AttributeBasedSerializes()
 			// TODO: Implement
 		}
 
-		protected override Func<PropertiesDescriptor<AttachmentTest>, IPromise<IProperties>> FluentProperties => p => p
+		protected override Func<PropertiesDescriptor<Framework.MockData.Attachment>, IPromise<IProperties>> FluentProperties => p => p
 			.Attachment(a => a
 				//.Fields(s => s)
 				.Name(n => n.File)
@@ -97,7 +77,7 @@ protected override void AttributeBasedSerializes()
 				.FileField(d => d
 					.Name(n => n.File)
 				)
-				.ContentLengthField((NumberPropertyDescriptor<AttachmentTest> d) => d
+				.ContentLengthField((NumberPropertyDescriptor<Framework.MockData.Attachment> d) => d
 					.Name(n => n.ContentLength)
 				)
 				.ContentTypeField(d => d
@@ -109,7 +89,7 @@ protected override void AttributeBasedSerializes()
 				.KeywordsField(d => d
 					.Name(n => n.Keywords)
 				)
-				.LanguageField((StringPropertyDescriptor<AttachmentTest> d) => d
+				.LanguageField((StringPropertyDescriptor<Framework.MockData.Attachment> d) => d
 					.Name(n => n.Language)
 					.DocValues()
 					.NotAnalyzed()