Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 61BCC104A3 for ; Tue, 31 Dec 2013 21:28:57 +0000 (UTC) Received: (qmail 64701 invoked by uid 500); 31 Dec 2013 21:28:57 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 64677 invoked by uid 500); 31 Dec 2013 21:28:57 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 64670 invoked by uid 99); 31 Dec 2013 21:28:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Dec 2013 21:28:57 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 31 Dec 2013 21:28:25 +0000 Received: (qmail 62704 invoked by uid 99); 31 Dec 2013 21:28:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Dec 2013 21:28:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 62A6B90CDD3; Tue, 31 Dec 2013 21:28:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.incubator.apache.org Date: Tue, 31 Dec 2013 21:28:04 -0000 Message-Id: <5b01f870853b4cdf9dcfd46b3c06c58b@git.apache.org> In-Reply-To: <41d47f2c7b444bee81fe9e078636408a@git.apache.org> References: <41d47f2c7b444bee81fe9e078636408a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/9] Refactors java and python code to the Apache namespace. X-Virus-Checked: Checked by ClamAV on apache.org http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java b/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java index 3e46d40..75aba2e 100644 --- a/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/filter/SchedulingFilterImplTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.filter; +package org.apache.aurora.scheduler.filter; import java.util.Arrays; import java.util.Set; @@ -23,54 +23,57 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.twitter.common.quantity.Amount; +import com.twitter.common.quantity.Data; +import com.twitter.common.testing.easymock.EasyMockTest; + +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Attribute; +import org.apache.aurora.gen.Constraint; +import org.apache.aurora.gen.ExecutorConfig; +import org.apache.aurora.gen.HostAttributes; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.LimitConstraint; +import org.apache.aurora.gen.MaintenanceMode; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.TaskConstraint; +import org.apache.aurora.gen.ValueConstraint; +import org.apache.aurora.scheduler.ResourceSlot; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.configuration.ConfigurationManager; +import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto; +import org.apache.aurora.scheduler.state.MaintenanceController; +import org.apache.aurora.scheduler.storage.AttributeStore; +import org.apache.aurora.scheduler.storage.Storage; +import org.apache.aurora.scheduler.storage.Storage.StoreProvider; +import org.apache.aurora.scheduler.storage.Storage.Work.Quiet; +import org.apache.aurora.scheduler.storage.TaskStore; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.entities.ITaskConfig; + import org.easymock.EasyMock; import org.easymock.IAnswer; import org.easymock.IExpectationSetters; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Attribute; -import com.twitter.aurora.gen.Constraint; -import com.twitter.aurora.gen.ExecutorConfig; -import com.twitter.aurora.gen.HostAttributes; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.LimitConstraint; -import com.twitter.aurora.gen.MaintenanceMode; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.TaskConstraint; -import com.twitter.aurora.gen.ValueConstraint; -import com.twitter.aurora.scheduler.ResourceSlot; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.configuration.ConfigurationManager; -import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto; -import com.twitter.aurora.scheduler.state.MaintenanceController; -import com.twitter.aurora.scheduler.storage.AttributeStore; -import com.twitter.aurora.scheduler.storage.Storage; -import com.twitter.aurora.scheduler.storage.Storage.StoreProvider; -import com.twitter.aurora.scheduler.storage.Storage.Work.Quiet; -import com.twitter.aurora.scheduler.storage.TaskStore; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.entities.ITaskConfig; -import com.twitter.common.quantity.Amount; -import com.twitter.common.quantity.Data; -import com.twitter.common.testing.easymock.EasyMockTest; +import static org.apache.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE; +import static org.apache.aurora.scheduler.filter.ConstraintFilter.limitVeto; +import static org.apache.aurora.scheduler.filter.ConstraintFilter.mismatchVeto; +import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.DEDICATED_HOST_VETO; +import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.CPU; +import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.DISK; +import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.PORTS; +import static org.apache.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.RAM; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.expect; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE; -import static com.twitter.aurora.scheduler.filter.ConstraintFilter.limitVeto; -import static com.twitter.aurora.scheduler.filter.ConstraintFilter.mismatchVeto; -import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.DEDICATED_HOST_VETO; -import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.CPU; -import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.DISK; -import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.PORTS; -import static com.twitter.aurora.scheduler.filter.SchedulingFilterImpl.ResourceVector.RAM; - public class SchedulingFilterImplTest extends EasyMockTest { private static final String TASK_ID = "taskId"; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java b/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java index 6bbe927..a859be6 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java +++ b/src/test/java/org/apache/aurora/scheduler/http/LeaderRedirectTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.http; +package org.apache.aurora.scheduler.http; import java.util.Arrays; import java.util.Set; @@ -26,11 +26,6 @@ import com.google.common.collect.Iterables; import com.google.common.net.HostAndPort; import com.google.inject.util.Providers; -import org.easymock.Capture; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - import com.twitter.common.application.ShutdownRegistry.ShutdownRegistryImpl; import com.twitter.common.application.modules.LifecycleModule.ServiceRunner; import com.twitter.common.application.modules.LocalServiceRegistry; @@ -43,12 +38,18 @@ import com.twitter.common.testing.easymock.EasyMockTest; import com.twitter.thrift.Endpoint; import com.twitter.thrift.ServiceInstance; +import org.easymock.Capture; + +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import static org.apache.aurora.scheduler.http.LeaderRedirect.HTTP_PORT_NAME; + import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; -import static com.twitter.aurora.scheduler.http.LeaderRedirect.HTTP_PORT_NAME; - public class LeaderRedirectTest extends EasyMockTest { private static final int HTTP_PORT = 500; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java b/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java index d030705..e5de63c 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java +++ b/src/test/java/org/apache/aurora/scheduler/http/MnameTest.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.http; +package org.apache.aurora.scheduler.http; import java.util.Map; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; -import org.junit.Test; +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.scheduler.storage.entities.IAssignedTask; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.scheduler.storage.entities.IAssignedTask; +import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java b/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java index eb0c48a..5ea9dc4 100644 --- a/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java +++ b/src/test/java/org/apache/aurora/scheduler/http/SchedulerzRoleTest.java @@ -1,4 +1,4 @@ -package com.twitter.aurora.scheduler.http; +package org.apache.aurora.scheduler.http; import java.util.Collections; import java.util.List; @@ -6,22 +6,22 @@ import java.util.List; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.TaskEvent; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; + import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.TaskEvent; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; +import static org.apache.aurora.gen.ScheduleStatus.FINISHED; +import static org.apache.aurora.gen.ScheduleStatus.RUNNING; +import static org.apache.aurora.scheduler.http.SchedulerzRole.getFreshestTask; import static org.junit.Assert.assertEquals; -import static com.twitter.aurora.gen.ScheduleStatus.FINISHED; -import static com.twitter.aurora.gen.ScheduleStatus.RUNNING; -import static com.twitter.aurora.scheduler.http.SchedulerzRole.getFreshestTask; - public class SchedulerzRoleTest { @Test http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java b/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java index 2b3a47d..560efcc 100644 --- a/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java +++ b/src/test/java/org/apache/aurora/scheduler/log/mesos/MesosLogTest.java @@ -1,4 +1,4 @@ -package com.twitter.aurora.scheduler.log.mesos; +package org.apache.aurora.scheduler.log.mesos; import java.util.concurrent.TimeoutException; @@ -6,18 +6,21 @@ import javax.inject.Provider; import com.google.inject.util.Providers; +import com.twitter.common.quantity.Amount; +import com.twitter.common.quantity.Time; +import com.twitter.common.testing.easymock.EasyMockTest; + +import org.apache.aurora.scheduler.log.Log.Stream.StreamAccessException; +import org.apache.aurora.scheduler.log.mesos.LogInterface.ReaderInterface; +import org.apache.aurora.scheduler.log.mesos.LogInterface.WriterInterface; + import org.apache.mesos.Log; + import org.easymock.EasyMock; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.scheduler.log.Log.Stream.StreamAccessException; -import com.twitter.aurora.scheduler.log.mesos.LogInterface.ReaderInterface; -import com.twitter.aurora.scheduler.log.mesos.LogInterface.WriterInterface; -import com.twitter.common.quantity.Amount; -import com.twitter.common.quantity.Time; -import com.twitter.common.testing.easymock.EasyMockTest; - import static org.easymock.EasyMock.expect; public class MesosLogTest extends EasyMockTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java b/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java index 40eafd8..8d49a76 100644 --- a/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java +++ b/src/test/java/org/apache/aurora/scheduler/log/testing/FileLogTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.log.testing; +package org.apache.aurora.scheduler.log.testing; import java.io.File; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java b/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java index 9125658..c8193bd 100644 --- a/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java +++ b/src/test/java/org/apache/aurora/scheduler/metadata/NearestFitTest.java @@ -13,27 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.metadata; +package org.apache.aurora.scheduler.metadata; import java.util.Set; import com.google.common.collect.ImmutableSet; -import org.junit.Before; -import org.junit.Test; - -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange; -import com.twitter.aurora.scheduler.events.PubsubEvent.TasksDeleted; -import com.twitter.aurora.scheduler.events.PubsubEvent.Vetoed; -import com.twitter.aurora.scheduler.filter.SchedulingFilter.Veto; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; import com.twitter.common.quantity.Amount; import com.twitter.common.quantity.Time; import com.twitter.common.util.testing.FakeTicker; +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange; +import org.apache.aurora.scheduler.events.PubsubEvent.TasksDeleted; +import org.apache.aurora.scheduler.events.PubsubEvent.Vetoed; +import org.apache.aurora.scheduler.filter.SchedulingFilter.Veto; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; + +import org.junit.Before; +import org.junit.Test; + import static org.junit.Assert.assertEquals; public class NearestFitTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java b/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java index 6124c7a..708da80 100644 --- a/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java +++ b/src/test/java/org/apache/aurora/scheduler/periodic/GcExecutorLauncherTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.periodic; +package org.apache.aurora.scheduler.periodic; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -22,6 +22,26 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; +import com.twitter.common.quantity.Amount; +import com.twitter.common.quantity.Time; +import com.twitter.common.testing.easymock.EasyMockTest; +import com.twitter.common.util.testing.FakeClock; + +import org.apache.aurora.codec.ThriftBinaryCodec; +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.ExecutorConfig; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.comm.AdjustRetainedTasks; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.base.Tasks; +import org.apache.aurora.scheduler.configuration.Resources; +import org.apache.aurora.scheduler.periodic.GcExecutorLauncher.GcExecutorSettings; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; + import org.apache.mesos.Protos.ExecutorInfo; import org.apache.mesos.Protos.FrameworkID; import org.apache.mesos.Protos.Offer; @@ -29,27 +49,11 @@ import org.apache.mesos.Protos.OfferID; import org.apache.mesos.Protos.Resource; import org.apache.mesos.Protos.SlaveID; import org.apache.mesos.Protos.TaskInfo; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.codec.ThriftBinaryCodec; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.ExecutorConfig; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.comm.AdjustRetainedTasks; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.base.Tasks; -import com.twitter.aurora.scheduler.configuration.Resources; -import com.twitter.aurora.scheduler.periodic.GcExecutorLauncher.GcExecutorSettings; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil; -import com.twitter.common.quantity.Amount; -import com.twitter.common.quantity.Time; -import com.twitter.common.testing.easymock.EasyMockTest; -import com.twitter.common.util.testing.FakeClock; +import static org.apache.aurora.gen.ScheduleStatus.FAILED; import static org.easymock.EasyMock.expect; @@ -58,8 +62,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static com.twitter.aurora.gen.ScheduleStatus.FAILED; - public class GcExecutorLauncherTest extends EasyMockTest { private static final String HOST = "slave-host"; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java b/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java index f40764b..86d3541 100644 --- a/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java +++ b/src/test/java/org/apache/aurora/scheduler/quota/QuotaComparisonResultTest.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.quota; +package org.apache.aurora.scheduler.quota; + +import org.apache.aurora.gen.Quota; +import org.apache.aurora.scheduler.storage.entities.IQuota; import org.junit.Test; -import com.twitter.aurora.gen.Quota; -import com.twitter.aurora.scheduler.storage.entities.IQuota; +import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA; +import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA; -import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA; - public class QuotaComparisonResultTest { @Test http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java b/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java index f980bef..3f27e38 100644 --- a/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java +++ b/src/test/java/org/apache/aurora/scheduler/quota/QuotaFilterTest.java @@ -13,35 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.quota; +package org.apache.aurora.scheduler.quota; + +import com.twitter.common.testing.easymock.EasyMockTest; + +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.JobConfiguration; +import org.apache.aurora.gen.Quota; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.scheduler.base.JobKeys; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl; +import org.apache.aurora.scheduler.storage.entities.IJobConfiguration; +import org.apache.aurora.scheduler.storage.entities.IJobKey; +import org.apache.aurora.scheduler.storage.entities.IQuota; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.entities.ITaskConfig; +import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.JobConfiguration; -import com.twitter.aurora.gen.Quota; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.scheduler.base.JobKeys; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl; -import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration; -import com.twitter.aurora.scheduler.storage.entities.IJobKey; -import com.twitter.aurora.scheduler.storage.entities.IQuota; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.entities.ITaskConfig; -import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil; -import com.twitter.common.testing.easymock.EasyMockTest; +import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA; +import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA; import static org.easymock.EasyMock.expect; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA; -import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA; - public class QuotaFilterTest extends EasyMockTest { private static final int DEFAULT_TASKS_IN_QUOTA = 10; private static final String ROLE = "test"; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java index 0a72eaf..0812353 100644 --- a/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/quota/QuotaManagerImplTest.java @@ -13,34 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.quota; +package org.apache.aurora.scheduler.quota; import com.google.common.base.Optional; +import com.twitter.common.testing.easymock.EasyMockTest; + +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.Quota; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl; +import org.apache.aurora.scheduler.storage.entities.IQuota; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; + import org.easymock.IExpectationSetters; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.Quota; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.quota.QuotaManager.QuotaManagerImpl; -import com.twitter.aurora.scheduler.storage.entities.IQuota; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil; -import com.twitter.common.testing.easymock.EasyMockTest; +import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA; +import static org.apache.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA; import static org.easymock.EasyMock.expect; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.INSUFFICIENT_QUOTA; -import static com.twitter.aurora.scheduler.quota.QuotaComparisonResult.Result.SUFFICIENT_QUOTA; - public class QuotaManagerImplTest extends EasyMockTest { private static final String ROLE = "foo"; private static final Query.Builder ACTIVE_QUERY = Query.roleScoped(ROLE).active(); http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java index 3e4a502..11f153b 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/BaseSchedulerCoreImplTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.state; +package org.apache.aurora.scheduler.state; import java.net.InetAddress; import java.net.UnknownHostException; @@ -39,78 +39,82 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Range; import com.google.common.collect.Sets; -import org.apache.mesos.Protos.SlaveID; -import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; - -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Constraint; -import com.twitter.aurora.gen.CronCollisionPolicy; -import com.twitter.aurora.gen.ExecutorConfig; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.JobConfiguration; -import com.twitter.aurora.gen.JobKey; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.TaskConstraint; -import com.twitter.aurora.gen.TaskEvent; -import com.twitter.aurora.gen.TaskQuery; -import com.twitter.aurora.gen.ValueConstraint; -import com.twitter.aurora.scheduler.Driver; -import com.twitter.aurora.scheduler.TaskIdGenerator; -import com.twitter.aurora.scheduler.base.JobKeys; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.base.ScheduleException; -import com.twitter.aurora.scheduler.base.Tasks; -import com.twitter.aurora.scheduler.configuration.ConfigurationManager; -import com.twitter.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException; -import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration; -import com.twitter.aurora.scheduler.cron.CronScheduler; -import com.twitter.aurora.scheduler.events.PubsubEvent; -import com.twitter.aurora.scheduler.state.JobFilter.JobFilterResult; -import com.twitter.aurora.scheduler.storage.Storage; -import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider; -import com.twitter.aurora.scheduler.storage.Storage.MutateWork; -import com.twitter.aurora.scheduler.storage.StorageBackfill; -import com.twitter.aurora.scheduler.storage.entities.IAssignedTask; -import com.twitter.aurora.scheduler.storage.entities.IIdentity; -import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration; -import com.twitter.aurora.scheduler.storage.entities.IJobKey; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.entities.ITaskConfig; -import com.twitter.aurora.scheduler.storage.entities.ITaskEvent; import com.twitter.common.application.ShutdownRegistry; import com.twitter.common.base.Closure; import com.twitter.common.collections.Pair; import com.twitter.common.testing.easymock.EasyMockTest; import com.twitter.common.util.testing.FakeClock; +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Constraint; +import org.apache.aurora.gen.CronCollisionPolicy; +import org.apache.aurora.gen.ExecutorConfig; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.JobConfiguration; +import org.apache.aurora.gen.JobKey; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.TaskConstraint; +import org.apache.aurora.gen.TaskEvent; +import org.apache.aurora.gen.TaskQuery; +import org.apache.aurora.gen.ValueConstraint; +import org.apache.aurora.scheduler.Driver; +import org.apache.aurora.scheduler.TaskIdGenerator; +import org.apache.aurora.scheduler.base.JobKeys; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.base.ScheduleException; +import org.apache.aurora.scheduler.base.Tasks; +import org.apache.aurora.scheduler.configuration.ConfigurationManager; +import org.apache.aurora.scheduler.configuration.ConfigurationManager.TaskDescriptionException; +import org.apache.aurora.scheduler.configuration.SanitizedConfiguration; +import org.apache.aurora.scheduler.cron.CronScheduler; +import org.apache.aurora.scheduler.events.PubsubEvent; +import org.apache.aurora.scheduler.state.JobFilter.JobFilterResult; +import org.apache.aurora.scheduler.storage.Storage; +import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider; +import org.apache.aurora.scheduler.storage.Storage.MutateWork; +import org.apache.aurora.scheduler.storage.StorageBackfill; +import org.apache.aurora.scheduler.storage.entities.IAssignedTask; +import org.apache.aurora.scheduler.storage.entities.IIdentity; +import org.apache.aurora.scheduler.storage.entities.IJobConfiguration; +import org.apache.aurora.scheduler.storage.entities.IJobKey; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.entities.ITaskConfig; +import org.apache.aurora.scheduler.storage.entities.ITaskEvent; + +import org.apache.mesos.Protos.SlaveID; + +import org.easymock.EasyMock; + +import org.junit.Before; +import org.junit.Test; + +import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED; +import static org.apache.aurora.gen.ScheduleStatus.FAILED; +import static org.apache.aurora.gen.ScheduleStatus.FINISHED; +import static org.apache.aurora.gen.ScheduleStatus.KILLED; +import static org.apache.aurora.gen.ScheduleStatus.KILLING; +import static org.apache.aurora.gen.ScheduleStatus.LOST; +import static org.apache.aurora.gen.ScheduleStatus.PENDING; +import static org.apache.aurora.gen.ScheduleStatus.RESTARTING; +import static org.apache.aurora.gen.ScheduleStatus.RUNNING; +import static org.apache.aurora.gen.ScheduleStatus.STARTING; +import static org.apache.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE; +import static org.apache.aurora.scheduler.configuration.ConfigurationManager.hostLimitConstraint; +import static org.apache.aurora.scheduler.configuration.ConfigurationManager.validateAndPopulate; + import static org.easymock.EasyMock.anyInt; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED; -import static com.twitter.aurora.gen.ScheduleStatus.FAILED; -import static com.twitter.aurora.gen.ScheduleStatus.FINISHED; -import static com.twitter.aurora.gen.ScheduleStatus.KILLED; -import static com.twitter.aurora.gen.ScheduleStatus.KILLING; -import static com.twitter.aurora.gen.ScheduleStatus.LOST; -import static com.twitter.aurora.gen.ScheduleStatus.PENDING; -import static com.twitter.aurora.gen.ScheduleStatus.RESTARTING; -import static com.twitter.aurora.gen.ScheduleStatus.RUNNING; -import static com.twitter.aurora.gen.ScheduleStatus.STARTING; -import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.DEDICATED_ATTRIBUTE; -import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.hostLimitConstraint; -import static com.twitter.aurora.scheduler.configuration.ConfigurationManager.validateAndPopulate; - /** * Base integration test for the SchedulerCoreImpl, subclasses should supply a concrete Storage * system. http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java b/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java index b88ccff..229948e 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/CronJobManagerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.state; +package org.apache.aurora.scheduler.state; import java.util.Map; import java.util.concurrent.Executor; @@ -25,45 +25,48 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; +import com.twitter.common.application.ShutdownRegistry; +import com.twitter.common.base.Closure; +import com.twitter.common.base.ExceptionalCommand; +import com.twitter.common.testing.easymock.EasyMockTest; + +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.ExecutorConfig; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.JobConfiguration; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.scheduler.base.JobKeys; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.base.ScheduleException; +import org.apache.aurora.scheduler.configuration.SanitizedConfiguration; +import org.apache.aurora.scheduler.cron.CronScheduler; +import org.apache.aurora.scheduler.events.PubsubEvent; +import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted; +import org.apache.aurora.scheduler.storage.Storage; +import org.apache.aurora.scheduler.storage.entities.IJobConfiguration; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.entities.ITaskConfig; +import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; + import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.IExpectationSetters; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.ExecutorConfig; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.JobConfiguration; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.scheduler.base.JobKeys; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.base.ScheduleException; -import com.twitter.aurora.scheduler.configuration.SanitizedConfiguration; -import com.twitter.aurora.scheduler.cron.CronScheduler; -import com.twitter.aurora.scheduler.events.PubsubEvent; -import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted; -import com.twitter.aurora.scheduler.storage.Storage; -import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.entities.ITaskConfig; -import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil; -import com.twitter.common.application.ShutdownRegistry; -import com.twitter.common.base.Closure; -import com.twitter.common.base.ExceptionalCommand; -import com.twitter.common.testing.easymock.EasyMockTest; +import static org.apache.aurora.gen.CronCollisionPolicy.RUN_OVERLAP; +import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; -import static org.junit.Assert.fail; -import static com.twitter.aurora.gen.CronCollisionPolicy.RUN_OVERLAP; -import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT; +import static org.junit.Assert.fail; public class CronJobManagerTest extends EasyMockTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java index ec0c8dd..c3e47c6 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/LockManagerImplTest.java @@ -13,36 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.state; +package org.apache.aurora.scheduler.state; import java.util.UUID; import com.google.common.base.Optional; +import com.twitter.common.quantity.Amount; +import com.twitter.common.quantity.Time; +import com.twitter.common.testing.easymock.EasyMockTest; +import com.twitter.common.util.testing.FakeClock; + +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.Lock; +import org.apache.aurora.gen.LockKey; +import org.apache.aurora.scheduler.base.JobKeys; +import org.apache.aurora.scheduler.state.LockManager.LockException; +import org.apache.aurora.scheduler.storage.entities.IJobKey; +import org.apache.aurora.scheduler.storage.entities.ILock; +import org.apache.aurora.scheduler.storage.entities.ILockKey; +import org.apache.aurora.scheduler.storage.mem.MemStorage; + import org.easymock.EasyMock; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.Lock; -import com.twitter.aurora.gen.LockKey; -import com.twitter.aurora.scheduler.base.JobKeys; -import com.twitter.aurora.scheduler.state.LockManager.LockException; -import com.twitter.aurora.scheduler.storage.entities.IJobKey; -import com.twitter.aurora.scheduler.storage.entities.ILock; -import com.twitter.aurora.scheduler.storage.entities.ILockKey; -import com.twitter.aurora.scheduler.storage.mem.MemStorage; -import com.twitter.common.quantity.Amount; -import com.twitter.common.quantity.Time; -import com.twitter.common.testing.easymock.EasyMockTest; -import com.twitter.common.util.testing.FakeClock; +import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT; import static org.junit.Assert.assertEquals; -import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT; - public class LockManagerImplTest extends EasyMockTest { private static final String USER = "jim-user"; private static final Identity JIM = new Identity("jim", USER); http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java index 52cdda0..e162073 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/MaintenanceControllerImplTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.state; +package org.apache.aurora.scheduler.state; import java.util.Set; @@ -23,37 +23,39 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; +import com.twitter.common.base.Closure; +import com.twitter.common.testing.easymock.EasyMockTest; + +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.HostAttributes; +import org.apache.aurora.gen.HostStatus; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.MaintenanceMode; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.events.PubsubEvent; +import org.apache.aurora.scheduler.events.PubsubEvent.StorageStarted; +import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange; +import org.apache.aurora.scheduler.storage.Storage; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.HostAttributes; -import com.twitter.aurora.gen.HostStatus; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.MaintenanceMode; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.events.PubsubEvent; -import com.twitter.aurora.scheduler.events.PubsubEvent.StorageStarted; -import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange; -import com.twitter.aurora.scheduler.storage.Storage; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil; -import com.twitter.common.base.Closure; -import com.twitter.common.testing.easymock.EasyMockTest; +import static org.apache.aurora.gen.MaintenanceMode.DRAINED; +import static org.apache.aurora.gen.MaintenanceMode.DRAINING; +import static org.apache.aurora.gen.MaintenanceMode.NONE; +import static org.apache.aurora.gen.MaintenanceMode.SCHEDULED; +import static org.apache.aurora.gen.ScheduleStatus.FINISHED; +import static org.apache.aurora.gen.ScheduleStatus.RUNNING; +import static org.apache.aurora.scheduler.state.MaintenanceController.MaintenanceControllerImpl; import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static com.twitter.aurora.gen.MaintenanceMode.DRAINED; -import static com.twitter.aurora.gen.MaintenanceMode.DRAINING; -import static com.twitter.aurora.gen.MaintenanceMode.NONE; -import static com.twitter.aurora.gen.MaintenanceMode.SCHEDULED; -import static com.twitter.aurora.gen.ScheduleStatus.FINISHED; -import static com.twitter.aurora.gen.ScheduleStatus.RUNNING; -import static com.twitter.aurora.scheduler.state.MaintenanceController.MaintenanceControllerImpl; +import static org.junit.Assert.assertEquals; public class MaintenanceControllerImplTest extends EasyMockTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java b/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java index 25a822d..648a66f 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java +++ b/src/test/java/org/apache/aurora/scheduler/state/PubsubTestUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.state; +package org.apache.aurora.scheduler.state; import java.util.Set; @@ -22,12 +22,13 @@ import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.TypeLiteral; -import com.twitter.aurora.scheduler.events.PubsubEvent; -import com.twitter.aurora.scheduler.events.PubsubEventModule; import com.twitter.common.application.StartupStage; import com.twitter.common.base.Closure; import com.twitter.common.base.ExceptionalCommand; +import org.apache.aurora.scheduler.events.PubsubEvent; +import org.apache.aurora.scheduler.events.PubsubEventModule; + /** * A convenience utility for unit tests that which to verify pubsub wiring. * TODO(wfarner): Clean this up - make it integrate more cleanly with callers and LifecycleModule. http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java index 7de377c..5ad2658 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/StateManagerImplTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.state; +package org.apache.aurora.scheduler.state; import java.util.List; import java.util.NoSuchElementException; @@ -26,48 +26,52 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; +import com.twitter.common.base.Closure; +import com.twitter.common.testing.easymock.EasyMockTest; +import com.twitter.common.util.testing.FakeClock; + +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.TaskEvent; +import org.apache.aurora.scheduler.Driver; +import org.apache.aurora.scheduler.TaskIdGenerator; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.base.Tasks; +import org.apache.aurora.scheduler.events.PubsubEvent; +import org.apache.aurora.scheduler.events.PubsubEvent.TaskStateChange; +import org.apache.aurora.scheduler.events.PubsubEvent.TasksDeleted; +import org.apache.aurora.scheduler.storage.Storage; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.entities.ITaskConfig; +import org.apache.aurora.scheduler.storage.mem.MemStorage; + import org.apache.mesos.Protos.SlaveID; + import org.easymock.EasyMock; import org.easymock.IAnswer; import org.easymock.IArgumentMatcher; + import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.TaskEvent; -import com.twitter.aurora.scheduler.Driver; -import com.twitter.aurora.scheduler.TaskIdGenerator; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.base.Tasks; -import com.twitter.aurora.scheduler.events.PubsubEvent; -import com.twitter.aurora.scheduler.events.PubsubEvent.TaskStateChange; -import com.twitter.aurora.scheduler.events.PubsubEvent.TasksDeleted; -import com.twitter.aurora.scheduler.storage.Storage; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.entities.ITaskConfig; -import com.twitter.aurora.scheduler.storage.mem.MemStorage; -import com.twitter.common.base.Closure; -import com.twitter.common.testing.easymock.EasyMockTest; -import com.twitter.common.util.testing.FakeClock; +import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED; +import static org.apache.aurora.gen.ScheduleStatus.INIT; +import static org.apache.aurora.gen.ScheduleStatus.KILLING; +import static org.apache.aurora.gen.ScheduleStatus.PENDING; +import static org.apache.aurora.gen.ScheduleStatus.RUNNING; +import static org.apache.aurora.gen.ScheduleStatus.UNKNOWN; +import static org.apache.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED; -import static com.twitter.aurora.gen.ScheduleStatus.INIT; -import static com.twitter.aurora.gen.ScheduleStatus.KILLING; -import static com.twitter.aurora.gen.ScheduleStatus.PENDING; -import static com.twitter.aurora.gen.ScheduleStatus.RUNNING; -import static com.twitter.aurora.gen.ScheduleStatus.UNKNOWN; -import static com.twitter.aurora.gen.apiConstants.DEFAULT_ENVIRONMENT; - public class StateManagerImplTest extends EasyMockTest { private static final String HOST_A = "host_a"; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java index 4188772..2ec6dd1 100644 --- a/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java +++ b/src/test/java/org/apache/aurora/scheduler/state/TaskStateMachineTest.java @@ -13,54 +13,58 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.state; +package org.apache.aurora.scheduler.state; import java.util.Set; import com.google.common.base.Function; +import com.twitter.common.testing.easymock.EasyMockTest; +import com.twitter.common.util.testing.FakeClock; + +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.TaskEvent; +import org.apache.aurora.scheduler.base.Tasks; +import org.apache.aurora.scheduler.state.TaskStateMachine.WorkSink; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; + import org.easymock.EasyMock; import org.easymock.IExpectationSetters; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.TaskEvent; -import com.twitter.aurora.scheduler.base.Tasks; -import com.twitter.aurora.scheduler.state.TaskStateMachine.WorkSink; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.common.testing.easymock.EasyMockTest; -import com.twitter.common.util.testing.FakeClock; +import static org.apache.aurora.gen.ScheduleStatus.ASSIGNED; +import static org.apache.aurora.gen.ScheduleStatus.FAILED; +import static org.apache.aurora.gen.ScheduleStatus.FINISHED; +import static org.apache.aurora.gen.ScheduleStatus.INIT; +import static org.apache.aurora.gen.ScheduleStatus.KILLED; +import static org.apache.aurora.gen.ScheduleStatus.KILLING; +import static org.apache.aurora.gen.ScheduleStatus.LOST; +import static org.apache.aurora.gen.ScheduleStatus.PENDING; +import static org.apache.aurora.gen.ScheduleStatus.RESTARTING; +import static org.apache.aurora.gen.ScheduleStatus.RUNNING; +import static org.apache.aurora.gen.ScheduleStatus.STARTING; +import static org.apache.aurora.gen.ScheduleStatus.UNKNOWN; +import static org.apache.aurora.scheduler.state.WorkCommand.DELETE; +import static org.apache.aurora.scheduler.state.WorkCommand.INCREMENT_FAILURES; +import static org.apache.aurora.scheduler.state.WorkCommand.KILL; +import static org.apache.aurora.scheduler.state.WorkCommand.RESCHEDULE; +import static org.apache.aurora.scheduler.state.WorkCommand.UPDATE_STATE; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expectLastCall; + import static org.hamcrest.CoreMatchers.is; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static com.twitter.aurora.gen.ScheduleStatus.ASSIGNED; -import static com.twitter.aurora.gen.ScheduleStatus.FAILED; -import static com.twitter.aurora.gen.ScheduleStatus.FINISHED; -import static com.twitter.aurora.gen.ScheduleStatus.INIT; -import static com.twitter.aurora.gen.ScheduleStatus.KILLED; -import static com.twitter.aurora.gen.ScheduleStatus.KILLING; -import static com.twitter.aurora.gen.ScheduleStatus.LOST; -import static com.twitter.aurora.gen.ScheduleStatus.PENDING; -import static com.twitter.aurora.gen.ScheduleStatus.RESTARTING; -import static com.twitter.aurora.gen.ScheduleStatus.RUNNING; -import static com.twitter.aurora.gen.ScheduleStatus.STARTING; -import static com.twitter.aurora.gen.ScheduleStatus.UNKNOWN; -import static com.twitter.aurora.scheduler.state.WorkCommand.DELETE; -import static com.twitter.aurora.scheduler.state.WorkCommand.INCREMENT_FAILURES; -import static com.twitter.aurora.scheduler.state.WorkCommand.KILL; -import static com.twitter.aurora.scheduler.state.WorkCommand.RESCHEDULE; -import static com.twitter.aurora.scheduler.state.WorkCommand.UPDATE_STATE; - public class TaskStateMachineTest extends EasyMockTest { private WorkSink workSink; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java b/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java index d78acd4..6d3f15f 100644 --- a/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java +++ b/src/test/java/org/apache/aurora/scheduler/stats/SlotSizeCounterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.stats; +package org.apache.aurora.scheduler.stats; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; @@ -21,17 +21,19 @@ import java.util.concurrent.atomic.AtomicLong; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.junit.Before; -import org.junit.Test; - -import com.twitter.aurora.gen.Quota; -import com.twitter.aurora.scheduler.quota.Quotas; -import com.twitter.aurora.scheduler.stats.SlotSizeCounter.ResourceSlotProvider; -import com.twitter.aurora.scheduler.storage.entities.IQuota; import com.twitter.common.stats.StatsProvider; import com.twitter.common.testing.easymock.EasyMockTest; +import org.apache.aurora.gen.Quota; +import org.apache.aurora.scheduler.quota.Quotas; +import org.apache.aurora.scheduler.stats.SlotSizeCounter.ResourceSlotProvider; +import org.apache.aurora.scheduler.storage.entities.IQuota; + +import org.junit.Before; +import org.junit.Test; + import static org.easymock.EasyMock.expect; + import static org.junit.Assert.assertEquals; public class SlotSizeCounterTest extends EasyMockTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java b/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java index f595ea2..615bb4b 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/ReadWriteLockManagerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.storage; +package org.apache.aurora.scheduler.storage; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; @@ -25,13 +25,13 @@ import com.google.common.testing.TearDown; import com.google.common.testing.junit4.TearDownTestCase; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.junit.Before; -import org.junit.Test; - import com.twitter.common.quantity.Amount; import com.twitter.common.quantity.Time; import com.twitter.common.util.concurrent.ExecutorServiceShutdown; +import org.junit.Before; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java b/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java index 56f96b5..9c6dfde 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java @@ -1,27 +1,28 @@ -package com.twitter.aurora.scheduler.storage; +package org.apache.aurora.scheduler.storage; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import com.twitter.common.util.testing.FakeClock; + +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Constraint; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.LimitConstraint; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.TaskConstraint; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider; +import org.apache.aurora.scheduler.storage.Storage.MutateWork; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.mem.MemStorage; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Constraint; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.LimitConstraint; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.TaskConstraint; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider; -import com.twitter.aurora.scheduler.storage.Storage.MutateWork; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.mem.MemStorage; -import com.twitter.common.util.testing.FakeClock; - import static org.junit.Assert.assertEquals; public class StorageBackfillTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java index ded3a3f..8dafe14 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java @@ -13,40 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.storage.backup; +package org.apache.aurora.scheduler.storage.backup; import java.io.File; import com.google.common.collect.ImmutableSet; import com.google.common.testing.TearDown; -import org.easymock.Capture; -import org.junit.Before; -import org.junit.Test; - -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.HostAttributes; -import com.twitter.aurora.gen.Identity; -import com.twitter.aurora.gen.Lock; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.storage.QuotaConfiguration; -import com.twitter.aurora.gen.storage.SchedulerMetadata; -import com.twitter.aurora.gen.storage.Snapshot; -import com.twitter.aurora.gen.storage.StoredJob; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.base.Tasks; -import com.twitter.aurora.scheduler.storage.DistributedSnapshotStore; -import com.twitter.aurora.scheduler.storage.SnapshotStore; -import com.twitter.aurora.scheduler.storage.Storage; -import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider; -import com.twitter.aurora.scheduler.storage.Storage.MutateWork; -import com.twitter.aurora.scheduler.storage.backup.Recovery.RecoveryException; -import com.twitter.aurora.scheduler.storage.backup.Recovery.RecoveryImpl; -import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl; -import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig; -import com.twitter.aurora.scheduler.storage.backup.TemporaryStorage.TemporaryStorageFactory; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; import com.twitter.common.base.Command; import com.twitter.common.io.FileUtils; import com.twitter.common.quantity.Amount; @@ -54,11 +27,41 @@ import com.twitter.common.quantity.Time; import com.twitter.common.testing.easymock.EasyMockTest; import com.twitter.common.util.testing.FakeClock; +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.HostAttributes; +import org.apache.aurora.gen.Identity; +import org.apache.aurora.gen.Lock; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.storage.QuotaConfiguration; +import org.apache.aurora.gen.storage.SchedulerMetadata; +import org.apache.aurora.gen.storage.Snapshot; +import org.apache.aurora.gen.storage.StoredJob; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.base.Tasks; +import org.apache.aurora.scheduler.storage.DistributedSnapshotStore; +import org.apache.aurora.scheduler.storage.SnapshotStore; +import org.apache.aurora.scheduler.storage.Storage; +import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider; +import org.apache.aurora.scheduler.storage.Storage.MutateWork; +import org.apache.aurora.scheduler.storage.backup.Recovery.RecoveryException; +import org.apache.aurora.scheduler.storage.backup.Recovery.RecoveryImpl; +import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl; +import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig; +import org.apache.aurora.scheduler.storage.backup.TemporaryStorage.TemporaryStorageFactory; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; + +import org.easymock.Capture; + +import org.junit.Before; +import org.junit.Test; + +import static org.apache.aurora.gen.apiConstants.CURRENT_API_VERSION; + import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static com.twitter.aurora.gen.apiConstants.CURRENT_API_VERSION; +import static org.junit.Assert.assertEquals; public class RecoveryTest extends EasyMockTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java index 46403e5..58c1dc8 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.storage.backup; +package org.apache.aurora.scheduler.storage.backup; import java.io.File; import java.util.List; @@ -24,30 +24,32 @@ import com.google.common.collect.ImmutableSet; import com.google.common.io.Files; import com.google.common.testing.TearDown; -import org.junit.Before; -import org.junit.Test; - -import com.twitter.aurora.codec.ThriftBinaryCodec; -import com.twitter.aurora.gen.Attribute; -import com.twitter.aurora.gen.HostAttributes; -import com.twitter.aurora.gen.JobConfiguration; -import com.twitter.aurora.gen.JobKey; -import com.twitter.aurora.gen.Quota; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.storage.QuotaConfiguration; -import com.twitter.aurora.gen.storage.SchedulerMetadata; -import com.twitter.aurora.gen.storage.Snapshot; -import com.twitter.aurora.gen.storage.StoredJob; -import com.twitter.aurora.scheduler.storage.SnapshotStore; -import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl; -import com.twitter.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig; import com.twitter.common.io.FileUtils; import com.twitter.common.quantity.Amount; import com.twitter.common.quantity.Time; import com.twitter.common.testing.easymock.EasyMockTest; import com.twitter.common.util.testing.FakeClock; +import org.apache.aurora.codec.ThriftBinaryCodec; +import org.apache.aurora.gen.Attribute; +import org.apache.aurora.gen.HostAttributes; +import org.apache.aurora.gen.JobConfiguration; +import org.apache.aurora.gen.JobKey; +import org.apache.aurora.gen.Quota; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.storage.QuotaConfiguration; +import org.apache.aurora.gen.storage.SchedulerMetadata; +import org.apache.aurora.gen.storage.Snapshot; +import org.apache.aurora.gen.storage.StoredJob; +import org.apache.aurora.scheduler.storage.SnapshotStore; +import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl; +import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig; + +import org.junit.Before; +import org.junit.Test; + import static org.easymock.EasyMock.expect; + import static org.junit.Assert.assertEquals; public class StorageBackupTest extends EasyMockTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java index d14fb4b..76758f3 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/log/LogManagerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.storage.log; +package org.apache.aurora.scheduler.storage.log; import java.io.IOException; import java.nio.ByteBuffer; @@ -31,38 +31,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import org.easymock.Capture; -import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; - -import com.twitter.aurora.codec.ThriftBinaryCodec; -import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Attribute; -import com.twitter.aurora.gen.HostAttributes; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.storage.Frame; -import com.twitter.aurora.gen.storage.FrameChunk; -import com.twitter.aurora.gen.storage.FrameHeader; -import com.twitter.aurora.gen.storage.LogEntry; -import com.twitter.aurora.gen.storage.Op; -import com.twitter.aurora.gen.storage.RemoveJob; -import com.twitter.aurora.gen.storage.RemoveTasks; -import com.twitter.aurora.gen.storage.SaveFrameworkId; -import com.twitter.aurora.gen.storage.SaveTasks; -import com.twitter.aurora.gen.storage.Snapshot; -import com.twitter.aurora.gen.storage.Transaction; -import com.twitter.aurora.gen.storage.storageConstants; -import com.twitter.aurora.scheduler.base.JobKeys; -import com.twitter.aurora.scheduler.log.Log; -import com.twitter.aurora.scheduler.log.Log.Entry; -import com.twitter.aurora.scheduler.log.Log.Position; -import com.twitter.aurora.scheduler.log.Log.Stream; -import com.twitter.aurora.scheduler.storage.log.LogManager.StreamManager; -import com.twitter.aurora.scheduler.storage.log.LogManager.StreamManager.StreamTransaction; import com.twitter.common.application.ShutdownRegistry; import com.twitter.common.base.Closure; import com.twitter.common.base.ExceptionalCommand; @@ -70,9 +38,44 @@ import com.twitter.common.quantity.Amount; import com.twitter.common.quantity.Data; import com.twitter.common.testing.easymock.EasyMockTest; +import org.apache.aurora.codec.ThriftBinaryCodec; +import org.apache.aurora.codec.ThriftBinaryCodec.CodingException; +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Attribute; +import org.apache.aurora.gen.HostAttributes; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.storage.Frame; +import org.apache.aurora.gen.storage.FrameChunk; +import org.apache.aurora.gen.storage.FrameHeader; +import org.apache.aurora.gen.storage.LogEntry; +import org.apache.aurora.gen.storage.Op; +import org.apache.aurora.gen.storage.RemoveJob; +import org.apache.aurora.gen.storage.RemoveTasks; +import org.apache.aurora.gen.storage.SaveFrameworkId; +import org.apache.aurora.gen.storage.SaveTasks; +import org.apache.aurora.gen.storage.Snapshot; +import org.apache.aurora.gen.storage.Transaction; +import org.apache.aurora.gen.storage.storageConstants; +import org.apache.aurora.scheduler.base.JobKeys; +import org.apache.aurora.scheduler.log.Log; +import org.apache.aurora.scheduler.log.Log.Entry; +import org.apache.aurora.scheduler.log.Log.Position; +import org.apache.aurora.scheduler.log.Log.Stream; +import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager; +import org.apache.aurora.scheduler.storage.log.LogManager.StreamManager.StreamTransaction; + +import org.easymock.Capture; +import org.easymock.EasyMock; + +import org.junit.Before; +import org.junit.Test; + import static org.easymock.EasyMock.aryEq; import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.expect; + import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java index e2d1836..23a774e 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.storage.log; +package org.apache.aurora.scheduler.storage.log; import java.io.IOException; import java.util.Set; @@ -27,62 +27,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; import com.google.common.testing.TearDown; -import org.easymock.Capture; -import org.easymock.EasyMock; -import org.easymock.IAnswer; -import org.junit.Before; -import org.junit.Test; - -import com.twitter.aurora.codec.ThriftBinaryCodec; -import com.twitter.aurora.codec.ThriftBinaryCodec.CodingException; -import com.twitter.aurora.gen.AssignedTask; -import com.twitter.aurora.gen.Attribute; -import com.twitter.aurora.gen.HostAttributes; -import com.twitter.aurora.gen.JobConfiguration; -import com.twitter.aurora.gen.JobKey; -import com.twitter.aurora.gen.Lock; -import com.twitter.aurora.gen.LockKey; -import com.twitter.aurora.gen.Quota; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.TaskConfig; -import com.twitter.aurora.gen.storage.LogEntry; -import com.twitter.aurora.gen.storage.Op; -import com.twitter.aurora.gen.storage.RemoveJob; -import com.twitter.aurora.gen.storage.RemoveLock; -import com.twitter.aurora.gen.storage.RemoveQuota; -import com.twitter.aurora.gen.storage.RemoveTasks; -import com.twitter.aurora.gen.storage.RewriteTask; -import com.twitter.aurora.gen.storage.SaveAcceptedJob; -import com.twitter.aurora.gen.storage.SaveFrameworkId; -import com.twitter.aurora.gen.storage.SaveHostAttributes; -import com.twitter.aurora.gen.storage.SaveLock; -import com.twitter.aurora.gen.storage.SaveQuota; -import com.twitter.aurora.gen.storage.SaveTasks; -import com.twitter.aurora.gen.storage.Snapshot; -import com.twitter.aurora.gen.storage.Transaction; -import com.twitter.aurora.gen.storage.storageConstants; -import com.twitter.aurora.scheduler.base.JobKeys; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.base.Tasks; -import com.twitter.aurora.scheduler.log.Log; -import com.twitter.aurora.scheduler.log.Log.Entry; -import com.twitter.aurora.scheduler.log.Log.Position; -import com.twitter.aurora.scheduler.log.Log.Stream; -import com.twitter.aurora.scheduler.storage.SnapshotStore; -import com.twitter.aurora.scheduler.storage.Storage.MutableStoreProvider; -import com.twitter.aurora.scheduler.storage.Storage.MutateWork; -import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration; -import com.twitter.aurora.scheduler.storage.entities.IJobKey; -import com.twitter.aurora.scheduler.storage.entities.ILock; -import com.twitter.aurora.scheduler.storage.entities.ILockKey; -import com.twitter.aurora.scheduler.storage.entities.IQuota; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.entities.ITaskConfig; -import com.twitter.aurora.scheduler.storage.log.LogStorage.SchedulingService; -import com.twitter.aurora.scheduler.storage.log.testing.LogOpMatcher; -import com.twitter.aurora.scheduler.storage.log.testing.LogOpMatcher.StreamMatcher; -import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil; import com.twitter.common.application.ShutdownRegistry; import com.twitter.common.base.Command; import com.twitter.common.base.ExceptionalCommand; @@ -91,11 +35,70 @@ import com.twitter.common.quantity.Data; import com.twitter.common.quantity.Time; import com.twitter.common.testing.easymock.EasyMockTest; +import org.apache.aurora.codec.ThriftBinaryCodec; +import org.apache.aurora.codec.ThriftBinaryCodec.CodingException; +import org.apache.aurora.gen.AssignedTask; +import org.apache.aurora.gen.Attribute; +import org.apache.aurora.gen.HostAttributes; +import org.apache.aurora.gen.JobConfiguration; +import org.apache.aurora.gen.JobKey; +import org.apache.aurora.gen.Lock; +import org.apache.aurora.gen.LockKey; +import org.apache.aurora.gen.Quota; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.TaskConfig; +import org.apache.aurora.gen.storage.LogEntry; +import org.apache.aurora.gen.storage.Op; +import org.apache.aurora.gen.storage.RemoveJob; +import org.apache.aurora.gen.storage.RemoveLock; +import org.apache.aurora.gen.storage.RemoveQuota; +import org.apache.aurora.gen.storage.RemoveTasks; +import org.apache.aurora.gen.storage.RewriteTask; +import org.apache.aurora.gen.storage.SaveAcceptedJob; +import org.apache.aurora.gen.storage.SaveFrameworkId; +import org.apache.aurora.gen.storage.SaveHostAttributes; +import org.apache.aurora.gen.storage.SaveLock; +import org.apache.aurora.gen.storage.SaveQuota; +import org.apache.aurora.gen.storage.SaveTasks; +import org.apache.aurora.gen.storage.Snapshot; +import org.apache.aurora.gen.storage.Transaction; +import org.apache.aurora.gen.storage.storageConstants; +import org.apache.aurora.scheduler.base.JobKeys; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.base.Tasks; +import org.apache.aurora.scheduler.log.Log; +import org.apache.aurora.scheduler.log.Log.Entry; +import org.apache.aurora.scheduler.log.Log.Position; +import org.apache.aurora.scheduler.log.Log.Stream; +import org.apache.aurora.scheduler.storage.SnapshotStore; +import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider; +import org.apache.aurora.scheduler.storage.Storage.MutateWork; +import org.apache.aurora.scheduler.storage.entities.IJobConfiguration; +import org.apache.aurora.scheduler.storage.entities.IJobKey; +import org.apache.aurora.scheduler.storage.entities.ILock; +import org.apache.aurora.scheduler.storage.entities.ILockKey; +import org.apache.aurora.scheduler.storage.entities.IQuota; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.entities.ITaskConfig; +import org.apache.aurora.scheduler.storage.log.LogStorage.SchedulingService; +import org.apache.aurora.scheduler.storage.log.testing.LogOpMatcher; +import org.apache.aurora.scheduler.storage.log.testing.LogOpMatcher.StreamMatcher; +import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; + +import org.easymock.Capture; +import org.easymock.EasyMock; +import org.easymock.IAnswer; + +import org.junit.Before; +import org.junit.Test; + import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.notNull; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java index 5062795..f8ea3bf 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java @@ -13,43 +13,45 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.storage.log; +package org.apache.aurora.scheduler.storage.log; import java.util.Set; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.twitter.common.testing.easymock.EasyMockTest; +import com.twitter.common.util.testing.FakeClock; + +import org.apache.aurora.gen.Attribute; +import org.apache.aurora.gen.HostAttributes; +import org.apache.aurora.gen.JobConfiguration; +import org.apache.aurora.gen.JobKey; +import org.apache.aurora.gen.Lock; +import org.apache.aurora.gen.LockKey; +import org.apache.aurora.gen.ScheduleStatus; +import org.apache.aurora.gen.ScheduledTask; +import org.apache.aurora.gen.storage.QuotaConfiguration; +import org.apache.aurora.gen.storage.SchedulerMetadata; +import org.apache.aurora.gen.storage.Snapshot; +import org.apache.aurora.gen.storage.StoredJob; +import org.apache.aurora.scheduler.base.JobKeys; +import org.apache.aurora.scheduler.base.Query; +import org.apache.aurora.scheduler.quota.Quotas; +import org.apache.aurora.scheduler.storage.SnapshotStore; +import org.apache.aurora.scheduler.storage.entities.IJobConfiguration; +import org.apache.aurora.scheduler.storage.entities.ILock; +import org.apache.aurora.scheduler.storage.entities.IScheduledTask; +import org.apache.aurora.scheduler.storage.testing.StorageTestUtil; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.Attribute; -import com.twitter.aurora.gen.HostAttributes; -import com.twitter.aurora.gen.JobConfiguration; -import com.twitter.aurora.gen.JobKey; -import com.twitter.aurora.gen.Lock; -import com.twitter.aurora.gen.LockKey; -import com.twitter.aurora.gen.ScheduleStatus; -import com.twitter.aurora.gen.ScheduledTask; -import com.twitter.aurora.gen.storage.QuotaConfiguration; -import com.twitter.aurora.gen.storage.SchedulerMetadata; -import com.twitter.aurora.gen.storage.Snapshot; -import com.twitter.aurora.gen.storage.StoredJob; -import com.twitter.aurora.scheduler.base.JobKeys; -import com.twitter.aurora.scheduler.base.Query; -import com.twitter.aurora.scheduler.quota.Quotas; -import com.twitter.aurora.scheduler.storage.SnapshotStore; -import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration; -import com.twitter.aurora.scheduler.storage.entities.ILock; -import com.twitter.aurora.scheduler.storage.entities.IScheduledTask; -import com.twitter.aurora.scheduler.storage.testing.StorageTestUtil; -import com.twitter.common.testing.easymock.EasyMockTest; -import com.twitter.common.util.testing.FakeClock; +import static org.apache.aurora.gen.apiConstants.CURRENT_API_VERSION; import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static com.twitter.aurora.gen.apiConstants.CURRENT_API_VERSION; +import static org.junit.Assert.assertEquals; public class SnapshotStoreImplTest extends EasyMockTest { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java index ad6a989..b445d44 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/InternerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.storage.mem; +package org.apache.aurora.scheduler.storage.mem; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/cfb13f65/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java index d384b14..b3ec816 100644 --- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java +++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.twitter.aurora.scheduler.storage.mem; +package org.apache.aurora.scheduler.storage.mem; import com.google.common.collect.ImmutableSet; +import org.apache.aurora.gen.JobConfiguration; +import org.apache.aurora.scheduler.base.JobKeys; +import org.apache.aurora.scheduler.storage.JobStore; +import org.apache.aurora.scheduler.storage.entities.IJobConfiguration; +import org.apache.aurora.scheduler.storage.entities.IJobKey; + import org.junit.Before; import org.junit.Test; -import com.twitter.aurora.gen.JobConfiguration; -import com.twitter.aurora.scheduler.base.JobKeys; -import com.twitter.aurora.scheduler.storage.JobStore; -import com.twitter.aurora.scheduler.storage.entities.IJobConfiguration; -import com.twitter.aurora.scheduler.storage.entities.IJobKey; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull;