[accumulo] branch master updated: Fix #411 Ensure test categories are on class path

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new d70b5c0  Fix #411 Ensure test categories are on class path
d70b5c0 is described below

commit d70b5c00db310695d6cea90526b696bbab492345
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Mar 30 14:26:22 2018 -0400

    Fix #411 Ensure test categories are on class path
    
    Fix SunnyDay profile and other test category runs by ensuring the
    interfaces used for the test categories are on the class path for the
    maven-failsafe-plugin.
---
 .../src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java      | 2 +-
 .../org/apache/accumulo/test/categories/MiniClusterOnlyTests.java     | 0
 .../main/java/org/apache/accumulo/test/categories}/MonitorTests.java  | 4 ++--
 .../java/org/apache/accumulo/test/categories/PerformanceTests.java    | 0
 .../accumulo/test/categories/StandaloneCapableClusterTests.java       | 0
 .../main/java/org/apache/accumulo/test/categories/SunnyDayTests.java  | 0
 .../main/java/org/apache/accumulo/test/categories/package-info.java   | 0
 7 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java
index 6e2aae4..7e8c17d 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/it/WebViewsIT.java
@@ -36,9 +36,9 @@ import org.apache.accumulo.core.client.impl.Table;
 import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.monitor.Monitor;
-import org.apache.accumulo.monitor.util.MonitorTests;
 import org.apache.accumulo.monitor.view.WebViews;
 import org.apache.accumulo.server.AccumuloServerContext;
+import org.apache.accumulo.test.categories.MonitorTests;
 import org.easymock.EasyMock;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.server.ResourceConfig;
diff --git a/test/src/main/java/org/apache/accumulo/test/categories/MiniClusterOnlyTests.java b/start/src/main/java/org/apache/accumulo/test/categories/MiniClusterOnlyTests.java
similarity index 100%
rename from test/src/main/java/org/apache/accumulo/test/categories/MiniClusterOnlyTests.java
rename to start/src/main/java/org/apache/accumulo/test/categories/MiniClusterOnlyTests.java
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java b/start/src/main/java/org/apache/accumulo/test/categories/MonitorTests.java
similarity index 83%
rename from server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java
rename to start/src/main/java/org/apache/accumulo/test/categories/MonitorTests.java
index 0bf3f29..d75bc64 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java
+++ b/start/src/main/java/org/apache/accumulo/test/categories/MonitorTests.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.monitor.util;
+package org.apache.accumulo.test.categories;
 
 /**
- * Special category for Monitor ITs to avoid adding dependency on test module
+ * Interface to be used with JUnit Category annotation to represent the integration test is for testing Accumulo's Monitor
  */
 public interface MonitorTests {}
diff --git a/test/src/main/java/org/apache/accumulo/test/categories/PerformanceTests.java b/start/src/main/java/org/apache/accumulo/test/categories/PerformanceTests.java
similarity index 100%
rename from test/src/main/java/org/apache/accumulo/test/categories/PerformanceTests.java
rename to start/src/main/java/org/apache/accumulo/test/categories/PerformanceTests.java
diff --git a/test/src/main/java/org/apache/accumulo/test/categories/StandaloneCapableClusterTests.java b/start/src/main/java/org/apache/accumulo/test/categories/StandaloneCapableClusterTests.java
similarity index 100%
rename from test/src/main/java/org/apache/accumulo/test/categories/StandaloneCapableClusterTests.java
rename to start/src/main/java/org/apache/accumulo/test/categories/StandaloneCapableClusterTests.java
diff --git a/test/src/main/java/org/apache/accumulo/test/categories/SunnyDayTests.java b/start/src/main/java/org/apache/accumulo/test/categories/SunnyDayTests.java
similarity index 100%
rename from test/src/main/java/org/apache/accumulo/test/categories/SunnyDayTests.java
rename to start/src/main/java/org/apache/accumulo/test/categories/SunnyDayTests.java
diff --git a/test/src/main/java/org/apache/accumulo/test/categories/package-info.java b/start/src/main/java/org/apache/accumulo/test/categories/package-info.java
similarity index 100%
rename from test/src/main/java/org/apache/accumulo/test/categories/package-info.java
rename to start/src/main/java/org/apache/accumulo/test/categories/package-info.java

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.