http://git-wip-us.apache.org/repos/asf/hadoop/blob/62ceedf2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/providers/TestProviderFactory.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/providers/TestProviderFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/providers/TestProviderFactory.java index 11abdfe..e58d981 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/providers/TestProviderFactory.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/providers/TestProviderFactory.java @@ -18,11 +18,16 @@ package org.apache.slider.providers; -import org.apache.slider.providers.docker.DockerKeys; +import org.apache.slider.api.resource.Artifact; +import org.apache.slider.api.resource.Artifact.TypeEnum; +import org.apache.slider.providers.docker.DockerClientProvider; import org.apache.slider.providers.docker.DockerProviderFactory; +import org.apache.slider.providers.docker.DockerProviderService; +import org.apache.slider.providers.tarball.TarballClientProvider; +import org.apache.slider.providers.tarball.TarballProviderFactory; +import org.apache.slider.providers.tarball.TarballProviderService; import org.junit.Test; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** @@ -30,25 +35,38 @@ import static org.junit.Assert.assertTrue; */ public class TestProviderFactory { @Test - public void testLoadAgentProvider() throws Throwable { + public void testDockerFactory() throws Throwable { SliderProviderFactory factory = SliderProviderFactory - .createSliderProviderFactory(DockerKeys.PROVIDER_DOCKER); + .createSliderProviderFactory(new Artifact().type(TypeEnum.DOCKER)); assertTrue(factory instanceof DockerProviderFactory); + assertTrue(factory.createClientProvider() instanceof DockerClientProvider); + assertTrue(factory.createServerProvider() instanceof DockerProviderService); + assertTrue(SliderProviderFactory.getProviderService(new Artifact() + .type(TypeEnum.DOCKER)) instanceof DockerProviderService); } @Test - public void testCreateClientProvider() throws Throwable { + public void testTarballFactory() throws Throwable { SliderProviderFactory factory = SliderProviderFactory - .createSliderProviderFactory(DockerKeys.PROVIDER_DOCKER); - assertNotNull(factory.createClientProvider()); + .createSliderProviderFactory(new Artifact().type(TypeEnum.TARBALL)); + assertTrue(factory instanceof TarballProviderFactory); + assertTrue(factory.createClientProvider() instanceof TarballClientProvider); + assertTrue(factory.createServerProvider() instanceof + TarballProviderService); + assertTrue(SliderProviderFactory.getProviderService(new Artifact() + .type(TypeEnum.TARBALL)) instanceof TarballProviderService); } @Test - public void testCreateProviderByClassname() throws Throwable { + public void testDefaultFactory() throws Throwable { SliderProviderFactory factory = SliderProviderFactory - .createSliderProviderFactory(DockerKeys.PROVIDER_DOCKER); - assertNotNull(factory.createServerProvider()); - assertTrue(factory instanceof DockerProviderFactory); + .createSliderProviderFactory(null); + assertTrue(factory instanceof DefaultProviderFactory); + assertTrue(factory.createClientProvider() instanceof DefaultClientProvider); + assertTrue(factory.createServerProvider() instanceof + DefaultProviderService); + assertTrue(SliderProviderFactory.getProviderService(null) instanceof + DefaultProviderService); } }
http://git-wip-us.apache.org/repos/asf/hadoop/blob/62ceedf2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestClusterSpecificationBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestClusterSpecificationBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestClusterSpecificationBlock.java index e4e344e..bc6cfd0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestClusterSpecificationBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestClusterSpecificationBlock.java @@ -20,9 +20,7 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.slider.providers.ProviderService; import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest; -import org.apache.slider.server.appmaster.model.mock.MockProviderService; import org.apache.slider.server.appmaster.state.ProviderAppState; import org.apache.slider.server.appmaster.web.WebAppApi; import org.apache.slider.server.appmaster.web.WebAppApiImpl; @@ -45,11 +43,9 @@ public class TestClusterSpecificationBlock extends BaseMockAppStateTest { ProviderAppState providerAppState = new ProviderAppState( "undefined", appState); - ProviderService providerService = new MockProviderService(); WebAppApiImpl inst = new WebAppApiImpl( providerAppState, - providerService, null, null, null); http://git-wip-us.apache.org/repos/asf/hadoop/blob/62ceedf2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestContainerStatsBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestContainerStatsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestContainerStatsBlock.java index 92f8559..33385db 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestContainerStatsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestContainerStatsBlock.java @@ -27,12 +27,10 @@ import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TR; import org.apache.hadoop.yarn.webapp.hamlet.HamletImpl.EImp; import org.apache.slider.api.ClusterNode; -import org.apache.slider.providers.ProviderService; import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest; import org.apache.slider.server.appmaster.model.mock.MockContainer; import org.apache.slider.server.appmaster.model.mock.MockContainerId; import org.apache.slider.server.appmaster.model.mock.MockNodeId; -import org.apache.slider.server.appmaster.model.mock.MockProviderService; import org.apache.slider.server.appmaster.model.mock.MockResource; import org.apache.slider.server.appmaster.state.ProviderAppState; import org.apache.slider.server.appmaster.state.RoleInstance; @@ -65,14 +63,12 @@ public class TestContainerStatsBlock extends BaseMockAppStateTest { @Before public void setup() throws Exception { super.setup(); - ProviderService providerService = new MockProviderService(); ProviderAppState providerAppState = new ProviderAppState( "undefined", appState); WebAppApiImpl inst = new WebAppApiImpl( providerAppState, - providerService, null, METRICS, null); http://git-wip-us.apache.org/repos/asf/hadoop/blob/62ceedf2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestIndexBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestIndexBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestIndexBlock.java index 96eb3d7..b2d0637 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestIndexBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/test/java/org/apache/slider/server/appmaster/web/view/TestIndexBlock.java @@ -22,12 +22,10 @@ import com.google.inject.Injector; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.slider.providers.ProviderService; import org.apache.slider.server.appmaster.model.appstate.BaseMockAppStateAATest; import org.apache.slider.server.appmaster.model.mock.MockContainer; import org.apache.slider.server.appmaster.model.mock.MockContainerId; import org.apache.slider.server.appmaster.model.mock.MockNodeId; -import org.apache.slider.server.appmaster.model.mock.MockProviderService; import org.apache.slider.server.appmaster.model.mock.MockResource; import org.apache.slider.server.appmaster.state.ContainerOutcome; import org.apache.slider.server.appmaster.state.OutstandingRequest; @@ -58,14 +56,12 @@ public class TestIndexBlock extends BaseMockAppStateAATest { public void setup() throws Exception { super.setup(); assertNotNull(appState); - ProviderService providerService = new MockProviderService(); ProviderAppState providerAppState = new ProviderAppState( "undefined", appState); WebAppApiImpl inst = new WebAppApiImpl( providerAppState, - providerService, null, METRICS, null); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
