You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sr...@apache.org on 2013/08/21 13:52:17 UTC
git commit: FALCON-73 Remove JUnit dependency as its used only for
asserts while TestNG for tests. Contributed by Srikanth Sundarrajan
Updated Branches:
refs/heads/master 9a038fe7c -> 31c62be85
FALCON-73 Remove JUnit dependency as its used only for asserts while TestNG for tests. Contributed by Srikanth Sundarrajan
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/31c62be8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/31c62be8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/31c62be8
Branch: refs/heads/master
Commit: 31c62be85f233c8daa77b233eb70e789b43c4fbd
Parents: 9a038fe
Author: srikanth.sundarrajan <sr...@inmobi.com>
Authored: Wed Aug 21 17:21:58 2013 +0530
Committer: srikanth.sundarrajan <sr...@inmobi.com>
Committed: Wed Aug 21 17:21:58 2013 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../src/test/java/org/apache/falcon/group/FeedGroupMapTest.java | 2 +-
.../java/org/apache/falcon/converter/OozieFeedMapperTest.java | 3 +--
.../src/test/java/org/apache/falcon/aspect/LoggingAspectTest.java | 2 +-
.../java/org/apache/falcon/converter/OozieProcessMapperTest.java | 3 +--
.../src/test/java/org/apache/falcon/rerun/queue/ActiveMQTest.java | 2 +-
webapp/src/test/java/org/apache/falcon/logging/LogMoverIT.java | 2 +-
.../java/org/apache/falcon/util/ResourcesReflectionUtilTest.java | 2 +-
8 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/31c62be8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 65e121f..e967a85 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,9 @@ Trunk (Unreleased)
via Srikanth Sundarrajan)
IMPROVEMENTS
+ FALCON-73 Remove JUnit dependency as its used only for asserts while
+ TestNG for tests. (Srikanth Sundarrajan)
+
FALCON-80 Option in falcon-start to not start embedded activemq.
(Shwetha GS via Srikanth Sundarrajan)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/31c62be8/common/src/test/java/org/apache/falcon/group/FeedGroupMapTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/falcon/group/FeedGroupMapTest.java b/common/src/test/java/org/apache/falcon/group/FeedGroupMapTest.java
index cded90b..a6c52e3 100644
--- a/common/src/test/java/org/apache/falcon/group/FeedGroupMapTest.java
+++ b/common/src/test/java/org/apache/falcon/group/FeedGroupMapTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.falcon.group;
-import junit.framework.Assert;
import org.apache.falcon.FalconException;
import org.apache.falcon.entity.AbstractTestBase;
import org.apache.falcon.entity.v0.EntityType;
@@ -26,6 +25,7 @@ import org.apache.falcon.entity.v0.feed.Feed;
import org.apache.falcon.entity.v0.feed.Location;
import org.apache.falcon.entity.v0.feed.LocationType;
import org.apache.falcon.entity.v0.feed.Locations;
+import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/31c62be8/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
----------------------------------------------------------------------
diff --git a/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java b/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
index c3d083f..7fbe179 100644
--- a/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
+++ b/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java
@@ -24,8 +24,6 @@ import java.util.List;
import javax.xml.bind.Unmarshaller;
-import junit.framework.Assert;
-
import org.apache.falcon.FalconException;
import org.apache.falcon.cluster.util.EmbeddedCluster;
import org.apache.falcon.entity.ClusterHelper;
@@ -39,6 +37,7 @@ import org.apache.falcon.oozie.coordinator.CONFIGURATION.Property;
import org.apache.falcon.oozie.coordinator.COORDINATORAPP;
import org.apache.falcon.oozie.coordinator.SYNCDATASET;
import org.apache.hadoop.fs.Path;
+import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/31c62be8/prism/src/test/java/org/apache/falcon/aspect/LoggingAspectTest.java
----------------------------------------------------------------------
diff --git a/prism/src/test/java/org/apache/falcon/aspect/LoggingAspectTest.java b/prism/src/test/java/org/apache/falcon/aspect/LoggingAspectTest.java
index 3b5bd87..547cb6d 100644
--- a/prism/src/test/java/org/apache/falcon/aspect/LoggingAspectTest.java
+++ b/prism/src/test/java/org/apache/falcon/aspect/LoggingAspectTest.java
@@ -18,9 +18,9 @@
package org.apache.falcon.aspect;
-import junit.framework.Assert;
import org.apache.falcon.FalconWebException;
import org.apache.falcon.resource.AbstractEntityManager;
+import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/31c62be8/process/src/test/java/org/apache/falcon/converter/OozieProcessMapperTest.java
----------------------------------------------------------------------
diff --git a/process/src/test/java/org/apache/falcon/converter/OozieProcessMapperTest.java b/process/src/test/java/org/apache/falcon/converter/OozieProcessMapperTest.java
index af20397..7be41da 100644
--- a/process/src/test/java/org/apache/falcon/converter/OozieProcessMapperTest.java
+++ b/process/src/test/java/org/apache/falcon/converter/OozieProcessMapperTest.java
@@ -35,8 +35,6 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import junit.framework.Assert;
-
import org.apache.falcon.Tag;
import org.apache.falcon.cluster.util.EmbeddedCluster;
import org.apache.falcon.entity.ClusterHelper;
@@ -63,6 +61,7 @@ import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/31c62be8/rerun/src/test/java/org/apache/falcon/rerun/queue/ActiveMQTest.java
----------------------------------------------------------------------
diff --git a/rerun/src/test/java/org/apache/falcon/rerun/queue/ActiveMQTest.java b/rerun/src/test/java/org/apache/falcon/rerun/queue/ActiveMQTest.java
index a8f3885..01d0415 100644
--- a/rerun/src/test/java/org/apache/falcon/rerun/queue/ActiveMQTest.java
+++ b/rerun/src/test/java/org/apache/falcon/rerun/queue/ActiveMQTest.java
@@ -17,10 +17,10 @@
*/
package org.apache.falcon.rerun.queue;
-import junit.framework.Assert;
import org.apache.activemq.broker.BrokerService;
import org.apache.falcon.rerun.event.LaterunEvent;
import org.apache.falcon.rerun.event.RerunEvent;
+import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/31c62be8/webapp/src/test/java/org/apache/falcon/logging/LogMoverIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/logging/LogMoverIT.java b/webapp/src/test/java/org/apache/falcon/logging/LogMoverIT.java
index 4e26bff..24c2959 100644
--- a/webapp/src/test/java/org/apache/falcon/logging/LogMoverIT.java
+++ b/webapp/src/test/java/org/apache/falcon/logging/LogMoverIT.java
@@ -17,7 +17,6 @@
*/
package org.apache.falcon.logging;
-import junit.framework.Assert;
import org.apache.falcon.FalconException;
import org.apache.falcon.cluster.util.EmbeddedCluster;
import org.apache.falcon.cluster.util.StandAloneCluster;
@@ -35,6 +34,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.WorkflowJob;
+import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/31c62be8/webapp/src/test/java/org/apache/falcon/util/ResourcesReflectionUtilTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/util/ResourcesReflectionUtilTest.java b/webapp/src/test/java/org/apache/falcon/util/ResourcesReflectionUtilTest.java
index f2ce0c2..e54f81c 100644
--- a/webapp/src/test/java/org/apache/falcon/util/ResourcesReflectionUtilTest.java
+++ b/webapp/src/test/java/org/apache/falcon/util/ResourcesReflectionUtilTest.java
@@ -18,7 +18,7 @@
package org.apache.falcon.util;
-import junit.framework.Assert;
+import org.testng.Assert;
import org.testng.annotations.Test;
/**