Author: virag
Date: Mon Dec 17 22:26:09 2012
New Revision: 1423196
URL: http://svn.apache.org/viewvc?rev=1423196&view=rev
Log:
OOZIE-1124 Split pig unit tests to a separate module (rohini via virag)
Added:
oozie/trunk/tests/
oozie/trunk/tests/pig/
oozie/trunk/tests/pig/pom.xml
oozie/trunk/tests/pig/src/
oozie/trunk/tests/pig/src/test/
oozie/trunk/tests/pig/src/test/java/
oozie/trunk/tests/pig/src/test/java/org/
oozie/trunk/tests/pig/src/test/java/org/apache/
oozie/trunk/tests/pig/src/test/java/org/apache/oozie/
oozie/trunk/tests/pig/src/test/java/org/apache/oozie/action/
oozie/trunk/tests/pig/src/test/java/org/apache/oozie/action/hadoop/
oozie/trunk/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
- copied unchanged from r1423192,
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
oozie/trunk/tests/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
- copied unchanged from r1423192,
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
oozie/trunk/tests/pom.xml
Removed:
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
Modified:
oozie/trunk/core/pom.xml
oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
oozie/trunk/docs/src/site/twiki/ENG_Building.twiki
oozie/trunk/pom.xml
oozie/trunk/release-log.txt
Modified: oozie/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/pom.xml?rev=1423196&r1=1423195&r2=1423196&view=diff
==============================================================================
--- oozie/trunk/core/pom.xml (original)
+++ oozie/trunk/core/pom.xml Mon Dec 17 22:26:09 2012
@@ -162,11 +162,11 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>compile</scope>
+ </dependency>
<!--
Oozie web-app module must exclude it.
@@ -224,9 +224,91 @@
</dependency>
<dependency>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ <version>0.8.0</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib-pig</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.pig</groupId>
+ <artifactId>pig</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -465,7 +547,6 @@
<exclude>**/TestRerun.java</exclude>
<exclude>**/TestCallableQueueService.java</exclude>
<exclude>**/TestSsh*.java</exclude>
- <exclude>**/TestHive*.java</exclude>
<exclude>**/TestSqoop*.java</exclude>
<exclude>**/TestActionErrors.java</exclude>
<exclude>**/TestJavaActionExecutor.java</exclude>
@@ -582,27 +663,6 @@
</dependencies>
</profile>
- <!-- Forcing antlr-runtime 3.0.1 for Hive action testcases -->
- <!-- This is required because Pig 0.9.0 requires 3.4 and -->
- <!-- Hive 0.9.0 requires 3.0.1 -->
- <profile>
- <id>testHive</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>testHive</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- <version>3.0.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
<!-- Forcing Hadoop 0.20.2-cdh3u2 version because Sqoop -->
<!-- uses Hadoop API that is avail 0.21 onwards and the -->
<!-- Hadoop CDH version is the only stable version that -->
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1423196&r1=1423195&r2=1423196&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
(original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java Mon Dec
17 22:26:09 2012
@@ -61,7 +61,6 @@ import org.apache.oozie.store.StoreExcep
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XLog;
-import org.junit.Assert;
/**
* Base JUnit <code>TestCase</code> subclass used by all Oozie testcases.
@@ -99,6 +98,10 @@ public abstract class XTestCase extends
OOZIE_SRC_DIR = new File(OOZIE_SRC_DIR, "core");
}
if (!OOZIE_SRC_DIR.exists()) {
+ OOZIE_SRC_DIR = OOZIE_SRC_DIR.getParentFile().getParentFile();
+ OOZIE_SRC_DIR = new File(OOZIE_SRC_DIR, "core");
+ }
+ if (!OOZIE_SRC_DIR.exists()) {
System.err.println();
System.err.println("Could not determine project root
directory");
System.err.println();
Modified: oozie/trunk/docs/src/site/twiki/ENG_Building.twiki
URL:
http://svn.apache.org/viewvc/oozie/trunk/docs/src/site/twiki/ENG_Building.twiki?rev=1423196&r1=1423195&r2=1423196&view=diff
==============================================================================
--- oozie/trunk/docs/src/site/twiki/ENG_Building.twiki (original)
+++ oozie/trunk/docs/src/site/twiki/ENG_Building.twiki Mon Dec 17 22:26:09 2012
@@ -197,15 +197,6 @@ file the following message 'SKIPPING TES
There are 2 testcases that use the *wordcount-simple* pipes binary,
*TestPipesMain* and *TestMapReduceActionExecutor*,
the 'SKIPPING TEST..." message would appear in the testcase log file of both
testcases.
----+++ Testing Hive Action
-
-Because of depedencies incompatibilities between Hive 0.9.0 and Pig 0.9.0 to
run Hive testcases a special profile
-must be used together with the name of the Hive testcases.
-
-<verbatim>
-$ mvn -DtestHive -Dtest=TestHiveActionExecutor,TestHiveMain
-</verbatim>
-
---+++ Testing Sqoop Action
Apache Sqoop 1.5.0 requires functionality only available in Hadoop 0.21 and
onwards. Currently, the only
@@ -217,10 +208,6 @@ purposes. *This is a temporary fix*.
$ mvn -DtestSqoop -Dtest=TestSqoopActionExecutor
</verbatim>
-<verbatim>
-$ mvn -DtestHive -Dtest=TestHiveActionExecutor,TestHiveMain
-</verbatim>
-
---++ Building an Oozie Distribution
An Oozie distribution bundles an embedded Tomcat server. The Oozie distro
module downloads Tomcat TAR.GZ from Apache
Modified: oozie/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1423196&r1=1423195&r2=1423196&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Mon Dec 17 22:26:09 2012
@@ -92,6 +92,7 @@
<module>hadooplibs</module>
<module>hbaselibs</module>
<module>core</module>
+ <module>tests</module>
<module>webapp</module>
<module>examples</module>
<module>docs</module>
@@ -825,9 +826,6 @@
-->
<exclude>**/TestSsh*.java</exclude>
- <!-- See 'testHive' profile in core/pom.xml and the
Building doc-->
- <exclude>**/TestHive*.java</exclude>
-
<!-- See 'testSqoop' profile in core/pom.xml and the
Building doc-->
<exclude>**/TestSqoop*.java</exclude>
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1423196&r1=1423195&r2=1423196&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Dec 17 22:26:09 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-1124 Split pig unit tests to a separate module (rohini via virag)
OOZIE-1087 Remove requirement of hive-default.xml from Hive action (rkanter)
OOZIE-1129 Add documentation for configurable filesystem support (rkanter)
OOZIE-1084 When use IBM jdk , UT TestCallbackServlet and TestHadoopELFunctions
fail (zhujinwei via rkanter)
Added: oozie/trunk/tests/pig/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/tests/pig/pom.xml?rev=1423196&view=auto
==============================================================================
--- oozie/trunk/tests/pig/pom.xml (added)
+++ oozie/trunk/tests/pig/pom.xml Mon Dec 17 22:26:09 2012
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-tests</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-tests-pig</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <description>Apache Oozie Tests For Pig</description>
+ <name>Apache Oozie Tests For Pig</name>
+ <packaging>jar</packaging>
+
+ <properties>
+
<oozie.test.default.config.file>${basedir}/../../core/src/test/resources/${oozie.test.db}-oozie-site.xml
+ </oozie.test.default.config.file>
+
<oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-sharelib-pig</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../core/src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>${basedir}/../../core/src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
+</project>
+
Added: oozie/trunk/tests/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/tests/pom.xml?rev=1423196&view=auto
==============================================================================
--- oozie/trunk/tests/pom.xml (added)
+++ oozie/trunk/tests/pom.xml Mon Dec 17 22:26:09 2012
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-main</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-tests</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <description>Apache Oozie Tests</description>
+ <name>Apache Oozie Tests</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>pig</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
