This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 07e2c72 Move tests for API resources to a different package (#4415)
07e2c72 is described below
commit 07e2c721d964c290888c66bf7750e6b2067d4ca1
Author: Xiaotian (Jackie) Jiang <[email protected]>
AuthorDate: Tue Jul 9 20:44:40 2019 -0700
Move tests for API resources to a different package (#4415)
To prevent the API application to load the test files which can cause class
not found exception
---
.../org/apache/pinot/controller/api/resources/TableViews.java | 4 ++--
.../controller/api/{resources => }/AccessControlTest.java | 10 ++--------
.../api/{resources => }/FileUploadPathProviderTest.java | 3 ++-
.../controller/api/{resources => }/PinotFileUploadTest.java | 2 +-
.../api/{resources => }/PinotInstanceRestletResourceTest.java | 2 +-
.../api/{resources => }/PinotSchemaRestletResourceTest.java | 2 +-
.../api/{resources => }/PinotSegmentRestletResourceTest.java | 2 +-
.../api/{resources => }/PinotTableRestletResourceTest.java | 2 +-
.../api/{resources => }/PinotTenantRestletResourceTest.java | 2 +-
.../{resources => }/SegmentCompletionProtocolDeserTest.java | 2 +-
.../api/{resources => }/SegmentCompletionUtilsTest.java | 2 +-
.../api/{resources => }/ServerTableSizeReaderTest.java | 3 ++-
.../controller/api/{resources => }/TableSizeReaderTest.java | 2 +-
.../pinot/controller/api/{resources => }/TableViewsTest.java | 3 ++-
.../pinot/server/api/{resources => }/BaseResourceTest.java | 2 +-
.../server/api/{resources => }/TableSizeResourceTest.java | 2 +-
.../pinot/server/api/{resources => }/TablesResourceTest.java | 2 +-
17 files changed, 22 insertions(+), 25 deletions(-)
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java
index 17f6372..89a7fcd 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/TableViews.java
@@ -55,9 +55,9 @@ public class TableViews {
public static class TableView {
@JsonProperty("OFFLINE")
- Map<String, Map<String, String>> offline;
+ public Map<String, Map<String, String>> offline;
@JsonProperty("REALTIME")
- Map<String, Map<String, String>> realtime;
+ public Map<String, Map<String, String>> realtime;
}
@GET
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/AccessControlTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/AccessControlTest.java
similarity index 87%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/AccessControlTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/AccessControlTest.java
index c486e4a..7009284 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/AccessControlTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/AccessControlTest.java
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import java.io.IOException;
-import javax.ws.rs.core.HttpHeaders;
import org.apache.pinot.controller.ControllerConf;
import org.apache.pinot.controller.api.access.AccessControl;
import org.apache.pinot.controller.api.access.AccessControlFactory;
@@ -58,12 +57,7 @@ public class AccessControlTest extends ControllerTest {
}
public static class DenyAllAccessFactory implements AccessControlFactory {
- private static final AccessControl DENY_ALL_ACCESS = new AccessControl() {
- @Override
- public boolean hasDataAccess(HttpHeaders httpHeaders, String tableName) {
- return false;
- }
- };
+ private static final AccessControl DENY_ALL_ACCESS = (httpHeaders,
tableName) -> false;
@Override
public AccessControl create() {
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/FileUploadPathProviderTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/FileUploadPathProviderTest.java
similarity index 95%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/FileUploadPathProviderTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/FileUploadPathProviderTest.java
index 8071f07..d55bebf 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/FileUploadPathProviderTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/FileUploadPathProviderTest.java
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import java.io.File;
import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.api.resources.FileUploadPathProvider;
import org.apache.pinot.controller.helix.ControllerTest;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotFileUploadTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotFileUploadTest.java
similarity index 98%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotFileUploadTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotFileUploadTest.java
index 454d83e..6d1ba67 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotFileUploadTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotFileUploadTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResourceTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java
similarity index 99%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResourceTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java
index 28049ec..bfe155b 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResourceTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotInstanceRestletResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResourceTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSchemaRestletResourceTest.java
similarity index 98%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResourceTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSchemaRestletResourceTest.java
index 68dc4ee..745ce81 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSchemaRestletResourceTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSchemaRestletResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import java.io.IOException;
import org.apache.commons.httpclient.methods.PostMethod;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResourceTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java
similarity index 98%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResourceTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java
index aaf36a2..65d3d00 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotSegmentRestletResourceTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotSegmentRestletResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import java.util.HashMap;
import java.util.Map;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTableRestletResourceTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java
similarity index 99%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTableRestletResourceTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java
index fe00c6a..71dd4c0 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTableRestletResourceTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import com.fasterxml.jackson.databind.JsonNode;
import java.io.FileNotFoundException;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResourceTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java
similarity index 98%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResourceTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java
index 645b195..b5aa4cc 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/PinotTenantRestletResourceTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTenantRestletResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionProtocolDeserTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionProtocolDeserTest.java
similarity index 99%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionProtocolDeserTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionProtocolDeserTest.java
index 95db89e..7359201 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionProtocolDeserTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionProtocolDeserTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionUtilsTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionUtilsTest.java
similarity index 96%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionUtilsTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionUtilsTest.java
index 36d3f4d..6e651cc 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/SegmentCompletionUtilsTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/SegmentCompletionUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import junit.framework.Assert;
import org.apache.pinot.controller.util.SegmentCompletionUtils;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ServerTableSizeReaderTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/ServerTableSizeReaderTest.java
similarity index 98%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ServerTableSizeReaderTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/ServerTableSizeReaderTest.java
index 962e923..333e280 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ServerTableSizeReaderTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/ServerTableSizeReaderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
@@ -37,6 +37,7 @@ import
org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.pinot.common.restlet.resources.SegmentSizeInfo;
import org.apache.pinot.common.restlet.resources.TableSizeInfo;
import org.apache.pinot.common.utils.JsonUtils;
+import org.apache.pinot.controller.api.resources.ServerTableSizeReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableSizeReaderTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableSizeReaderTest.java
similarity index 99%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableSizeReaderTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/TableSizeReaderTest.java
index 52bc27f..6e32ad1 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableSizeReaderTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableSizeReaderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableViewsTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableViewsTest.java
similarity index 98%
rename from
pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableViewsTest.java
rename to
pinot-controller/src/test/java/org/apache/pinot/controller/api/TableViewsTest.java
index 12103cf..0194d42 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/TableViewsTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/api/TableViewsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.controller.api.resources;
+package org.apache.pinot.controller.api;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -27,6 +27,7 @@ import org.apache.pinot.common.config.TableNameBuilder;
import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.common.utils.JsonUtils;
import org.apache.pinot.common.utils.ZkStarter;
+import org.apache.pinot.controller.api.resources.TableViews;
import org.apache.pinot.controller.helix.ControllerRequestBuilderUtil;
import org.apache.pinot.controller.helix.ControllerTest;
import org.apache.pinot.controller.utils.SegmentMetadataMockUtils;
diff --git
a/pinot-server/src/test/java/org/apache/pinot/server/api/resources/BaseResourceTest.java
b/pinot-server/src/test/java/org/apache/pinot/server/api/BaseResourceTest.java
similarity index 99%
rename from
pinot-server/src/test/java/org/apache/pinot/server/api/resources/BaseResourceTest.java
rename to
pinot-server/src/test/java/org/apache/pinot/server/api/BaseResourceTest.java
index fd299ae..08ab8c3 100644
---
a/pinot-server/src/test/java/org/apache/pinot/server/api/resources/BaseResourceTest.java
+++
b/pinot-server/src/test/java/org/apache/pinot/server/api/BaseResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.server.api.resources;
+package org.apache.pinot.server.api;
import java.io.File;
import java.net.URL;
diff --git
a/pinot-server/src/test/java/org/apache/pinot/server/api/resources/TableSizeResourceTest.java
b/pinot-server/src/test/java/org/apache/pinot/server/api/TableSizeResourceTest.java
similarity index 98%
rename from
pinot-server/src/test/java/org/apache/pinot/server/api/resources/TableSizeResourceTest.java
rename to
pinot-server/src/test/java/org/apache/pinot/server/api/TableSizeResourceTest.java
index 98725b9..f30b291 100644
---
a/pinot-server/src/test/java/org/apache/pinot/server/api/resources/TableSizeResourceTest.java
+++
b/pinot-server/src/test/java/org/apache/pinot/server/api/TableSizeResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.server.api.resources;
+package org.apache.pinot.server.api;
import javax.ws.rs.core.Response;
import org.apache.pinot.common.restlet.resources.TableSizeInfo;
diff --git
a/pinot-server/src/test/java/org/apache/pinot/server/api/resources/TablesResourceTest.java
b/pinot-server/src/test/java/org/apache/pinot/server/api/TablesResourceTest.java
similarity index 99%
rename from
pinot-server/src/test/java/org/apache/pinot/server/api/resources/TablesResourceTest.java
rename to
pinot-server/src/test/java/org/apache/pinot/server/api/TablesResourceTest.java
index 8d5eff3..53cdb13 100644
---
a/pinot-server/src/test/java/org/apache/pinot/server/api/resources/TablesResourceTest.java
+++
b/pinot-server/src/test/java/org/apache/pinot/server/api/TablesResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.pinot.server.api.resources;
+package org.apache.pinot.server.api;
import com.fasterxml.jackson.databind.JsonNode;
import java.util.List;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
