http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/CredentialStoreTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/CredentialStoreTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/CredentialStoreTest.java index af0eac6..1e14a13 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/CredentialStoreTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/encryption/CredentialStoreTest.java @@ -17,7 +17,9 @@ */ package org.apache.ambari.server.security.encryption; -import junit.framework.Assert; +import java.io.File; +import java.util.concurrent.TimeUnit; + import org.apache.ambari.server.security.credential.Credential; import org.apache.ambari.server.security.credential.GenericKeyCredential; import org.junit.After; @@ -26,8 +28,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.File; -import java.util.concurrent.TimeUnit; +import junit.framework.Assert; public class CredentialStoreTest {
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java index 2840e3d..d217456 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java @@ -17,7 +17,23 @@ */ package org.apache.ambari.server.security.ldap; -import com.google.common.collect.Sets; +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertNull; +import static junit.framework.Assert.assertTrue; +import static org.easymock.EasyMock.anyBoolean; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createMockBuilder; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -29,6 +45,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.naming.directory.SearchControls; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.orm.entities.GroupEntity; @@ -59,13 +77,7 @@ import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.support.LdapContextSource; import org.springframework.ldap.filter.Filter; -import javax.naming.directory.SearchControls; - -import static junit.framework.Assert.*; -import static org.easymock.EasyMock.*; -import static org.easymock.EasyMock.anyBoolean; -import static org.easymock.EasyMock.createNiceMock; -import static org.junit.Assert.assertEquals; +import com.google.common.collect.Sets; @RunWith(PowerMockRunner.class) @PrepareForTest(AmbariLdapUtils.class) http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ActionLogTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ActionLogTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ActionLogTest.java index 69c9993..8e789c8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ActionLogTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ActionLogTest.java @@ -18,10 +18,9 @@ package org.apache.ambari.server.serveraction; -import junit.framework.Assert; import org.junit.Test; -import static org.junit.Assert.*; +import junit.framework.Assert; public class ActionLogTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/MockServerAction.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/MockServerAction.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/MockServerAction.java index cc6f9af..ddb1f97 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/MockServerAction.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/MockServerAction.java @@ -18,15 +18,16 @@ package org.apache.ambari.server.serveraction; -import com.google.inject.Inject; +import java.util.Map; +import java.util.concurrent.ConcurrentMap; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.HostRoleStatus; import org.apache.ambari.server.agent.CommandReport; import org.apache.ambari.server.agent.ExecutionCommand; import org.apache.ambari.server.state.Clusters; -import java.util.Map; -import java.util.concurrent.ConcurrentMap; +import com.google.inject.Inject; /** * The MockServerAction is an implementation of a ServerAction strictly used to testing purposes. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java index a2304b8..ea8b1b0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java @@ -18,13 +18,17 @@ package org.apache.ambari.server.serveraction.kerberos; -import junit.framework.Assert; -import org.apache.ambari.server.security.credential.PrincipalKeyCredential; -import org.easymock.Capture; -import org.easymock.CaptureType; -import org.easymock.IAnswer; -import org.junit.Ignore; -import org.junit.Test; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.newCapture; +import static org.easymock.EasyMock.replay; + +import java.nio.charset.Charset; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; import javax.naming.AuthenticationException; import javax.naming.CommunicationException; @@ -37,13 +41,14 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.Control; import javax.naming.ldap.LdapContext; -import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import org.apache.ambari.server.security.credential.PrincipalKeyCredential; +import org.easymock.Capture; +import org.easymock.CaptureType; +import org.easymock.IAnswer; +import org.junit.Ignore; +import org.junit.Test; -import static org.easymock.EasyMock.*; +import junit.framework.Assert; public class ADKerberosOperationHandlerTest extends KerberosOperationHandlerTest { private static final String DEFAULT_ADMIN_PRINCIPAL = "[email protected]"; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerActionTest.java index 99076bf..ef2288c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerActionTest.java @@ -18,6 +18,14 @@ package org.apache.ambari.server.serveraction.kerberos; +import static org.easymock.EasyMock.anyBoolean; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -36,8 +44,8 @@ import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.kerberos.KerberosComponentDescriptor; -import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor; import org.apache.ambari.server.state.kerberos.KerberosDescriptor; +import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor; import org.easymock.Capture; import org.easymock.CaptureType; import org.easymock.EasyMock; @@ -49,14 +57,6 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; -import static org.easymock.EasyMock.anyBoolean; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.anyString; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; - public class AbstractPrepareKerberosServerActionTest { private class PrepareKerberosServerAction extends AbstractPrepareKerberosServerAction{ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ConfigureAmbariIdentitiesServerActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ConfigureAmbariIdentitiesServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ConfigureAmbariIdentitiesServerActionTest.java index 439bcae..c232117 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ConfigureAmbariIdentitiesServerActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ConfigureAmbariIdentitiesServerActionTest.java @@ -18,10 +18,14 @@ package org.apache.ambari.server.serveraction.kerberos; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import junit.framework.Assert; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; + +import java.io.File; +import java.lang.reflect.Method; + +import javax.persistence.EntityManager; + import org.apache.ambari.server.audit.AuditLogger; import org.apache.ambari.server.controller.KerberosHelper; import org.apache.ambari.server.orm.DBAccessor; @@ -37,12 +41,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import javax.persistence.EntityManager; -import java.io.File; -import java.lang.reflect.Method; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; +import junit.framework.Assert; public class ConfigureAmbariIdentitiesServerActionTest extends EasyMockSupport { @Rule http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java index 5c4475e..31b8296 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerActionTest.java @@ -18,12 +18,6 @@ package org.apache.ambari.server.serveraction.kerberos; -import junit.framework.Assert; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; - import java.io.File; import java.nio.file.Files; import java.nio.file.Path; @@ -32,6 +26,12 @@ import java.nio.file.attribute.PosixFilePermission; import java.util.Set; import org.apache.ambari.server.utils.ShellCommandUtil; +import org.junit.Assume; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + +import junit.framework.Assert; public class CreateKeytabFilesServerActionTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipalTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipalTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipalTest.java index 28dd08a..e503b28 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipalTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipalTest.java @@ -18,9 +18,11 @@ package org.apache.ambari.server.serveraction.kerberos; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; -import static org.junit.Assert.*; +import org.junit.Test; public class DeconstructedPrincipalTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandlerTest.java index cb420c7..f2a09ba 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandlerTest.java @@ -18,10 +18,12 @@ package org.apache.ambari.server.serveraction.kerberos; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import junit.framework.Assert; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; + +import java.util.HashMap; +import java.util.Map; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.security.credential.PrincipalKeyCredential; @@ -31,11 +33,11 @@ import org.easymock.EasyMock; import org.junit.BeforeClass; import org.junit.Test; -import java.util.HashMap; -import java.util.Map; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; +import junit.framework.Assert; public class IPAKerberosOperationHandlerTest extends KerberosOperationHandlerTest { private static final String DEFAULT_ADMIN_PRINCIPAL = "admin"; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KDCTypeTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KDCTypeTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KDCTypeTest.java index ea3de5e..b9a4252 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KDCTypeTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KDCTypeTest.java @@ -18,9 +18,10 @@ package org.apache.ambari.server.serveraction.kerberos; -import junit.framework.Assert; import org.junit.Test; +import junit.framework.Assert; + public class KDCTypeTest { @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosConfigDataFileTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosConfigDataFileTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosConfigDataFileTest.java index 4a1d4f9..66358ec 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosConfigDataFileTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosConfigDataFileTest.java @@ -18,14 +18,15 @@ package org.apache.ambari.server.serveraction.kerberos; -import junit.framework.Assert; +import java.io.File; +import java.util.Iterator; +import java.util.Map; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.File; -import java.util.Iterator; -import java.util.Map; +import junit.framework.Assert; /** * This is a test to see how well the KerberosConfigDataFileWriter and KerberosConfigDataFileReader http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosIdentityDataFileTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosIdentityDataFileTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosIdentityDataFileTest.java index 70f538b..323ba8e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosIdentityDataFileTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosIdentityDataFileTest.java @@ -18,14 +18,15 @@ package org.apache.ambari.server.serveraction.kerberos; -import junit.framework.Assert; +import java.io.File; +import java.util.Iterator; +import java.util.Map; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.File; -import java.util.Iterator; -import java.util.Map; +import junit.framework.Assert; /** * This is a test to see how well the KerberosIdentityDataFileWriter and KerberosIdentityDataFileReader http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerFactoryTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerFactoryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerFactoryTest.java index 71e2ed3..382c914 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerFactoryTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerFactoryTest.java @@ -18,22 +18,21 @@ package org.apache.ambari.server.serveraction.kerberos; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.configuration.Configuration; -import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.stack.OsFamily; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.createNiceMock; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; public class KerberosOperationHandlerFactoryTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java index 09160d8..3f9ee42 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java @@ -18,7 +18,14 @@ package org.apache.ambari.server.serveraction.kerberos; -import junit.framework.Assert; +import java.io.File; +import java.io.FileInputStream; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.security.credential.PrincipalKeyCredential; import org.apache.commons.codec.binary.Base64; import org.apache.directory.server.kerberos.shared.keytab.Keytab; @@ -29,13 +36,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import java.io.File; -import java.io.FileInputStream; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import junit.framework.Assert; public abstract class KerberosOperationHandlerTest extends EasyMockSupport { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java index ac6a154..140277e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java @@ -18,11 +18,19 @@ package org.apache.ambari.server.serveraction.kerberos; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; -import junit.framework.Assert; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.HostRoleCommand; @@ -40,16 +48,11 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; -import static org.easymock.EasyMock.*; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import junit.framework.Assert; public class KerberosServerActionTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java index 39f4201..17b9535 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java @@ -18,11 +18,17 @@ package org.apache.ambari.server.serveraction.kerberos; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.newCapture; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; -import junit.framework.Assert; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.security.credential.PrincipalKeyCredential; @@ -37,11 +43,11 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; -import static org.easymock.EasyMock.*; +import junit.framework.Assert; public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixLzoCodecPathTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixLzoCodecPathTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixLzoCodecPathTest.java index 49f3b59..bf4e2ab 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixLzoCodecPathTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/FixLzoCodecPathTest.java @@ -17,10 +17,10 @@ */ package org.apache.ambari.server.serveraction.upgrades; -import org.junit.Test; - import static org.junit.Assert.assertEquals; +import org.junit.Test; + /** * Tests FixLzoCodecPath logic */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/OozieConfigCalculationTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/OozieConfigCalculationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/OozieConfigCalculationTest.java index 8fa6429..70b8666 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/OozieConfigCalculationTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/OozieConfigCalculationTest.java @@ -17,12 +17,12 @@ */ package org.apache.ambari.server.serveraction.upgrades; -import org.apache.commons.lang.StringUtils; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.apache.commons.lang.StringUtils; +import org.junit.Test; + /** * Tests OozieConfigCalculation logic */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerWebAlertConfigActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerWebAlertConfigActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerWebAlertConfigActionTest.java index b66e97c..273abcd 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerWebAlertConfigActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerWebAlertConfigActionTest.java @@ -19,8 +19,16 @@ package org.apache.ambari.server.serveraction.upgrades; -import com.google.inject.Inject; -import junit.framework.Assert; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Scanner; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; import org.apache.ambari.server.actionmanager.HostRoleCommand; import org.apache.ambari.server.actionmanager.HostRoleStatus; @@ -39,16 +47,7 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import java.io.File; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; -import java.util.Scanner; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; +import junit.framework.Assert; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java index 519e5f3..6e37ded 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ComponentModuleTest.java @@ -18,6 +18,17 @@ package org.apache.ambari.server.stack; +import static org.easymock.EasyMock.createNiceMock; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.apache.ambari.server.state.AutoDeployInfo; import org.apache.ambari.server.state.BulkCommandDefinition; import org.apache.ambari.server.state.ClientConfigFileDefinition; @@ -27,17 +38,6 @@ import org.apache.ambari.server.state.CustomCommandDefinition; import org.apache.ambari.server.state.DependencyInfo; import org.junit.Test; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static org.easymock.EasyMock.createNiceMock; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - /** * ComponentModule unit test case. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java index 764118c..0f1dd55 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java @@ -18,6 +18,10 @@ package org.apache.ambari.server.stack; +import java.io.File; +import java.io.IOException; +import java.net.URL; + import org.apache.ambari.server.state.kerberos.KerberosDescriptor; import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory; import org.junit.BeforeClass; @@ -25,10 +29,6 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.util.Assert; -import java.io.File; -import java.io.IOException; -import java.net.URL; - /** * KerberosDescriptorTest tests the stack- and service-level descriptors for certain stacks * and services http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java index f44f741..6f9827d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java @@ -18,7 +18,16 @@ package org.apache.ambari.server.stack; -import com.google.common.collect.Lists; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.state.quicklinks.Check; import org.apache.ambari.server.state.quicklinks.Link; @@ -28,13 +37,7 @@ import org.apache.ambari.server.state.quicklinks.QuickLinks; import org.apache.ambari.server.state.quicklinks.QuickLinksConfiguration; import org.junit.Test; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.junit.Assert.*; +import com.google.common.collect.Lists; public class QuickLinksConfigurationModuleTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java index 99a34f4..9e18cd0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java @@ -21,22 +21,20 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimaps; import org.apache.ambari.server.controller.RepositoryResponse; import org.apache.ambari.server.orm.entities.OperatingSystemEntity; import org.apache.ambari.server.orm.entities.RepositoryEntity; import org.apache.ambari.server.state.RepositoryInfo; -import org.apache.ambari.server.state.stack.RepositoryXml; import org.junit.Assert; import org.junit.Test; import com.google.common.base.Optional; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.Multimaps; public class RepoUtilTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java index 3b963a8..c831c19 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java @@ -18,19 +18,15 @@ package org.apache.ambari.server.stack; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import org.apache.ambari.server.AmbariException; -import org.apache.ambari.server.api.services.AmbariMetaInfo; -import org.apache.ambari.server.state.CommandScriptDefinition; -import org.apache.ambari.server.state.ComponentInfo; -import org.apache.ambari.server.state.CredentialStoreInfo; -import org.apache.ambari.server.state.CustomCommandDefinition; -import org.apache.ambari.server.state.PropertyInfo; -import org.apache.ambari.server.state.ServiceInfo; -import org.apache.ambari.server.state.ServiceOsSpecific; -import org.apache.ambari.server.state.ServicePropertyInfo; -import org.junit.Test; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.File; import java.lang.reflect.Field; @@ -43,15 +39,20 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.createStrictMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.api.services.AmbariMetaInfo; +import org.apache.ambari.server.state.CommandScriptDefinition; +import org.apache.ambari.server.state.ComponentInfo; +import org.apache.ambari.server.state.CredentialStoreInfo; +import org.apache.ambari.server.state.CustomCommandDefinition; +import org.apache.ambari.server.state.PropertyInfo; +import org.apache.ambari.server.state.ServiceInfo; +import org.apache.ambari.server.state.ServiceOsSpecific; +import org.apache.ambari.server.state.ServicePropertyInfo; +import org.junit.Test; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; /** * ServiceModule unit tests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerExtensionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerExtensionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerExtensionTest.java index 0676568..e4fcb77 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerExtensionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerExtensionTest.java @@ -21,18 +21,14 @@ package org.apache.ambari.server.stack; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.io.File; -import java.io.FilenameFilter; import java.util.ArrayList; import java.util.List; -import java.util.Map; import org.apache.ambari.server.metadata.ActionMetadata; import org.apache.ambari.server.orm.dao.ExtensionDAO; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMock.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMock.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMock.java index 1b9e15f..0fe1573 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMock.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMock.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; + import javax.annotation.Nullable; import org.apache.ambari.server.AmbariException; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java index f4f45a7..ec89a8c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java @@ -18,12 +18,13 @@ package org.apache.ambari.server.stack; -import org.apache.ambari.server.state.theme.Theme; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.io.File; -import static org.junit.Assert.*; +import org.apache.ambari.server.state.theme.Theme; +import org.junit.Test; public class ThemeModuleTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/stack/UpdateActiveRepoVersionOnStartupTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/UpdateActiveRepoVersionOnStartupTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/UpdateActiveRepoVersionOnStartupTest.java index 24ab0e8..df69f68 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/UpdateActiveRepoVersionOnStartupTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/UpdateActiveRepoVersionOnStartupTest.java @@ -18,9 +18,12 @@ package org.apache.ambari.server.stack; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -import java.io.*; +import java.io.IOException; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java index 4a04818..80fb74f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/AlertTest.java @@ -19,12 +19,12 @@ package org.apache.ambari.server.state; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Test; + /** * Tests {@link Alert}. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java index deca9b8..4f6ae13 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; - import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ClusterNotFoundException; import org.apache.ambari.server.api.services.AmbariMetaInfo; @@ -50,6 +48,8 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.util.Providers; +import junit.framework.Assert; + /** * Tests the {@link CheckHelper} class http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java index ba9eb3c..84f81e6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java @@ -17,12 +17,20 @@ */ package org.apache.ambari.server.state; -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Module; -import com.google.inject.persist.PersistService; -import com.google.inject.util.Modules; +import static org.apache.ambari.server.state.ConfigMergeHelper.ThreeWayValue; +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -30,22 +38,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import static org.easymock.EasyMock.anyString; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.createNiceMock; -import static org.junit.Assert.assertEquals; -import static org.apache.ambari.server.state.ConfigMergeHelper.ThreeWayValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import com.google.inject.Binder; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Module; +import com.google.inject.persist.PersistService; +import com.google.inject.util.Modules; /** * Tests the {@link ConfigMergeHelper} class http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java index e144e18..09aaa92 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/DesiredConfigTest.java @@ -20,11 +20,12 @@ package org.apache.ambari.server.state; import java.util.Arrays; import java.util.List; -import nl.jqno.equalsverifier.EqualsVerifier; -import nl.jqno.equalsverifier.Warning; import org.junit.Assert; import org.junit.Test; +import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; + /** * Tests desired config instances. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/PropertyInfoTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/PropertyInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/PropertyInfoTest.java index 8abeb03..6e283ce 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/PropertyInfoTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/PropertyInfoTest.java @@ -17,15 +17,13 @@ */ package org.apache.ambari.server.state; -import com.google.common.collect.Sets; -import org.junit.Test; -import org.w3c.dom.Element; -import org.w3c.dom.Node; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; import java.io.ByteArrayInputStream; import java.lang.reflect.Field; import java.util.ArrayList; @@ -33,12 +31,16 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.stream.StreamSource; + +import org.junit.Test; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import com.google.common.collect.Sets; public class PropertyInfoTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java index 3034459..7bd5ecf 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceInfoTest.java @@ -18,20 +18,25 @@ package org.apache.ambari.server.state; -import com.google.common.collect.Lists; -import org.apache.ambari.server.state.stack.ServiceMetainfoXml; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.*; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; + +import org.apache.ambari.server.state.stack.ServiceMetainfoXml; +import org.junit.Test; + +import com.google.common.collect.Lists; /** * ServiceInfo tests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertiesTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertiesTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertiesTest.java index 79f3538..b9d2a76 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertiesTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertiesTest.java @@ -17,16 +17,17 @@ */ package org.apache.ambari.server.state; -import org.apache.ambari.server.stack.StackManager; -import org.junit.Test; -import org.xml.sax.SAXException; - -import javax.xml.validation.Validator; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; +import javax.xml.validation.Validator; + +import org.apache.ambari.server.stack.StackManager; +import org.junit.Test; +import org.xml.sax.SAXException; + public class ServicePropertiesTest { /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertyInfoTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertyInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertyInfoTest.java index e56d218..9f81278 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertyInfoTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServicePropertyInfoTest.java @@ -18,17 +18,19 @@ package org.apache.ambari.server.state; -import nl.jqno.equalsverifier.EqualsVerifier; -import nl.jqno.equalsverifier.Warning; -import org.junit.Test; +import static junit.framework.Assert.assertEquals; + +import java.io.ByteArrayInputStream; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; -import java.io.ByteArrayInputStream; -import static junit.framework.Assert.assertEquals; +import org.junit.Test; + +import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; public class ServicePropertyInfoTest { private static final String XML = http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/action/JobTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/action/JobTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/action/JobTest.java index 88da9b7..90cfe09 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/action/JobTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/action/JobTest.java @@ -18,16 +18,6 @@ package org.apache.ambari.server.state.action; -import org.apache.ambari.server.state.action.Action; -import org.apache.ambari.server.state.action.ActionCompletedEvent; -import org.apache.ambari.server.state.action.ActionEvent; -import org.apache.ambari.server.state.action.ActionFailedEvent; -import org.apache.ambari.server.state.action.ActionId; -import org.apache.ambari.server.state.action.ActionImpl; -import org.apache.ambari.server.state.action.ActionProgressUpdateEvent; -import org.apache.ambari.server.state.action.ActionState; -import org.apache.ambari.server.state.action.ActionType; -import org.apache.ambari.server.state.action.ActionInitEvent; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java index d53857c..4c49ab3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java @@ -39,6 +39,7 @@ import org.easymock.EasyMock; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import com.google.inject.Binder; import com.google.inject.Guice; @@ -48,7 +49,6 @@ import com.google.inject.persist.PersistService; import com.google.inject.util.Modules; import junit.framework.Assert; -import org.junit.experimental.categories.Category; /** * Tests the {@link AlertAggregateListener}. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionEqualityTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionEqualityTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionEqualityTest.java index 1a914cd..8a08460 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionEqualityTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionEqualityTest.java @@ -17,8 +17,6 @@ */ package org.apache.ambari.server.state.alerts; -import junit.framework.TestCase; - import org.apache.ambari.server.state.AlertState; import org.apache.ambari.server.state.alert.AggregateSource; import org.apache.ambari.server.state.alert.AlertDefinition; @@ -34,6 +32,8 @@ import org.apache.ambari.server.state.alert.SourceType; import org.junit.Test; import org.junit.experimental.categories.Category; +import junit.framework.TestCase; + /** * Tests equality of {@link AlertDefinition} for hashing and merging purposes. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java index 7a24966..4c20de4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java @@ -31,8 +31,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import junit.framework.TestCase; - import org.apache.ambari.server.agent.ActionQueue; import org.apache.ambari.server.agent.AlertDefinitionCommand; import org.apache.ambari.server.agent.AlertExecutionCommand; @@ -56,13 +54,15 @@ import org.easymock.EasyMock; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.util.Modules; -import org.junit.experimental.categories.Category; + +import junit.framework.TestCase; /** * Tests for {@link AlertDefinitionHash}. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersImplTest.java index 8d83889..ce95b49 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersImplTest.java @@ -18,18 +18,18 @@ package org.apache.ambari.server.state.cluster; -import org.apache.ambari.server.state.Cluster; -import org.junit.Test; - -import java.util.HashMap; -import java.util.Map; - import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createMockBuilder; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.ambari.server.state.Cluster; +import org.junit.Test; public class ClustersImplTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosComponentDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosComponentDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosComponentDescriptorTest.java index 814e010..f1d2a59 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosComponentDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosComponentDescriptorTest.java @@ -17,13 +17,6 @@ */ package org.apache.ambari.server.state.kerberos; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import junit.framework.Assert; -import org.apache.ambari.server.AmbariException; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -33,6 +26,15 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.ambari.server.AmbariException; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import junit.framework.Assert; + @Category({ category.KerberosTest.class}) public class KerberosComponentDescriptorTest { public static final String JSON_VALUE = http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosConfigurationDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosConfigurationDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosConfigurationDescriptorTest.java index 47c4f19..c35222c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosConfigurationDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosConfigurationDescriptorTest.java @@ -17,14 +17,20 @@ */ package org.apache.ambari.server.state.kerberos; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import junit.framework.Assert; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + import org.apache.ambari.server.AmbariException; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.*; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import junit.framework.Assert; @Category({ category.KerberosTest.class}) public class KerberosConfigurationDescriptorTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java index 9e21742..0031be7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorTest.java @@ -17,12 +17,6 @@ */ package org.apache.ambari.server.state.kerberos; -import com.google.gson.*; -import junit.framework.Assert; -import org.apache.ambari.server.AmbariException; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import java.io.File; import java.io.IOException; import java.net.URL; @@ -35,6 +29,14 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.ambari.server.AmbariException; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.google.gson.Gson; + +import junit.framework.Assert; + @Category({ category.KerberosTest.class}) public class KerberosDescriptorTest { private static final KerberosDescriptorFactory KERBEROS_DESCRIPTOR_FACTORY = new KerberosDescriptorFactory(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java index 3f347dc..5c2e74e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java @@ -18,12 +18,15 @@ package org.apache.ambari.server.state.kerberos; -import com.google.gson.Gson; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.assistedinject.FactoryModuleBuilder; -import junit.framework.Assert; +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.expect; + +import java.util.Collections; +import java.util.Properties; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; @@ -40,13 +43,13 @@ import org.easymock.EasyMockSupport; import org.junit.Test; import org.junit.experimental.categories.Category; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import java.util.Collections; -import java.util.Properties; +import com.google.gson.Gson; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.assistedinject.FactoryModuleBuilder; -import static org.easymock.EasyMock.anyString; -import static org.easymock.EasyMock.expect; +import junit.framework.Assert; @Category({ category.KerberosTest.class}) public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptorTest.java index dbf090e..bc7aec0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptorTest.java @@ -17,18 +17,20 @@ */ package org.apache.ambari.server.state.kerberos; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import junit.framework.Assert; -import org.apache.ambari.server.AmbariException; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.TreeMap; +import org.apache.ambari.server.AmbariException; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import junit.framework.Assert; + @Category({ category.KerberosTest.class}) public class KerberosIdentityDescriptorTest { public static final String JSON_VALUE = http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosKeytabDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosKeytabDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosKeytabDescriptorTest.java index 5c82662..5bdf5ed 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosKeytabDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosKeytabDescriptorTest.java @@ -17,15 +17,17 @@ */ package org.apache.ambari.server.state.kerberos; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import junit.framework.Assert; +import java.util.Map; +import java.util.TreeMap; + import org.apache.ambari.server.AmbariException; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.Map; -import java.util.TreeMap; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import junit.framework.Assert; @Category({ category.KerberosTest.class}) public class KerberosKeytabDescriptorTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosPrincipalDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosPrincipalDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosPrincipalDescriptorTest.java index 54f5c3f..ffef001 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosPrincipalDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosPrincipalDescriptorTest.java @@ -17,14 +17,17 @@ */ package org.apache.ambari.server.state.kerberos; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import junit.framework.Assert; +import java.util.Map; +import java.util.TreeMap; + import org.apache.ambari.server.AmbariException; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.*; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import junit.framework.Assert; @Category({ category.KerberosTest.class}) public class KerberosPrincipalDescriptorTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosServiceDescriptorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosServiceDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosServiceDescriptorTest.java index fb341ca..3bc5dcd 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosServiceDescriptorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosServiceDescriptorTest.java @@ -17,12 +17,6 @@ */ package org.apache.ambari.server.state.kerberos; -import com.google.gson.Gson; -import junit.framework.Assert; -import org.apache.ambari.server.AmbariException; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import java.io.File; import java.io.IOException; import java.net.URL; @@ -35,6 +29,14 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.ambari.server.AmbariException; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import com.google.gson.Gson; + +import junit.framework.Assert; + @Category({ category.KerberosTest.class}) public class KerberosServiceDescriptorTest { public static final String JSON_VALUE = http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/VariableReplacementHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/VariableReplacementHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/VariableReplacementHelperTest.java index 90f7022..8454ef4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/VariableReplacementHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/VariableReplacementHelperTest.java @@ -18,13 +18,14 @@ package org.apache.ambari.server.state.kerberos; -import junit.framework.Assert; +import java.util.HashMap; +import java.util.Map; + import org.apache.ambari.server.AmbariException; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.HashMap; -import java.util.Map; +import junit.framework.Assert; @Category({ category.KerberosTest.class}) public class VariableReplacementHelperTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java index 76ad2f8..0d0e03c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java @@ -18,18 +18,6 @@ package org.apache.ambari.server.state.scheduler; -import org.apache.ambari.server.actionmanager.HostRoleStatus; -import org.apache.ambari.server.scheduler.ExecutionScheduleManager; -import org.easymock.Capture; -import org.junit.Assert; -import org.junit.Test; -import org.quartz.JobDataMap; -import org.quartz.JobDetail; -import org.quartz.JobExecutionContext; -import org.quartz.JobKey; -import org.quartz.Trigger; -import java.util.HashMap; -import java.util.Map; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.captureLong; @@ -42,6 +30,20 @@ import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; +import java.util.HashMap; +import java.util.Map; + +import org.apache.ambari.server.actionmanager.HostRoleStatus; +import org.apache.ambari.server.scheduler.ExecutionScheduleManager; +import org.easymock.Capture; +import org.junit.Assert; +import org.junit.Test; +import org.quartz.JobDataMap; +import org.quartz.JobDetail; +import org.quartz.JobExecutionContext; +import org.quartz.JobKey; +import org.quartz.Trigger; + public class BatchRequestJobTest { @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java index 2fb57d7..7dd9932 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java @@ -17,8 +17,11 @@ */ package org.apache.ambari.server.state.services; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.Role; import org.apache.ambari.server.RoleCommand; @@ -48,10 +51,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * Tests {@link org.apache.ambari.server.state.services.RetryUpgradeActionService}. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java index 27ee146..52603d0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java @@ -17,29 +17,28 @@ */ package org.apache.ambari.server.state.stack; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.PersistService; +import static org.apache.ambari.server.state.stack.ConfigUpgradePack.AffectedComponent; +import static org.apache.ambari.server.state.stack.ConfigUpgradePack.AffectedService; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Map; + import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; -import org.apache.ambari.server.state.stack.upgrade.*; -import org.apache.ambari.server.state.stack.upgrade.ClusterGrouping.ExecuteStage; +import org.apache.ambari.server.state.stack.upgrade.ConfigUpgradeChangeDefinition; +import org.apache.ambari.server.state.stack.upgrade.TransferOperation; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import static org.apache.ambari.server.state.stack.ConfigUpgradePack.AffectedService; -import static org.apache.ambari.server.state.stack.ConfigUpgradePack.AffectedComponent; -import static org.junit.Assert.*; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.persist.PersistService; /** * Tests for the config upgrade pack http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java index ba41687..99de92d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java @@ -18,17 +18,22 @@ package org.apache.ambari.server.state.stack; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import junit.framework.Assert; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.lang.reflect.Method; -import java.util.*; +import com.google.inject.Guice; +import com.google.inject.Injector; + +import junit.framework.Assert; @Category({ category.StackUpgradeTest.class}) http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java index 437cc42..00b8df4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java @@ -20,8 +20,6 @@ package org.apache.ambari.server.state.stack.upgrade; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; - import org.apache.ambari.server.state.RepositoryInfo; import org.junit.Before; import org.junit.Test; @@ -31,6 +29,8 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; +import junit.framework.Assert; + /** * Tests the {@link RepositoryVersionHelper} class */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java b/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java index 05a75b3..84f0277 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/testing/DBInconsistencyTests.java @@ -17,10 +17,12 @@ */ package org.apache.ambari.server.testing; -import com.google.inject.Guice; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.persist.PersistService; +import java.util.Collection; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.EntityTransaction; + import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.OrmTestHelper; @@ -46,10 +48,10 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import java.util.Collection; -import java.util.List; +import com.google.inject.Guice; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.persist.PersistService; public class DBInconsistencyTests { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockWarningThread.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockWarningThread.java b/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockWarningThread.java index a184899..e24dacb 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockWarningThread.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockWarningThread.java @@ -16,8 +16,6 @@ */ package org.apache.ambari.server.testing; -import org.apache.commons.lang.ArrayUtils; - import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; @@ -26,6 +24,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.apache.commons.lang.ArrayUtils; + /** * * Monitoring of deadlocks thread http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockedThreadsTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockedThreadsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockedThreadsTest.java index 6ce3acc..0e99db5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockedThreadsTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockedThreadsTest.java @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; + import org.junit.Assert; -import org.junit.Test; /** *
