This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e2383f3ee640b927d0227d89e4d107edd953e0b8
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Mon Jul 9 19:16:55 2018 -0700
GEODE-5363: Rebase cleanup.
---
.../org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java | 3 ---
.../java/org/apache/geode/cache30/GlobalLockingDUnitTest.java | 0
.../apache/geode/management/internal/JMXMBeanFederationDUnitTest.java | 0
.../geode/management/internal/MBeanFederationErrorPathDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java | 3 ---
.../org/apache/geode/internal/cache/backup/BackupOperationTest.java | 3 ---
.../org/apache/geode/management/internal/BackupStatusImplTest.java | 3 ---
7 files changed, 12 deletions(-)
diff --git
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
similarity index 99%
rename from
geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
rename to
geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
index faed3fe..d4d5af4 100644
---
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
+++
b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
@@ -38,18 +38,15 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.http.MediaType;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.rest.internal.web.controllers.Customer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GeodeDevRestClient;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
public class RestRegionAPIDUnitTest {
@ClassRule
public static ServerStarterRule server = new ServerStarterRule()
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
similarity index 100%
rename from
geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
index 690fbf0..21b99e4 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
@@ -21,14 +21,11 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionAdvisor;
import org.apache.geode.distributed.internal.DistributionManager;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionedRegionDestroyJUnitTest {
private PartitionedRegion partitionedRegion;
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
index 6adb998..77d99d6 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -33,9 +32,7 @@ import org.apache.geode.internal.cache.InternalCache;
import
org.apache.geode.internal.cache.backup.BackupOperation.MissingPersistentMembersProvider;
import org.apache.geode.management.BackupStatus;
import org.apache.geode.management.ManagementException;
-import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BackupOperationTest {
private FlushToDiskFactory flushToDiskFactory;
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/BackupStatusImplTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/BackupStatusImplTest.java
index 0f165ec..81604ed 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/BackupStatusImplTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/BackupStatusImplTest.java
@@ -24,14 +24,11 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.BackupStatus;
-import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BackupStatusImplTest {
private Map<DistributedMember, Set<PersistentID>> backedUpDiskStores;
