Skip to content

Commit 530db81

Browse files
gmarouligmarouli
committed
Fix tests in part-1
1 parent 0d4e124 commit 530db81

32 files changed

+322
-291
lines changed

‎modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ static ClusterState createClusterState(
399399
: GeoIpDownloader.DATABASES_INDEX;
400400
Index index = new Index(indexName, UUID.randomUUID().toString());
401401
IndexMetadata.Builder idxMeta = IndexMetadata.builder(index.getName())
402-
.settings(indexSettings(IndexVersion.current(), 1, 0).put("index.uuid", index.getUUID()));
402+
.settings(indexSettings(IndexVersion.current(), index.getUUID(), 1, 0));
403403
if (aliasGeoipDatabase) {
404404
idxMeta.putAlias(AliasMetadata.builder(GeoIpDownloader.DATABASES_INDEX));
405405
}

‎plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/AnalysisPolishFactoryTests.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ protected Map<String, Class<?>> getTokenFilters() {
4242

4343
public void testThreadSafety() throws IOException {
4444
// TODO: is this the right boilerplate? I forked this out of TransportAnalyzeAction.java:
45-
Settings settings = indexSettings(IndexVersion.current(), 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())
46-
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
47-
.build();
45+
Settings settings = indexSettings(IndexVersion.current(), UUIDs.randomBase64UUID(), 1, 0).put(
46+
Environment.PATH_HOME_SETTING.getKey(),
47+
createTempDir().toString()
48+
).build();
4849
Environment environment = TestEnvironment.newEnvironment(settings);
4950
IndexMetadata metadata = IndexMetadata.builder(IndexMetadata.INDEX_UUID_NA_VALUE).settings(settings).build();
5051
IndexSettings indexSettings = new IndexSettings(metadata, Settings.EMPTY);

‎server/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ public void testDeduplicate() throws IOException {
397397
"reason": {
398398
"type": "query_shard_exception",
399399
"reason": "foobar",
400-
"index_uuid": IndexMetadata.INDEX_UUID_NA_VALUE,
400+
"index_uuid": "_na_",
401401
"index": "foo1"
402402
}
403403
}

‎server/src/test/java/org/elasticsearch/action/fieldcaps/RequestDispatcherTests.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ public void testHappyCluster() throws Exception {
122122
ProjectMetadata.Builder metadata = ProjectMetadata.builder(projectId);
123123
for (String index : allIndices) {
124124
metadata.put(
125-
IndexMetadata.builder(index).settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, between(1, 10), between(0, 2)))
125+
IndexMetadata.builder(index)
126+
.settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, randomUUID(), between(1, 10), between(0, 2)))
126127
);
127128
}
128129
clusterState = newClusterState(Metadata.builder().put(metadata).build(), discoNodes.build());
@@ -194,7 +195,8 @@ public void testRetryThenOk() throws Exception {
194195
ProjectMetadata.Builder metadata = ProjectMetadata.builder(projectId);
195196
for (String index : allIndices) {
196197
metadata.put(
197-
IndexMetadata.builder(index).settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, between(1, 10), between(1, 3)))
198+
IndexMetadata.builder(index)
199+
.settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, randomUUID(), between(1, 10), between(1, 3)))
198200
);
199201
}
200202
clusterState = newClusterState(Metadata.builder().put(metadata).build(), discoNodes.build());
@@ -317,7 +319,8 @@ public void testRetryButFails() throws Exception {
317319
ProjectMetadata.Builder metadata = ProjectMetadata.builder(projectId);
318320
for (String index : allIndices) {
319321
metadata.put(
320-
IndexMetadata.builder(index).settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, between(1, 10), between(0, 3)))
322+
IndexMetadata.builder(index)
323+
.settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, randomUUID(), between(1, 10), between(0, 3)))
321324
);
322325
}
323326
clusterState = newClusterState(Metadata.builder().put(metadata).build(), discoNodes.build());
@@ -442,7 +445,8 @@ public void testSuccessWithAnyMatch() throws Exception {
442445
ProjectMetadata.Builder metadata = ProjectMetadata.builder(projectId);
443446
for (String index : allIndices) {
444447
metadata.put(
445-
IndexMetadata.builder(index).settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, between(2, 10), between(0, 2)))
448+
IndexMetadata.builder(index)
449+
.settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, randomUUID(), between(2, 10), between(0, 2)))
446450
);
447451
}
448452
clusterState = newClusterState(Metadata.builder().put(metadata).build(), discoNodes.build());
@@ -541,7 +545,8 @@ public void testStopAfterAllShardsUnmatched() throws Exception {
541545
ProjectMetadata.Builder metadata = ProjectMetadata.builder(projectId);
542546
for (String index : allIndices) {
543547
metadata.put(
544-
IndexMetadata.builder(index).settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, between(1, 10), between(0, 2)))
548+
IndexMetadata.builder(index)
549+
.settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, randomUUID(), between(1, 10), between(0, 2)))
545550
);
546551
}
547552
clusterState = newClusterState(Metadata.builder().put(metadata).build(), discoNodes.build());
@@ -635,7 +640,8 @@ public void testFailWithSameException() throws Exception {
635640
ProjectMetadata.Builder metadata = ProjectMetadata.builder(projectId);
636641
for (String index : allIndices) {
637642
metadata.put(
638-
IndexMetadata.builder(index).settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, between(1, 10), between(0, 3)))
643+
IndexMetadata.builder(index)
644+
.settings(indexSettings(IndexVersions.MINIMUM_COMPATIBLE, randomUUID(), between(1, 10), between(0, 3)))
639645
);
640646
}
641647
clusterState = newClusterState(Metadata.builder().put(metadata).build(), discoNodes.build());

