honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix XContextSerialization test failure 

Original commit: elastic/x-pack-elasticsearch@f2e1b19214
This commit is contained in:
Areek Zillur 2015-05-29 16:29:13 -04:00
parent 24d63b1eef
commit 900ea3cd20
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/src/test/java/org/elasticsearch/license/plugin/LicensesMetaDataSerializationTests.java
View File

@ -6,10 +6,7 @@
package org.elasticsearch.license.plugin; package org.elasticsearch.license.plugin;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.*;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.license.core.License; import org.elasticsearch.license.core.License;
import org.elasticsearch.license.plugin.core.LicensesMetaData; import org.elasticsearch.license.plugin.core.LicensesMetaData;
import org.elasticsearch.license.plugin.core.TrialLicenseUtils; import org.elasticsearch.license.plugin.core.TrialLicenseUtils;
@ -144,7 +141,7 @@ public class LicensesMetaDataSerializationTests extends ElasticsearchTestCase {
} }
private static LicensesMetaData getLicensesMetaDataFromXContent(byte[] bytes) throws Exception { private static LicensesMetaData getLicensesMetaDataFromXContent(byte[] bytes) throws Exception {
final XContentParser parser = XContentFactory.xContent(bytes).createParser(bytes); final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(bytes);
parser.nextToken(); // consume null parser.nextToken(); // consume null
parser.nextToken(); // consume "licensesMetaData" parser.nextToken(); // consume "licensesMetaData"
LicensesMetaData licensesMetaDataFromXContent = LicensesMetaData.PROTO.fromXContent(parser); LicensesMetaData licensesMetaDataFromXContent = LicensesMetaData.PROTO.fromXContent(parser);