Repository: eagle
Updated Branches:
refs/heads/master 78cc24fc0 -> 5ee33c850
[EAGLE-331] avoid to use junit.framework.Assert
<!--
{% comment %}
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to you under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
{% endcomment %}
-->
Be sure to do all of the following to help us incorporate your contribution
quickly and easily:
- [ ] Make sure the PR title is formatted like:
`[EAGLE-<Jira issue #>] Description of pull request`
- [ ] Make sure tests pass via `mvn clean verify`. (Even better, enable
Travis-CI on your fork and ensure the whole test matrix passes).
- [ ] Replace `<Jira issue #>` in the title with the actual Jira issue
number, if there is one.
- [ ] If this contribution is large, please file an Apache
[Individual Contributor License
Agreement](https://www.apache.org/licenses/icla.txt).
---
Author: Colm O hEigeartaigh <[email protected]>
Closes #979 from coheigea/EAGLE-331.
Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/5ee33c85
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/5ee33c85
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/5ee33c85
Branch: refs/heads/master
Commit: 5ee33c85036d97349b2b71f1b6d08b49b525c0a0
Parents: 78cc24f
Author: Colm O hEigeartaigh <[email protected]>
Authored: Wed Jan 31 10:28:43 2018 -0800
Committer: Jay Sen <[email protected]>
Committed: Wed Jan 31 10:28:43 2018 -0800
----------------------------------------------------------------------
.../eagle/app/service/TestApplicationManagementServiceImpl.java | 2 +-
.../src/test/java/org/apache/eagle/common/TestBase64.java | 2 +-
.../java/org/apache/eagle/common/TestEagleExceptionWrapper.java | 2 +-
.../java/org/apache/eagle/common/config/TestConfigParser.java | 2 +-
.../metadata/persistence/TestMetadataStoreModuleFactory.java | 2 +-
.../metadata/service/TestApplicationEntityServiceMemoryImpl.java | 2 +-
.../org/apache/eagle/audit/dao/TestSearchRequestBuilder.java | 2 +-
.../java/org/apache/eagle/audit/listener/TestAuditSupport.java | 2 +-
.../eagle/service/client/impl/TestDeleteRequestBuilder.java | 2 +-
.../apache/eagle/service/client/impl/TestEagleServiceClient.java | 2 +-
.../service/client/impl/TestEagleServiceGroupByQueryRequest.java | 2 +-
.../eagle/service/client/impl/TestEagleServiceQueryBuilder.java | 2 +-
.../client/impl/TestListQueryAPIReponseConvertHelper.java | 2 +-
.../java/org/apache/eagle/service/client/impl/TestQuery.java | 2 +-
.../client/impl/TestRowkeyQueryAPIResponseConvertHelper.java | 2 +-
.../org/apache/eagle/service/generic/TestListQueryResource.java | 4 ++--
.../eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/service/TestApplicationManagementServiceImpl.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/service/TestApplicationManagementServiceImpl.java
b/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/service/TestApplicationManagementServiceImpl.java
index c4b0227..40296c0 100644
---
a/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/service/TestApplicationManagementServiceImpl.java
+++
b/eagle-core/eagle-app/eagle-app-base/src/test/java/org/apache/eagle/app/service/TestApplicationManagementServiceImpl.java
@@ -18,7 +18,7 @@ package org.apache.eagle.app.service;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.collections.map.HashedMap;
import org.apache.eagle.alert.metadata.IMetadataDao;
import org.apache.eagle.alert.metadata.impl.InMemMetadataDaoImpl;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestBase64.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestBase64.java
b/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestBase64.java
index 03ffeb7..cd452e8 100644
---
a/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestBase64.java
+++
b/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestBase64.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.common;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestEagleExceptionWrapper.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestEagleExceptionWrapper.java
b/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestEagleExceptionWrapper.java
index 1730d9e..03f693c 100644
---
a/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestEagleExceptionWrapper.java
+++
b/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/TestEagleExceptionWrapper.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.common;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/config/TestConfigParser.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/config/TestConfigParser.java
b/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/config/TestConfigParser.java
index c5ef27f..43ca9f0 100644
---
a/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/config/TestConfigParser.java
+++
b/eagle-core/eagle-common/src/test/java/org/apache/eagle/common/config/TestConfigParser.java
@@ -17,7 +17,7 @@
package org.apache.eagle.common.config;
import com.typesafe.config.Config;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.cli.ParseException;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/persistence/TestMetadataStoreModuleFactory.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/persistence/TestMetadataStoreModuleFactory.java
b/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/persistence/TestMetadataStoreModuleFactory.java
index 0fd4e68..ba18e5c 100644
---
a/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/persistence/TestMetadataStoreModuleFactory.java
+++
b/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/persistence/TestMetadataStoreModuleFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.metadata.persistence;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/service/TestApplicationEntityServiceMemoryImpl.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/service/TestApplicationEntityServiceMemoryImpl.java
b/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/service/TestApplicationEntityServiceMemoryImpl.java
index b051681..0c9ffe3 100644
---
a/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/service/TestApplicationEntityServiceMemoryImpl.java
+++
b/eagle-core/eagle-metadata/eagle-metadata-base/src/test/java/org/apache/eagle/metadata/service/TestApplicationEntityServiceMemoryImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.metadata.service;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.collections.map.HashedMap;
import org.apache.eagle.metadata.exceptions.EntityNotFoundException;
import org.apache.eagle.metadata.model.ApplicationDesc;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/dao/TestSearchRequestBuilder.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/dao/TestSearchRequestBuilder.java
b/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/dao/TestSearchRequestBuilder.java
index c369142..e905791 100644
---
a/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/dao/TestSearchRequestBuilder.java
+++
b/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/dao/TestSearchRequestBuilder.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.audit.dao;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.lang.time.DateUtils;
import org.apache.eagle.service.client.EagleServiceSingleEntityQueryRequest;
import org.apache.eagle.service.client.IEagleServiceClient;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/listener/TestAuditSupport.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/listener/TestAuditSupport.java
b/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/listener/TestAuditSupport.java
index d219516..a567685 100644
---
a/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/listener/TestAuditSupport.java
+++
b/eagle-core/eagle-query/eagle-audit-base/src/test/java/org/apache/eagle/audit/listener/TestAuditSupport.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.audit.listener;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.eagle.audit.common.AuditListenerMap;
import org.apache.eagle.audit.entity.GenericAuditEntity;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestDeleteRequestBuilder.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestDeleteRequestBuilder.java
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestDeleteRequestBuilder.java
index 993305a..013b2d4 100644
---
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestDeleteRequestBuilder.java
+++
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestDeleteRequestBuilder.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.service.client.impl;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.lang.time.DateUtils;
import org.apache.eagle.service.client.EagleServiceConnector;
import org.apache.eagle.service.client.EagleServiceSingleEntityQueryRequest;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceClient.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceClient.java
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceClient.java
index 8dc7d3c..eda1f5d 100644
---
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceClient.java
+++
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceClient.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.service.client.impl;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
import org.apache.eagle.log.entity.test.TestEntity;
import org.apache.eagle.log.entity.test.TestTimeSeriesAPIEntity;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceGroupByQueryRequest.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceGroupByQueryRequest.java
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceGroupByQueryRequest.java
index d229fb6..2dd9ac5 100644
---
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceGroupByQueryRequest.java
+++
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceGroupByQueryRequest.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.service.client.impl;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.eagle.service.client.EagleServiceClientException;
import org.apache.eagle.service.client.EagleServiceGroupByQueryRequest;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceQueryBuilder.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceQueryBuilder.java
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceQueryBuilder.java
index 8da2537..bde5c3a 100644
---
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceQueryBuilder.java
+++
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestEagleServiceQueryBuilder.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.service.client.impl;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.eagle.service.client.EagleServiceQueryBuilder;
import org.apache.eagle.service.client.EagleServiceQueryRequest;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestListQueryAPIReponseConvertHelper.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestListQueryAPIReponseConvertHelper.java
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestListQueryAPIReponseConvertHelper.java
index 0fc5d2c..c88d3d0 100644
---
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestListQueryAPIReponseConvertHelper.java
+++
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestListQueryAPIReponseConvertHelper.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.service.client.impl;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.eagle.log.entity.ListQueryAPIResponseEntity;
import org.apache.eagle.log.entity.test.TestEntity;
import org.apache.eagle.service.client.ListQueryAPIResponseConvertHelper;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestQuery.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestQuery.java
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestQuery.java
index 6365494..b2317d6 100644
---
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestQuery.java
+++
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestQuery.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.service.client.impl;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.lang.time.DateUtils;
import org.apache.eagle.service.client.EagleServiceConnector;
import org.apache.eagle.service.client.EagleServiceSingleEntityQueryRequest;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestRowkeyQueryAPIResponseConvertHelper.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestRowkeyQueryAPIResponseConvertHelper.java
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestRowkeyQueryAPIResponseConvertHelper.java
index 9511181..177e445 100644
---
a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestRowkeyQueryAPIResponseConvertHelper.java
+++
b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/impl/TestRowkeyQueryAPIResponseConvertHelper.java
@@ -16,7 +16,7 @@
*/
package org.apache.eagle.service.client.impl;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.eagle.log.entity.RowkeyQueryAPIResponseEntity;
import org.apache.eagle.log.entity.test.TestEntity;
import org.apache.eagle.service.client.RowkeyQueryAPIResponseConvertHelper;
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
----------------------------------------------------------------------
diff --git
a/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
b/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
index 7384c70..ee64675 100755
---
a/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
+++
b/eagle-core/eagle-query/eagle-service-base/src/test/java/org/apache/eagle/service/generic/TestListQueryResource.java
@@ -63,7 +63,7 @@ public class TestListQueryResource extends TestHBaseBase {
// rowkeys = prepareTestEntity(200);
} catch (Exception e) {
e.printStackTrace();
- junit.framework.Assert.fail(e.getMessage());
+ org.junit.Assert.fail(e.getMessage());
}
endTime = System.currentTimeMillis();
@@ -73,7 +73,7 @@ public class TestListQueryResource extends TestHBaseBase {
try {
compiler = new
ListQueryCompiler(TEST_TIME_SERIES_API_SERVICE +"[@cluster=\"test4UT\" and
@datacenter = \"dc1\"]{@field1,@field2}");
} catch (Exception e) {
- junit.framework.Assert.fail(e.getMessage());
+ org.junit.Assert.fail(e.getMessage());
}
scan.setFilter(compiler.filter());
// scan.setStartRow(EagleBase64Wrapper.decode(rowkeys.get(0)));
http://git-wip-us.apache.org/repos/asf/eagle/blob/5ee33c85/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java
----------------------------------------------------------------------
diff --git
a/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java
b/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java
index d674e02..8a80449 100644
---
a/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java
+++
b/eagle-security/eagle-security-hive/src/test/java/org/apache/eagle/security/hive/jobrunning/TestHiveJobFetchSpout.java
@@ -19,7 +19,7 @@ package org.apache.eagle.security.hive.jobrunning;
import backtype.storm.spout.SpoutOutputCollector;
import backtype.storm.task.TopologyContext;
import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
