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

update Transport tests 

Original commit: elastic/x-pack-elasticsearch@1623939755
This commit is contained in:
Areek Zillur 2014-10-07 13:15:38 -04:00
parent 0306614c00
commit 85a72ee3b5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/java/org/elasticsearch/license/plugin/LicenseTransportTests.java
View File

@ -48,6 +48,7 @@ import java.util.concurrent.ExecutionException;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; import static org.elasticsearch.test.ElasticsearchIntegrationTest.*;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.*; import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.*;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
@ -57,7 +58,6 @@ public class LicenseTransportTests extends ElasticsearchIntegrationTest {
private static String pubKeyPath = null; private static String pubKeyPath = null;
private static String priKeyPath = null; private static String priKeyPath = null;
private static String keyPass = null;
@Override @Override
protected Settings nodeSettings(int nodeOrdinal) { protected Settings nodeSettings(int nodeOrdinal) {
@ -77,17 +77,13 @@ public class LicenseTransportTests extends ElasticsearchIntegrationTest {
LicenseTransportTests.priKeyPath = privateKeyFile.getAbsolutePath(); LicenseTransportTests.priKeyPath = privateKeyFile.getAbsolutePath();
assert privateKeyFile.delete(); assert privateKeyFile.delete();
assert publicKeyFile.delete(); assert publicKeyFile.delete();
String keyPass = "password";
LicenseTransportTests.keyPass = keyPass;
// Generate keyPair // Generate keyPair
String[] args = new String[6]; String[] args = new String[4];
args[0] = "--publicKeyPath"; args[0] = "--publicKeyPath";
args[1] = LicenseTransportTests.pubKeyPath; args[1] = LicenseTransportTests.pubKeyPath;
args[2] = "--privateKeyPath"; args[2] = "--privateKeyPath";
args[3] = LicenseTransportTests.priKeyPath; args[3] = LicenseTransportTests.priKeyPath;
args[4] = "--keyPass";
args[5] = LicenseTransportTests.keyPass;
KeyPairGeneratorTool.main(args); KeyPairGeneratorTool.main(args);
} }
@ -112,15 +108,13 @@ public class LicenseTransportTests extends ElasticsearchIntegrationTest {
String licenseString = TestUtils.generateESLicenses(map); String licenseString = TestUtils.generateESLicenses(map);
String[] args = new String[8]; String[] args = new String[6];
args[0] = "--license"; args[0] = "--license";
args[1] = licenseString; args[1] = licenseString;
args[2] = "--publicKeyPath"; args[2] = "--publicKeyPath";
args[3] = pubKeyPath; args[3] = pubKeyPath;
args[4] = "--privateKeyPath"; args[4] = "--privateKeyPath";
args[5] = priKeyPath; args[5] = priKeyPath;
args[6] = "--keyPass";
args[7] = keyPass;
String licenseOutput = TestUtils.runLicenseGenerationTool(args); String licenseOutput = TestUtils.runLicenseGenerationTool(args);
@ -141,6 +135,8 @@ public class LicenseTransportTests extends ElasticsearchIntegrationTest {
final GetLicenseResponse getLicenseResponse = getLicenseFuture.get(); final GetLicenseResponse getLicenseResponse = getLicenseFuture.get();
assertThat(getLicenseResponse.licenses(), notNullValue());
LicenseUtils.printLicense(getLicenseResponse.licenses()); LicenseUtils.printLicense(getLicenseResponse.licenses());
} }