Merge branch 'feature/SEARCH-2110_FixingTodoForShardingTest' into 'master'

SEARCH-2110 uncommenting the TODO for the getShardInfoWith2OrMoreShards Test

See merge request search_discovery/insightengine!398
This commit is contained in:
Keerat Lalia
2020-02-28 08:59:13 +00:00
@@ -189,21 +189,21 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest
case "DB_ID":
break;
case "DB_ID_RANGE":
// TODO: Uncomment the following assert when fixed: https://issues.alfresco.com/jira/browse/SEARCH-2110
//assertEquals(shardParams.contains("shard.range="), "Unexpected shard params defined for DB_ID_RANGE");
assertTrue(shardParams.contains("shard.range="), "Shard Parameters Not as expected for the Shard Method: DB_ID_RANGE");
break;
case "DATE":
assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for DATE");
assertTrue(shardParams.contains("shard.grouping="), "Unexpected shard grouping defined for DATE");
assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: DATE");
assertTrue(shardParams.contains("shard.date.grouping="), "Shard Parameters Not as expected for the Shard Method: DATE");
break;
case "PROPERTY":
assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for PROPERTY");
assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: PROPERTY");
assertTrue(shardParams.contains("shard.regex="), "Shard Parameters Not as expected for the Shard Method: PROPERTY");
break;
case "EXPLICIT_ID":
assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for EXPLICIT_ID");
assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: EXPLICIT_ID");
break;
default:
throw new AssertionError("Not as expected: " + shardParams.toString());
throw new AssertionError("Shard Method Not expected: " + model.getShardMethod());
}
}
}