Fix failing unit tests after refactoring of IndexNameResolver

Author: gmarz

src/Nest/CommonAbstractions/Infer/IndexName/IndexNameResolver.cs

@@ -17,7 +17,7 @@ public IndexNameResolver(IConnectionSettingsValues connectionSettings)
 		public string Resolve(IndexName i)
 		{
 			if (i == null || string.IsNullOrEmpty(i.Name))
-				return this.Resolve((Type)null);
+				return this.Resolve(i.Type);
 			ValidateIndexName(i.Name);
 			return i.Name;
 		}

src/Tests/ClientConcepts/Exceptions/ExceptionTests.cs

@@ -87,10 +87,11 @@ public void ClientTestWhenThrowExceptionsDisabled()
 		[U]
 		public void DispatchIndicatesMissingRouteValues()
 		{
-			var settings = new ConnectionSettings(new Uri("http://doesntexist:9200"));
+			var settings = new ConnectionSettings(new Uri("http://doesntexist:9200"))
+				.DefaultIndex("default-index");
 			var client = new ElasticClient(settings);
 
-			Action dispatch = () => client.Index(new Project());
+			Action dispatch = () => client.Index(new Project(), i => i.Index(null));
 			var ce = dispatch.ShouldThrow<ArgumentException>();
 			ce.Should().NotBeNull();
 			ce.Which.Message.Should().Contain("index=<NULL>");

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

@@ -215,6 +215,7 @@ [U]public async Task UsingOnRequestCompletedForLogging()
 		    var list = new List<string>();
 			var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
 			var settings = new ConnectionSettings(connectionPool, new InMemoryConnection())
+				.DefaultIndex("default-index")
                 .DisableDirectStreaming()
 				.OnRequestCompleted(response =>
 				{
@@ -247,6 +248,8 @@ [U]public async Task UsingOnRequestCompletedForLogging()
 			var client = new ElasticClient(settings);
 
             var syncResponse = client.Search<object>(s => s
+				.AllTypes()
+				.AllIndices()
                 .Scroll("2m")
                 .Sort(ss => ss
                     .Ascending(SortSpecialField.DocumentIndexOrder)
@@ -256,6 +259,8 @@ [U]public async Task UsingOnRequestCompletedForLogging()
             list.Count.Should().Be(2);
 
             var asyncResponse = await client.SearchAsync<object>(s => s
+				.AllTypes()
+				.AllIndices()
                 .Scroll("2m")
                 .Sort(ss => ss
                     .Ascending(SortSpecialField.DocumentIndexOrder)

src/Tests/Framework/TestClient.cs

@@ -101,7 +101,8 @@ public static IElasticClient GetFixedReturnClient(
 
 			var connection = new InMemoryConnection(fixedResult, statusCode, exception);
 			var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
-			var defaultSettings = new ConnectionSettings(connectionPool, connection);
+			var defaultSettings = new ConnectionSettings(connectionPool, connection)
+				.DefaultIndex("default-index");
 			var settings = (modifySettings != null) ? modifySettings(defaultSettings) : defaultSettings;
 			return new ElasticClient(settings);
 		}

src/Tests/Framework/VirtualClustering/SealedVirtualCluster.cs

@@ -20,12 +20,12 @@ public SealedVirtualCluster(VirtualCluster cluster, IConnectionPool pool, Testab
 		}
 
 		private ConnectionSettings CreateSettings() =>
-			new ConnectionSettings(this._connectionPool, this._connection);
+			new ConnectionSettings(this._connectionPool, this._connection).DefaultIndex("default-index");
 
 		public VirtualizedCluster AllDefaults() =>
 			new VirtualizedCluster(this._cluster, this._connectionPool, this._dateTimeProvider, CreateSettings());
 
 		public VirtualizedCluster Settings(Func<ConnectionSettings, ConnectionSettings> selector) =>
 			new VirtualizedCluster(this._cluster, this._connectionPool, this._dateTimeProvider, selector(CreateSettings()));
 	}
-}
+}

src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: u
+mode: m
 # the elasticsearch version that should be started
 elasticsearch_version: 2.2.0
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running