honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 18:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TEST] Use test.bwc.version if compatibility version is not present

Browse Source
This commit is contained in:
Simon Willnauer 2014-06-17 12:15:50 +02:00
parent ef05334fdd
commit e198c58a6b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
View File

@ -185,7 +185,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
*/ */
public static final String TESTS_COMPATIBILITY = "tests.compatibility"; public static final String TESTS_COMPATIBILITY = "tests.compatibility";
protected static final Version COMPATIBILITY_VERSION = Version.fromString(System.getProperty(TESTS_COMPATIBILITY)); protected static final Version COMPATIBILITY_VERSION = Version.fromString(compatibilityVersionProperty());
/** /**
* Threshold at which indexing switches from frequently async to frequently bulk. * Threshold at which indexing switches from frequently async to frequently bulk.
@ -300,6 +300,16 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
} }
} }
private Loading randomLoadingValues() {
if (COMPATIBILITY_VERSION.onOrAfter(Version.V_1_2_0)) {
// Loading.EAGER_GLOBAL_ORDINALS was added in 1,2.0
return randomFrom(Loading.values());
} else {
return randomFrom(Loading.LAZY, Loading.EAGER);
}
}
/** /**
* Creates a randomized index template. This template is used to pass in randomized settings on a * Creates a randomized index template. This template is used to pass in randomized settings on a
* per index basis. Allows to enable/disable the randomization for number of shards and replicas * per index basis. Allows to enable/disable the randomization for number of shards and replicas
@ -331,7 +341,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
.startObject("mapping") .startObject("mapping")
.startObject("fielddata") .startObject("fielddata")
.field(FieldDataType.FORMAT_KEY, randomFrom("paged_bytes", "fst")) // unfortunately doc values only work on not_analyzed fields .field(FieldDataType.FORMAT_KEY, randomFrom("paged_bytes", "fst")) // unfortunately doc values only work on not_analyzed fields
.field(Loading.KEY, randomFrom(Loading.values())) .field(Loading.KEY, randomLoadingValues())
.endObject() .endObject()
.endObject() .endObject()
.endObject() .endObject()
@ -1490,5 +1500,14 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
public @interface SuiteScopeTest { public @interface SuiteScopeTest {
} }
private static String compatibilityVersionProperty() {
final String version = System.getProperty(TESTS_COMPATIBILITY);
if (Strings.hasLength(version)) {
return version;
}
return System.getProperty(TESTS_BACKWARDS_COMPATIBILITY_VERSION);
}
} }