‎server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,24 +235,20 @@ public void testDelayedUnassignedScheduleRerouteAfterDelayedReroute() throws Exc
235235
.put(
236236
IndexMetadata.builder("short_delay")
237237
.settings(
238-
settings(IndexVersion.current()).put(
238+
indexSettings(IndexVersion.current(), randomUUID(), 1, 1).put(
239239
UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(),
240240
shortDelaySetting
241241
)
242242
)
243-
.numberOfShards(1)
244-
.numberOfReplicas(1)
245243
)
246244
.put(
247245
IndexMetadata.builder("long_delay")
248246
.settings(
249-
settings(IndexVersion.current()).put(
247+
indexSettings(IndexVersion.current(), randomUUID(), 1, 1).put(
250248
UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(),
251249
longDelaySetting
252250
)
253251
)
254-
.numberOfShards(1)
255-
.numberOfReplicas(1)
256252
)
257253
.build();
258254
ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT)

‎server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public class PrimaryTermsTests extends ESAllocationTestCase {
4242
private static final String TEST_INDEX_2 = "test2";
4343
private int numberOfShards;
4444
private int numberOfReplicas;
45-
private static final Settings DEFAULT_SETTINGS = Settings.builder()
46-
.put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
47-
.build();
4845
private AllocationService allocationService;
4946
private ClusterState clusterState;
5047

@@ -171,9 +168,9 @@ private void addNodes() {
171168

172169
private IndexMetadata.Builder createIndexMetadata(String indexName) {
173170
primaryTermsPerIndex.put(indexName, new long[numberOfShards]);
174-
final IndexMetadata.Builder builder = new IndexMetadata.Builder(indexName).settings(DEFAULT_SETTINGS)
175-
.numberOfReplicas(this.numberOfReplicas)
176-
.numberOfShards(this.numberOfShards);
171+
final IndexMetadata.Builder builder = new IndexMetadata.Builder(indexName).settings(
172+
indexSettings(IndexVersion.current(), randomUUID(), this.numberOfShards, this.numberOfReplicas)
173+
);
177174
for (int i = 0; i < numberOfShards; i++) {
178175
builder.primaryTerm(i, randomInt(200));
179176
primaryTermsPerIndex.get(indexName)[i] = builder.primaryTerm(i);

0 commit comments

Comments
 (0)