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

reformat code

Browse Source 
Original commit: elastic/x-pack-elasticsearch@9df9af2804
This commit is contained in:
Areek Zillur 2014-10-20 15:45:01 -04:00
parent 1964ebc6f2
commit b9d92bae5a
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/elasticsearch/license/AbstractLicensingTestBase.java
View File

@ -5,11 +5,9 @@
*/ */
package org.elasticsearch.license; package org.elasticsearch.license;
import org.elasticsearch.license.core.ESLicenses;
import org.elasticsearch.license.manager.ESLicenseManager; import org.elasticsearch.license.manager.ESLicenseManager;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.Map; import java.util.Map;

3
src/test/java/org/elasticsearch/license/plugin/LicensesPluginIntegrationTests.java
View File

@ -12,8 +12,7 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.InternalTestCluster;
import org.junit.Test; import org.junit.Test;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.*;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE; import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE;
@ClusterScope(scope = SUITE, numDataNodes = 10) @ClusterScope(scope = SUITE, numDataNodes = 10)

9
src/test/java/org/elasticsearch/license/plugin/LicensesServiceTests.java
View File

@ -208,7 +208,8 @@ public class LicensesServiceTests extends ElasticsearchIntegrationTest {
} }
@Test @Test
public void testMultipleClientRegistration() {} public void testMultipleClientRegistration() {
}
private class TestLicenseClientListener implements LicensesClientService.Listener { private class TestLicenseClientListener implements LicensesClientService.Listener {
@ -290,7 +291,8 @@ public class LicensesServiceTests extends ElasticsearchIntegrationTest {
latch1.await(); latch1.await();
logger.info("waiting for onEnabled"); logger.info("waiting for onEnabled");
while(!testLicenseClientListener.processed.get()) {} while (!testLicenseClientListener.processed.get()) {
}
Set<String> enabledFeatures = licensesManagerService.enabledFeatures(); Set<String> enabledFeatures = licensesManagerService.enabledFeatures();
assertTrue(enabledFeatures.contains("shield")); assertTrue(enabledFeatures.contains("shield"));
@ -315,7 +317,8 @@ public class LicensesServiceTests extends ElasticsearchIntegrationTest {
assertFalse("feature should not be enabled: no licenses registered", managerService.enabledFeatures().contains("marvel")); assertFalse("feature should not be enabled: no licenses registered", managerService.enabledFeatures().contains("marvel"));
} }
@Test @Ignore @Test
@Ignore
public void testLicenseExpiry() throws Exception { public void testLicenseExpiry() throws Exception {
//TODO, first figure out how to generate a license with a quick expiry in matter of seconds //TODO, first figure out how to generate a license with a quick expiry in matter of seconds
} }

1
src/test/java/org/elasticsearch/license/plugin/TestConsumerPlugin.java
View File

@ -7,7 +7,6 @@ package org.elasticsearch.license.plugin;
import org.elasticsearch.common.collect.ImmutableSet; import org.elasticsearch.common.collect.ImmutableSet;
import org.elasticsearch.common.component.LifecycleComponent; import org.elasticsearch.common.component.LifecycleComponent;
import org.elasticsearch.common.inject.Module;
import org.elasticsearch.plugins.AbstractPlugin; import org.elasticsearch.plugins.AbstractPlugin;
import java.util.Collection; import java.util.Collection;