FALCON-1203 2 validateACL UTs broken. Contributed by Narayan Periwal.
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b36cd0..998c63d 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -101,6 +101,8 @@
(Suhas Vasu)
BUG FIXES
+ FALCON-1203 2 validateACL UTs broken(Narayan Periwal via Ajay Yadava)
+
FALCON-1423 HDFS recipe broken: Unrecognized option: -counterLogDir(Sowmya Ramesh via Ajay Yadava)
FALCON-1312 Falcon post processing action should use Oozie prepared configuration(Venkat Ranganathan via Ajay Yadava)
diff --git a/common/pom.xml b/common/pom.xml
index c5ae526..9799676 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -202,7 +202,15 @@
<exclude>**/log4j.xml</exclude>
</excludes>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
+
</project>
diff --git a/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java b/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java
index cf5a9b4..a36623c 100644
--- a/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java
+++ b/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java
@@ -30,6 +30,7 @@
import org.apache.falcon.entity.v0.process.Process;
import org.apache.falcon.hadoop.HadoopClientFactory;
import org.apache.falcon.security.CurrentUser;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -76,7 +77,7 @@
store = ConfigurationStore.get();
store.init();
- CurrentUser.authenticate("testuser");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_2);
}
protected void cleanupStore() throws FalconException {
diff --git a/common/src/test/java/org/apache/falcon/entity/FileSystemStorageTest.java b/common/src/test/java/org/apache/falcon/entity/FileSystemStorageTest.java
index 8b81a29..30edd94 100644
--- a/common/src/test/java/org/apache/falcon/entity/FileSystemStorageTest.java
+++ b/common/src/test/java/org/apache/falcon/entity/FileSystemStorageTest.java
@@ -35,6 +35,7 @@
import org.apache.falcon.expression.ExpressionHelper;
import org.apache.falcon.hadoop.HadoopClientFactory;
import org.apache.falcon.security.CurrentUser;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -58,7 +59,7 @@
*/
public class FileSystemStorageTest {
- private static final String USER = "falcon";
+ private static final String USER = FalconTestUtil.TEST_USER_1;
@BeforeClass
public void setUp() {
@@ -121,7 +122,7 @@
locations.add(location);
FileSystemStorage storage = new FileSystemStorage("hdfs://localhost:41020", locations);
- Assert.assertEquals(storage.getWorkingDir().toString(), "/user/falcon");
+ Assert.assertEquals(storage.getWorkingDir().toString(), "/user/" + FalconTestUtil.TEST_USER_1);
}
@Test
diff --git a/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java b/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
index 11e2df2..754fb06 100644
--- a/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
+++ b/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
@@ -41,6 +41,7 @@
import org.apache.falcon.entity.v0.feed.Validity;
import org.apache.falcon.group.FeedGroupMapTest;
import org.apache.falcon.security.CurrentUser;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.fs.Path;
import org.testng.Assert;
@@ -85,7 +86,7 @@
cluster.setName("backupCluster");
store.publish(EntityType.CLUSTER, cluster);
- CurrentUser.authenticate("testuser");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_2);
modifiableFeed = parser.parseAndValidate(this.getClass()
.getResourceAsStream(FEED_XML));
}
@@ -148,7 +149,7 @@
FeedHelper.createStorage(feed).getUriTemplate(LocationType.STATS));
assertEquals(feed.getACL().getGroup(), "group");
- assertEquals(feed.getACL().getOwner(), "testuser");
+ assertEquals(feed.getACL().getOwner(), FalconTestUtil.TEST_USER_2);
assertEquals(feed.getACL().getPermission(), "0x755");
assertEquals(feed.getSchema().getLocation(), "/schema/clicks");
diff --git a/common/src/test/java/org/apache/falcon/entity/parser/ProcessEntityParserTest.java b/common/src/test/java/org/apache/falcon/entity/parser/ProcessEntityParserTest.java
index 675fd46..6612b74 100644
--- a/common/src/test/java/org/apache/falcon/entity/parser/ProcessEntityParserTest.java
+++ b/common/src/test/java/org/apache/falcon/entity/parser/ProcessEntityParserTest.java
@@ -29,6 +29,7 @@
import org.apache.falcon.entity.v0.process.Input;
import org.apache.falcon.entity.v0.process.Process;
import org.apache.falcon.security.CurrentUser;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.fs.Path;
import org.testng.Assert;
@@ -383,7 +384,7 @@
StartupProperties.get().setProperty("falcon.security.authorization.enabled", "true");
Assert.assertTrue(Boolean.valueOf(
StartupProperties.get().getProperty("falcon.security.authorization.enabled")));
- CurrentUser.authenticate("falcon");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_1);
try {
// need a new parser since it caches authorization enabled flag
@@ -407,7 +408,7 @@
StartupProperties.get().setProperty("falcon.security.authorization.enabled", "true");
Assert.assertTrue(Boolean.valueOf(
StartupProperties.get().getProperty("falcon.security.authorization.enabled")));
- CurrentUser.authenticate("falcon");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_1);
try {
InputStream stream = this.getClass().getResourceAsStream("/config/process/process-table.xml");
diff --git a/common/src/test/java/org/apache/falcon/entity/store/FeedLocationStoreTest.java b/common/src/test/java/org/apache/falcon/entity/store/FeedLocationStoreTest.java
index 4c4b7f3..b94c248 100644
--- a/common/src/test/java/org/apache/falcon/entity/store/FeedLocationStoreTest.java
+++ b/common/src/test/java/org/apache/falcon/entity/store/FeedLocationStoreTest.java
@@ -31,6 +31,7 @@
import org.apache.falcon.entity.v0.feed.Locations;
import org.apache.falcon.security.CurrentUser;
import org.apache.falcon.util.FalconRadixUtils;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
@@ -66,7 +67,7 @@
store = ConfigurationStore.get();
store.init();
- CurrentUser.authenticate("testuser");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_2);
}
@BeforeMethod
diff --git a/common/src/test/java/org/apache/falcon/hadoop/HadoopClientFactoryTest.java b/common/src/test/java/org/apache/falcon/hadoop/HadoopClientFactoryTest.java
index 1cb08ac..6ef2710 100644
--- a/common/src/test/java/org/apache/falcon/hadoop/HadoopClientFactoryTest.java
+++ b/common/src/test/java/org/apache/falcon/hadoop/HadoopClientFactoryTest.java
@@ -20,6 +20,7 @@
import org.apache.falcon.cluster.util.EmbeddedCluster;
import org.apache.falcon.security.CurrentUser;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.ipc.RemoteException;
@@ -77,7 +78,7 @@
UserGroupInformation.setConfiguration(conf);
UserGroupInformation realUser = UserGroupInformation.createUserForTesting(
- "testuser", new String[]{"testgroup"});
+ FalconTestUtil.TEST_USER_2, new String[]{"testgroup"});
UserGroupInformation.createProxyUserForTesting("proxyuser", realUser, new String[]{"proxygroup"});
URI uri = new URI(conf.get(HadoopClientFactory.FS_DEFAULT_NAME_KEY));
@@ -91,7 +92,7 @@
Configuration conf = embeddedCluster.getConf();
UserGroupInformation realUser = UserGroupInformation.createUserForTesting(
- "testuser", new String[]{"testgroup"});
+ FalconTestUtil.TEST_USER_2, new String[]{"testgroup"});
UserGroupInformation.createProxyUserForTesting("proxyuser", realUser, new String[]{"proxygroup"});
UserGroupInformation.setConfiguration(conf);
diff --git a/common/src/test/java/org/apache/falcon/security/AuthenticationInitializationServiceTest.java b/common/src/test/java/org/apache/falcon/security/AuthenticationInitializationServiceTest.java
index 9b76a61..7979fe0 100644
--- a/common/src/test/java/org/apache/falcon/security/AuthenticationInitializationServiceTest.java
+++ b/common/src/test/java/org/apache/falcon/security/AuthenticationInitializationServiceTest.java
@@ -19,6 +19,7 @@
package org.apache.falcon.security;
import org.apache.falcon.FalconException;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
@@ -123,20 +124,21 @@
public void testInitForKerberosAuthenticationMethod() throws FalconException {
Mockito.when(mockLoginUser.getAuthenticationMethod())
.thenReturn(UserGroupInformation.AuthenticationMethod.KERBEROS);
- Mockito.when(mockLoginUser.getUserName()).thenReturn("falcon");
+ Mockito.when(mockLoginUser.getUserName()).thenReturn(FalconTestUtil.TEST_USER_1);
Mockito.when(mockLoginUser.isFromKeytab()).thenReturn(Boolean.TRUE);
StartupProperties.get().setProperty(SecurityUtil.AUTHENTICATION_TYPE,
KerberosAuthenticationHandler.TYPE);
StartupProperties.get().setProperty(
AuthenticationInitializationService.KERBEROS_KEYTAB, "falcon.kerberos.keytab");
- StartupProperties.get().setProperty(AuthenticationInitializationService.KERBEROS_PRINCIPAL, "falcon");
+ StartupProperties.get().setProperty(AuthenticationInitializationService.KERBEROS_PRINCIPAL,
+ FalconTestUtil.TEST_USER_1);
authenticationService.init();
Assert.assertTrue(mockLoginUser.isFromKeytab());
Assert.assertEquals(mockLoginUser.getAuthenticationMethod().name(),
KerberosAuthenticationHandler.TYPE);
- Assert.assertEquals("falcon", mockLoginUser.getUserName());
+ Assert.assertEquals(FalconTestUtil.TEST_USER_1, mockLoginUser.getUserName());
}
}
diff --git a/common/src/test/java/org/apache/falcon/security/CurrentUserTest.java b/common/src/test/java/org/apache/falcon/security/CurrentUserTest.java
index 9a3f365..5780c94 100644
--- a/common/src/test/java/org/apache/falcon/security/CurrentUserTest.java
+++ b/common/src/test/java/org/apache/falcon/security/CurrentUserTest.java
@@ -19,6 +19,7 @@
package org.apache.falcon.security;
import org.apache.falcon.cluster.util.EntityBuilderTestUtil;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
@@ -59,13 +60,13 @@
@Test (expectedExceptions = IllegalStateException.class)
public void testProxyBadUser() throws Exception {
- CurrentUser.authenticate("falcon");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_1);
CurrentUser.proxy("", "");
}
@Test (expectedExceptions = IllegalStateException.class)
public void testProxyWithNoAuth() throws Exception {
- CurrentUser.proxy("falcon", "falcon");
+ CurrentUser.proxy(FalconTestUtil.TEST_USER_1, "falcon");
}
@Test
@@ -91,15 +92,15 @@
@Test
public void testProxySameUser() throws Exception {
- CurrentUser.authenticate("falcon");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_1);
- CurrentUser.proxy("falcon", "users");
+ CurrentUser.proxy(FalconTestUtil.TEST_USER_1, "users");
UserGroupInformation proxyUgi = CurrentUser.getProxyUGI();
Assert.assertNotNull(proxyUgi);
- Assert.assertEquals(proxyUgi.getUserName(), "falcon");
+ Assert.assertEquals(proxyUgi.getUserName(), FalconTestUtil.TEST_USER_1);
- Assert.assertEquals(CurrentUser.getAuthenticatedUser(), "falcon");
- Assert.assertEquals(CurrentUser.getUser(), "falcon");
+ Assert.assertEquals(CurrentUser.getAuthenticatedUser(), FalconTestUtil.TEST_USER_1);
+ Assert.assertEquals(CurrentUser.getUser(), FalconTestUtil.TEST_USER_1);
}
@Test
diff --git a/common/src/test/java/org/apache/falcon/security/DefaultAuthorizationProviderTest.java b/common/src/test/java/org/apache/falcon/security/DefaultAuthorizationProviderTest.java
index 162be12..3a6d8c0 100644
--- a/common/src/test/java/org/apache/falcon/security/DefaultAuthorizationProviderTest.java
+++ b/common/src/test/java/org/apache/falcon/security/DefaultAuthorizationProviderTest.java
@@ -30,6 +30,7 @@
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.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AuthorizationException;
@@ -57,7 +58,7 @@
@BeforeClass
public void setUp() throws Exception {
- realUser = UserGroupInformation.createUserForTesting("falcon", new String[]{"falcon", });
+ realUser = UserGroupInformation.createUserForTesting(FalconTestUtil.TEST_USER_1, new String[]{"falcon", });
CurrentUser.authenticate(EntityBuilderTestUtil.USER);
org.testng.Assert.assertEquals(CurrentUser.getUser(), EntityBuilderTestUtil.USER);
diff --git a/common/src/test/java/org/apache/falcon/security/SecurityUtilTest.java b/common/src/test/java/org/apache/falcon/security/SecurityUtilTest.java
index 6e77462..e40308e 100644
--- a/common/src/test/java/org/apache/falcon/security/SecurityUtilTest.java
+++ b/common/src/test/java/org/apache/falcon/security/SecurityUtilTest.java
@@ -22,6 +22,7 @@
import org.apache.falcon.FalconException;
import org.apache.falcon.entity.v0.process.ACL;
import org.apache.falcon.entity.v0.process.Process;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.mockito.Mockito;
import org.testng.Assert;
@@ -101,12 +102,12 @@
Assert.assertEquals(CurrentUser.getUser(), currentUser);
ACL acl = new ACL();
- acl.setOwner("testuser");
+ acl.setOwner(FalconTestUtil.TEST_USER_2);
acl.setGroup("users");
Mockito.when(process.getACL()).thenReturn(acl);
// When ACL is specified
SecurityUtil.tryProxy(process);
- Assert.assertEquals(CurrentUser.getUser(), "testuser");
+ Assert.assertEquals(CurrentUser.getUser(), FalconTestUtil.TEST_USER_2);
}
}
diff --git a/common/src/test/java/org/apache/falcon/util/FalconTestUtil.java b/common/src/test/java/org/apache/falcon/util/FalconTestUtil.java
new file mode 100644
index 0000000..2a890ae
--- /dev/null
+++ b/common/src/test/java/org/apache/falcon/util/FalconTestUtil.java
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+
+package org.apache.falcon.util;
+
+/**
+ * Utilities for falcon unit tests.
+ */
+public final class FalconTestUtil {
+
+ public static final String TEST_USER_1 = "falcon-ut-user";
+ public static final String TEST_USER_2 = "testuser-ut-user";
+
+ private FalconTestUtil() {
+ //default constructor to avoid
+ }
+
+}
diff --git a/common/src/test/resources/config/cluster/cluster-no-registry.xml b/common/src/test/resources/config/cluster/cluster-no-registry.xml
index 86ee02d..d3def81 100644
--- a/common/src/test/resources/config/cluster/cluster-no-registry.xml
+++ b/common/src/test/resources/config/cluster/cluster-no-registry.xml
@@ -35,7 +35,7 @@
<location name="temp" path="/tmp"/>
<location name="working" path="/projects/falcon/working"/>
</locations>
- <ACL owner="falcon" group="falcon"/>
+ <ACL owner="falcon-ut-user" group="falcon"/>
<properties>
<property name="field1" value="value1"/>
<property name="field2" value="value2"/>
diff --git a/common/src/test/resources/config/feed/feed-0.1.xml b/common/src/test/resources/config/feed/feed-0.1.xml
index f8518c5..6448803 100644
--- a/common/src/test/resources/config/feed/feed-0.1.xml
+++ b/common/src/test/resources/config/feed/feed-0.1.xml
@@ -58,6 +58,6 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/common/src/test/resources/config/feed/feed-0.2.xml b/common/src/test/resources/config/feed/feed-0.2.xml
index 8bf7d20..c067c7b 100644
--- a/common/src/test/resources/config/feed/feed-0.2.xml
+++ b/common/src/test/resources/config/feed/feed-0.2.xml
@@ -58,6 +58,6 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/common/src/test/resources/config/feed/feed-tags-0.1.xml b/common/src/test/resources/config/feed/feed-tags-0.1.xml
index 8429f61..fb9161d 100644
--- a/common/src/test/resources/config/feed/feed-tags-0.1.xml
+++ b/common/src/test/resources/config/feed/feed-tags-0.1.xml
@@ -55,6 +55,6 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/common/src/test/resources/config/feed/hive-table-feed-out.xml b/common/src/test/resources/config/feed/hive-table-feed-out.xml
index 17eb954..b814354 100644
--- a/common/src/test/resources/config/feed/hive-table-feed-out.xml
+++ b/common/src/test/resources/config/feed/hive-table-feed-out.xml
@@ -40,6 +40,6 @@
<table uri="catalog:default:clicks-summary#ds=${YEAR}-${MONTH}-${DAY}-${HOUR}" />
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/common/src/test/resources/config/feed/hive-table-feed.xml b/common/src/test/resources/config/feed/hive-table-feed.xml
index 67b3f4e..80d0dae 100644
--- a/common/src/test/resources/config/feed/hive-table-feed.xml
+++ b/common/src/test/resources/config/feed/hive-table-feed.xml
@@ -37,6 +37,6 @@
<table uri="catalog:default:clicks#ds=${YEAR}-${MONTH}-${DAY}-${HOUR}" />
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/common/src/test/resources/config/feed/invalid-feed.xml b/common/src/test/resources/config/feed/invalid-feed.xml
index b7273a9..7320efc 100644
--- a/common/src/test/resources/config/feed/invalid-feed.xml
+++ b/common/src/test/resources/config/feed/invalid-feed.xml
@@ -48,6 +48,6 @@
</locations>
<table uri="catalog:default:clicks#ds=$YEAR-$MONTH-$DAY-$HOUR" />
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml b/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml
index f84f3d4..319359f 100644
--- a/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml
+++ b/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml
@@ -48,6 +48,6 @@
<table uri="catalog:default:clicks#ds=$YEAR-$MONTH-$DAY-$HOUR" />
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/common/src/test/resources/config/process/process-table.xml b/common/src/test/resources/config/process/process-table.xml
index bcaf28e..f9d8aa5 100644
--- a/common/src/test/resources/config/process/process-table.xml
+++ b/common/src/test/resources/config/process/process-table.xml
@@ -45,5 +45,5 @@
<retry policy="periodic" delay="minutes(10)" attempts="3"/>
<!-- ACL -->
- <ACL owner="falcon" group="falcon" permission="*"/>
+ <ACL owner="falcon-ut-user" group="falcon" permission="*"/>
</process>
diff --git a/messaging/pom.xml b/messaging/pom.xml
index 238083a..99ae728 100644
--- a/messaging/pom.xml
+++ b/messaging/pom.xml
@@ -73,6 +73,14 @@
<dependency>
<groupId>org.apache.falcon</groupId>
+ <artifactId>falcon-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.falcon</groupId>
<artifactId>falcon-test-util</artifactId>
<scope>test</scope>
</dependency>
diff --git a/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java b/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java
index 8f9d227..2f2c604 100644
--- a/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java
+++ b/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java
@@ -35,6 +35,7 @@
import org.apache.activemq.util.ByteArrayInputStream;
import org.apache.falcon.cluster.util.EmbeddedCluster;
import org.apache.falcon.hadoop.HadoopClientFactory;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.workflow.WorkflowExecutionArgs;
import org.apache.falcon.workflow.WorkflowExecutionContext;
import org.apache.hadoop.conf.Configuration;
@@ -83,7 +84,7 @@
"-" + WorkflowExecutionArgs.OUTPUT_FEED_PATHS.getName(),
"/click-logs/10/05/05/00/20",
"-" + WorkflowExecutionArgs.WORKFLOW_ID.getName(), "workflow-01-00",
- "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), "falcon",
+ "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), FalconTestUtil.TEST_USER_1,
"-" + WorkflowExecutionArgs.RUN_ID.getName(), "1",
"-" + WorkflowExecutionArgs.NOMINAL_TIME.getName(), "2011-01-01-01-00",
"-" + WorkflowExecutionArgs.TIMESTAMP.getName(), "2012-01-01-01-00",
@@ -202,7 +203,7 @@
Assert.assertEquals(m.getString(WorkflowExecutionArgs.WORKFLOW_ID.getName()),
"workflow-01-00");
Assert.assertEquals(m.getString(WorkflowExecutionArgs.WORKFLOW_USER.getName()),
- "falcon");
+ FalconTestUtil.TEST_USER_1);
Assert.assertEquals(m.getString(WorkflowExecutionArgs.RUN_ID.getName()), "1");
Assert.assertEquals(m.getString(WorkflowExecutionArgs.NOMINAL_TIME.getName()),
"2011-01-01-01-00");
diff --git a/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java b/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java
index 9d49b25..5bbcc87 100644
--- a/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java
+++ b/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageConsumerTest.java
@@ -22,6 +22,7 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.jmx.BrokerView;
import org.apache.falcon.FalconException;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.workflow.WorkflowExecutionArgs;
import org.apache.falcon.workflow.WorkflowExecutionContext;
import org.apache.falcon.workflow.WorkflowJobEndNotificationService;
@@ -117,7 +118,7 @@
message.put(WorkflowExecutionArgs.WORKFLOW_ID.getName(), "workflow-" + i);
message.put(WorkflowExecutionArgs.TOPIC_NAME.getName(), TOPIC_NAME);
message.put(WorkflowExecutionArgs.STATUS.getName(), i != 15 ? "SUCCEEDED" : "FAILED");
- message.put(WorkflowExecutionArgs.WORKFLOW_USER.getName(), "falcon");
+ message.put(WorkflowExecutionArgs.WORKFLOW_USER.getName(), FalconTestUtil.TEST_USER_1);
String[] args = new String[message.size() * 2];
int index = 0;
diff --git a/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageProducerTest.java b/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageProducerTest.java
index 2d27ce3..980835e 100644
--- a/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageProducerTest.java
+++ b/messaging/src/test/java/org/apache/falcon/messaging/JMSMessageProducerTest.java
@@ -20,6 +20,7 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.workflow.WorkflowExecutionArgs;
import org.apache.falcon.workflow.WorkflowExecutionContext;
import org.testng.Assert;
@@ -146,7 +147,7 @@
private List<String> createCommonArgs() {
return new ArrayList<String>(Arrays.asList(
"-" + WorkflowExecutionArgs.WORKFLOW_ID.getName(), "workflow-01-00",
- "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), "falcon",
+ "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), FalconTestUtil.TEST_USER_1,
"-" + WorkflowExecutionArgs.RUN_ID.getName(), "1",
"-" + WorkflowExecutionArgs.NOMINAL_TIME.getName(), "2011-01-01-01-00",
"-" + WorkflowExecutionArgs.TIMESTAMP.getName(), "2012-01-01-01-00",
diff --git a/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java b/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java
index 77274ef..e18d35d 100644
--- a/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java
+++ b/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java
@@ -20,6 +20,7 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.workflow.WorkflowExecutionArgs;
import org.apache.falcon.workflow.WorkflowExecutionContext;
import org.apache.commons.lang3.StringUtils;
@@ -60,7 +61,7 @@
"-" + WorkflowExecutionArgs.OUTPUT_FEED_NAMES.getName(), StringUtils.join(outputFeedNames, ","),
"-" + WorkflowExecutionArgs.OUTPUT_FEED_PATHS.getName(), StringUtils.join(outputFeedPaths, ","),
"-" + WorkflowExecutionArgs.WORKFLOW_ID.getName(), "workflow-01-00",
- "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), "falcon",
+ "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), FalconTestUtil.TEST_USER_1,
"-" + WorkflowExecutionArgs.RUN_ID.getName(), "1",
"-" + WorkflowExecutionArgs.NOMINAL_TIME.getName(), "2011-01-01-01-00",
"-" + WorkflowExecutionArgs.TIMESTAMP.getName(), "2012-01-01-01-00",
@@ -153,7 +154,7 @@
Assert.assertEquals(m.getString(WorkflowExecutionArgs.WORKFLOW_ID.getName()),
"workflow-01-00");
Assert.assertEquals(m.getString(WorkflowExecutionArgs.WORKFLOW_USER.getName()),
- "falcon");
+ FalconTestUtil.TEST_USER_1);
Assert.assertEquals(m.getString(WorkflowExecutionArgs.RUN_ID.getName()), "1");
Assert.assertEquals(m.getString(WorkflowExecutionArgs.NOMINAL_TIME.getName()),
"2011-01-01-01-00");
diff --git a/oozie/pom.xml b/oozie/pom.xml
index b452c1d..90b468b 100644
--- a/oozie/pom.xml
+++ b/oozie/pom.xml
@@ -49,6 +49,14 @@
<dependencies>
<dependency>
<groupId>org.apache.falcon</groupId>
+ <artifactId>falcon-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.falcon</groupId>
<artifactId>falcon-oozie-el-extension</artifactId>
</dependency>
diff --git a/oozie/src/test/java/org/apache/falcon/oozie/process/OozieProcessWorkflowBuilderTest.java b/oozie/src/test/java/org/apache/falcon/oozie/process/OozieProcessWorkflowBuilderTest.java
index 3aaf304..d727ca3 100644
--- a/oozie/src/test/java/org/apache/falcon/oozie/process/OozieProcessWorkflowBuilderTest.java
+++ b/oozie/src/test/java/org/apache/falcon/oozie/process/OozieProcessWorkflowBuilderTest.java
@@ -53,6 +53,7 @@
import org.apache.falcon.oozie.workflow.WORKFLOWAPP;
import org.apache.falcon.security.CurrentUser;
import org.apache.falcon.security.SecurityUtil;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.OozieUtils;
import org.apache.falcon.util.StartupProperties;
import org.apache.falcon.workflow.WorkflowExecutionArgs;
@@ -94,7 +95,7 @@
@BeforeClass
public void setUpDFS() throws Exception {
- CurrentUser.authenticate("falcon");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_1);
Configuration conf = EmbeddedCluster.newCluster("testCluster").getConf();
hdfsUrl = conf.get(HadoopClientFactory.FS_DEFAULT_NAME_KEY);
diff --git a/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java b/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java
index 0a9aaa0..9d31d17 100644
--- a/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java
+++ b/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java
@@ -20,6 +20,7 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.falcon.entity.ClusterHelper;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.workflow.FalconPostProcessing;
import org.apache.falcon.workflow.WorkflowExecutionArgs;
import org.apache.commons.lang3.StringUtils;
@@ -62,7 +63,7 @@
"-" + WorkflowExecutionArgs.OUTPUT_FEED_NAMES.getName(), StringUtils.join(outputFeedNames, ","),
"-" + WorkflowExecutionArgs.OUTPUT_FEED_PATHS.getName(), StringUtils.join(outputFeedPaths, ","),
"-" + WorkflowExecutionArgs.WORKFLOW_ID.getName(), "workflow-01-00",
- "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), "falcon",
+ "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), FalconTestUtil.TEST_USER_1,
"-" + WorkflowExecutionArgs.RUN_ID.getName(), "1",
"-" + WorkflowExecutionArgs.NOMINAL_TIME.getName(), "2011-01-01-01-00",
"-" + WorkflowExecutionArgs.TIMESTAMP.getName(), "2012-01-01-01-00",
@@ -203,7 +204,7 @@
Assert.assertEquals(m.getString(WorkflowExecutionArgs.ENTITY_NAME.getName()), "agg-coord");
String workflowUser = m.getString(WorkflowExecutionArgs.WORKFLOW_USER.getName());
if (workflowUser != null) { // in case of user message, its NULL
- Assert.assertEquals(workflowUser, "falcon");
+ Assert.assertEquals(workflowUser, FalconTestUtil.TEST_USER_1);
}
Assert.assertEquals(m.getString(WorkflowExecutionArgs.NOMINAL_TIME.getName()), "2011-01-01-01-00");
Assert.assertEquals(m.getString(WorkflowExecutionArgs.TIMESTAMP.getName()), "2012-01-01-01-00");
@@ -228,7 +229,7 @@
"-" + WorkflowExecutionArgs.OUTPUT_FEED_PATHS.getName(),
"/out-click-logs/10/05/05/00/20,/out-raw-logs/10/05/05/00/20",
"-" + WorkflowExecutionArgs.WORKFLOW_ID.getName(), "workflow-01-00",
- "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), "falcon",
+ "-" + WorkflowExecutionArgs.WORKFLOW_USER.getName(), FalconTestUtil.TEST_USER_1,
"-" + WorkflowExecutionArgs.RUN_ID.getName(), "1",
"-" + WorkflowExecutionArgs.NOMINAL_TIME.getName(), "2011-01-01-01-00",
"-" + WorkflowExecutionArgs.TIMESTAMP.getName(), "2012-01-01-01-00",
diff --git a/oozie/src/test/resources/config/feed/feed-0.1.xml b/oozie/src/test/resources/config/feed/feed-0.1.xml
index fb9b707..4317974 100644
--- a/oozie/src/test/resources/config/feed/feed-0.1.xml
+++ b/oozie/src/test/resources/config/feed/feed-0.1.xml
@@ -53,7 +53,7 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
<properties>
diff --git a/oozie/src/test/resources/config/feed/hive-table-feed-out.xml b/oozie/src/test/resources/config/feed/hive-table-feed-out.xml
index bd93a01..24a7bb3 100644
--- a/oozie/src/test/resources/config/feed/hive-table-feed-out.xml
+++ b/oozie/src/test/resources/config/feed/hive-table-feed-out.xml
@@ -38,6 +38,6 @@
<table uri="catalog:default:clicks-summary#ds=${YEAR}-${MONTH}-${DAY}-${HOUR}" />
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/oozie/src/test/resources/config/feed/hive-table-feed.xml b/oozie/src/test/resources/config/feed/hive-table-feed.xml
index 66d0742..07e2ac4 100644
--- a/oozie/src/test/resources/config/feed/hive-table-feed.xml
+++ b/oozie/src/test/resources/config/feed/hive-table-feed.xml
@@ -38,6 +38,6 @@
<table uri="catalog:default:clicks#ds=${YEAR}-${MONTH}-${DAY}-${HOUR}" />
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/oozie/src/test/resources/config/late/late-feed1.xml b/oozie/src/test/resources/config/late/late-feed1.xml
index c500c4c..c97b687 100644
--- a/oozie/src/test/resources/config/late/late-feed1.xml
+++ b/oozie/src/test/resources/config/late/late-feed1.xml
@@ -43,7 +43,7 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
<properties>
diff --git a/oozie/src/test/resources/config/late/late-feed2.xml b/oozie/src/test/resources/config/late/late-feed2.xml
index 6ccffe2..5c7c3a2 100644
--- a/oozie/src/test/resources/config/late/late-feed2.xml
+++ b/oozie/src/test/resources/config/late/late-feed2.xml
@@ -43,7 +43,7 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
<properties>
diff --git a/oozie/src/test/resources/config/late/late-feed3.xml b/oozie/src/test/resources/config/late/late-feed3.xml
index 239f140..938fd65 100644
--- a/oozie/src/test/resources/config/late/late-feed3.xml
+++ b/oozie/src/test/resources/config/late/late-feed3.xml
@@ -43,7 +43,7 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
<properties>
diff --git a/oozie/src/test/resources/feed/feed.xml b/oozie/src/test/resources/feed/feed.xml
index baa8f26..6e31262 100644
--- a/oozie/src/test/resources/feed/feed.xml
+++ b/oozie/src/test/resources/feed/feed.xml
@@ -44,7 +44,7 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
<properties>
diff --git a/oozie/src/test/resources/feed/table-replication-feed.xml b/oozie/src/test/resources/feed/table-replication-feed.xml
index 4c610f6..8401251 100644
--- a/oozie/src/test/resources/feed/table-replication-feed.xml
+++ b/oozie/src/test/resources/feed/table-replication-feed.xml
@@ -36,7 +36,7 @@
<table uri="catalog:source_db:source_clicks_table#ds=${YEAR}${MONTH}${DAY};region=${region}" />
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/prism/pom.xml b/prism/pom.xml
index 75baf81..ba91733 100644
--- a/prism/pom.xml
+++ b/prism/pom.xml
@@ -52,6 +52,14 @@
<dependency>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.falcon</groupId>
+ <artifactId>falcon-common</artifactId>
<exclusions>
<exclusion>
<groupId>javax.servlet.jsp</groupId>
diff --git a/prism/src/test/java/org/apache/falcon/plugin/ChainableMonitoringPluginTest.java b/prism/src/test/java/org/apache/falcon/plugin/ChainableMonitoringPluginTest.java
index a0f6a81..fb73523 100644
--- a/prism/src/test/java/org/apache/falcon/plugin/ChainableMonitoringPluginTest.java
+++ b/prism/src/test/java/org/apache/falcon/plugin/ChainableMonitoringPluginTest.java
@@ -23,6 +23,7 @@
import org.apache.falcon.aspect.GenericAlert;
import org.apache.falcon.aspect.ResourceMessage;
import org.apache.falcon.entity.v0.SchemaHelper;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
@@ -49,7 +50,7 @@
GenericAlert.instrumentFailedInstance("cluster", "process", "agg-coord", "120:df",
"ef-id", "wf-user", "1", "DELETE", "now", "error", "none", 1242);
GenericAlert.alertJMSMessageConsumerFailed("test-alert", new Exception("test"));
- GenericAlert.audit("falcon", "127.0.0.1", "localhost", "test-action", "127.0.0.1",
+ GenericAlert.audit(FalconTestUtil.TEST_USER_1, "127.0.0.1", "localhost", "test-action", "127.0.0.1",
SchemaHelper.formatDateUTC(new Date()));
}
diff --git a/prism/src/test/java/org/apache/falcon/security/FalconAuditFilterTest.java b/prism/src/test/java/org/apache/falcon/security/FalconAuditFilterTest.java
index 0022451..6673ad2 100644
--- a/prism/src/test/java/org/apache/falcon/security/FalconAuditFilterTest.java
+++ b/prism/src/test/java/org/apache/falcon/security/FalconAuditFilterTest.java
@@ -18,6 +18,7 @@
package org.apache.falcon.security;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.security.UserGroupInformation;
import org.mockito.Mock;
@@ -68,7 +69,7 @@
filter.init(mockConfig);
}
- Mockito.when(mockRequest.getRemoteUser()).thenReturn("falcon");
+ Mockito.when(mockRequest.getRemoteUser()).thenReturn(FalconTestUtil.TEST_USER_1);
Mockito.when(mockRequest.getRemoteHost()).thenReturn("http://remotehost");
Mockito.when(mockRequest.getRequestURI()).thenReturn("http://127.0.0.1:15000");
filter.doFilter(mockRequest, mockResponse, mockChain);
@@ -106,7 +107,7 @@
filter.init(mockConfig);
}
- Mockito.when(mockRequest.getRemoteUser()).thenReturn("falcon");
+ Mockito.when(mockRequest.getRemoteUser()).thenReturn(FalconTestUtil.TEST_USER_1);
Mockito.when(mockRequest.getRequestURI()).thenReturn("http://127.0.0.1:15000");
Mockito.when(mockRequest.getQueryString()).thenReturn("user.name=guest");
filter.doFilter(mockRequest, mockResponse, mockChain);
diff --git a/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java b/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java
index 9e8c76a..df85529 100644
--- a/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java
+++ b/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java
@@ -18,6 +18,7 @@
package org.apache.falcon.security;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
@@ -103,10 +104,10 @@
CurrentUser.authenticate("nouser");
Assert.assertEquals(CurrentUser.getUser(), "nouser");
- CurrentUser.authenticate("testuser");
- Mockito.when(mockRequest.getRemoteUser()).thenReturn("testuser");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_2);
+ Mockito.when(mockRequest.getRemoteUser()).thenReturn(FalconTestUtil.TEST_USER_2);
filter.doFilter(mockRequest, mockResponse, mockChain);
- Assert.assertEquals(CurrentUser.getUser(), "testuser");
+ Assert.assertEquals(CurrentUser.getUser(), FalconTestUtil.TEST_USER_2);
}
@Test
@@ -120,10 +121,10 @@
CurrentUser.authenticate("nouser");
Assert.assertEquals(CurrentUser.getUser(), "nouser");
- CurrentUser.authenticate("testuser");
- Mockito.when(mockRequest.getRemoteUser()).thenReturn("testuser");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_2);
+ Mockito.when(mockRequest.getRemoteUser()).thenReturn(FalconTestUtil.TEST_USER_2);
filter.doFilter(mockRequest, mockResponse, mockChain);
- Assert.assertEquals(CurrentUser.getUser(), "testuser");
+ Assert.assertEquals(CurrentUser.getUser(), FalconTestUtil.TEST_USER_2);
}
@Test
diff --git a/prism/src/test/java/org/apache/falcon/security/FalconAuthorizationFilterTest.java b/prism/src/test/java/org/apache/falcon/security/FalconAuthorizationFilterTest.java
index 27b64e9..6b66407 100644
--- a/prism/src/test/java/org/apache/falcon/security/FalconAuthorizationFilterTest.java
+++ b/prism/src/test/java/org/apache/falcon/security/FalconAuthorizationFilterTest.java
@@ -22,6 +22,7 @@
import org.apache.falcon.entity.store.ConfigurationStore;
import org.apache.falcon.entity.v0.EntityType;
import org.apache.falcon.entity.v0.cluster.Cluster;
+import org.apache.falcon.util.FalconTestUtil;
import org.apache.falcon.util.StartupProperties;
import org.apache.hadoop.security.UserGroupInformation;
import org.mockito.Mock;
@@ -204,7 +205,7 @@
@Test
public void testDoFilterForEntityWithInvalidEntity() throws Exception {
- CurrentUser.authenticate("falcon");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_1);
StartupProperties.get().setProperty("falcon.security.authorization.enabled", "true");
@@ -231,7 +232,7 @@
@Test
public void testDoFilterForDeleteEntityInvalidEntity() throws Exception {
- CurrentUser.authenticate("falcon");
+ CurrentUser.authenticate(FalconTestUtil.TEST_USER_1);
StartupProperties.get().setProperty("falcon.security.authorization.enabled", "true");
diff --git a/rerun/pom.xml b/rerun/pom.xml
index 67efab9..7a46c35 100644
--- a/rerun/pom.xml
+++ b/rerun/pom.xml
@@ -51,6 +51,14 @@
<dependency>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.falcon</groupId>
+ <artifactId>falcon-common</artifactId>
</dependency>
<dependency>
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 6b6b834..3c53833 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
@@ -20,6 +20,7 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.falcon.rerun.event.LaterunEvent;
import org.apache.falcon.rerun.event.RerunEvent;
+import org.apache.falcon.util.FalconTestUtil;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -51,7 +52,7 @@
RerunEvent event = new LaterunEvent("clusterName", "wfId",
System.currentTimeMillis(), 60 * 1000, "entityType",
- "entityName", "instance", 0, "falcon");
+ "entityName", "instance", 0, FalconTestUtil.TEST_USER_1);
try {
activeMQueue.offer(event);
diff --git a/rerun/src/test/java/org/apache/falcon/rerun/queue/InMemoryQueueTest.java b/rerun/src/test/java/org/apache/falcon/rerun/queue/InMemoryQueueTest.java
index 8508d37..4b179d3 100644
--- a/rerun/src/test/java/org/apache/falcon/rerun/queue/InMemoryQueueTest.java
+++ b/rerun/src/test/java/org/apache/falcon/rerun/queue/InMemoryQueueTest.java
@@ -19,6 +19,7 @@
import org.apache.falcon.FalconException;
import org.apache.falcon.rerun.event.RerunEvent;
+import org.apache.falcon.util.FalconTestUtil;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -45,7 +46,7 @@
long time = System.currentTimeMillis();
int delay = ((5 - index) / 2) * 50;
MyEvent event = new MyEvent("someCluster", Integer.toString(index),
- time, delay, "someType", "someName", "someInstance", 0, "falcon");
+ time, delay, "someType", "someName", "someInstance", 0, FalconTestUtil.TEST_USER_1);
queue.offer(event);
boolean inserted = false;
for (int posn = 0; posn < events.size(); posn++) {
diff --git a/rerun/src/test/resources/feed-template.xml b/rerun/src/test/resources/feed-template.xml
index c3f2834..3d9639c 100644
--- a/rerun/src/test/resources/feed-template.xml
+++ b/rerun/src/test/resources/feed-template.xml
@@ -38,7 +38,7 @@
<location type="meta" path="/projects/falcon/clicksMetaData"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x755"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x755"/>
<schema location="/schema/clicks" provider="protobuf"/>
</feed>
diff --git a/src/main/examples/entity/filesystem/in-feed.xml b/src/main/examples/entity/filesystem/in-feed.xml
index 4c433cb..798de9c 100644
--- a/src/main/examples/entity/filesystem/in-feed.xml
+++ b/src/main/examples/entity/filesystem/in-feed.xml
@@ -34,6 +34,6 @@
<location type="data" path="/data/in/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x644"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x644"/>
<schema location="/schema/log/log.format.csv" provider="csv"/>
</feed>
diff --git a/src/main/examples/entity/filesystem/out-feed.xml b/src/main/examples/entity/filesystem/out-feed.xml
index 4275df8..f537bbc 100644
--- a/src/main/examples/entity/filesystem/out-feed.xml
+++ b/src/main/examples/entity/filesystem/out-feed.xml
@@ -34,6 +34,6 @@
<location type="data" path="/data/out/${YEAR}/${MONTH}/${DAY}/${HOUR}"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x644"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x644"/>
<schema location="/schema/out/out.format.csv" provider="csv"/>
</feed>
diff --git a/src/main/examples/entity/filesystem/replication-feed.xml b/src/main/examples/entity/filesystem/replication-feed.xml
index ccf5cca..7387d45 100644
--- a/src/main/examples/entity/filesystem/replication-feed.xml
+++ b/src/main/examples/entity/filesystem/replication-feed.xml
@@ -41,6 +41,6 @@
<location type="data" path="/data/in/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}"/>
</locations>
- <ACL owner="testuser" group="group" permission="0x644"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x644"/>
<schema location="/schema/log/log.format.csv" provider="csv"/>
</feed>
diff --git a/src/main/examples/entity/hcat/hcat-in-feed.xml b/src/main/examples/entity/hcat/hcat-in-feed.xml
index 5b2c998..f978e8c 100644
--- a/src/main/examples/entity/hcat/hcat-in-feed.xml
+++ b/src/main/examples/entity/hcat/hcat-in-feed.xml
@@ -32,6 +32,6 @@
<table uri="catalog:default:in_table#ds=${YEAR}-${MONTH}-${DAY}-${HOUR}-${MINUTE}" />
- <ACL owner="testuser" group="group" permission="0x644"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x644"/>
<schema location="/schema/log/log.format.csv" provider="csv"/>
</feed>
diff --git a/src/main/examples/entity/hcat/hcat-out-feed.xml b/src/main/examples/entity/hcat/hcat-out-feed.xml
index befd88f..23b22b9 100644
--- a/src/main/examples/entity/hcat/hcat-out-feed.xml
+++ b/src/main/examples/entity/hcat/hcat-out-feed.xml
@@ -30,6 +30,6 @@
<table uri="catalog:default:out_table#ds=${YEAR}-${MONTH}-${DAY}-${HOUR}-${MINUTE}" />
- <ACL owner="testuser" group="group" permission="0x644"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x644"/>
<schema location="/schema/out/out.format.csv" provider="csv"/>
</feed>
diff --git a/src/main/examples/entity/hcat/hcat-replication-feed.xml b/src/main/examples/entity/hcat/hcat-replication-feed.xml
index 2b43d28..2b8f026 100644
--- a/src/main/examples/entity/hcat/hcat-replication-feed.xml
+++ b/src/main/examples/entity/hcat/hcat-replication-feed.xml
@@ -37,6 +37,6 @@
<table uri="catalog:default:in_table#ds=${YEAR}-${MONTH}-${DAY}-${HOUR}-${MINUTE}" />
- <ACL owner="testuser" group="group" permission="0x644"/>
+ <ACL owner="testuser-ut-user" group="group" permission="0x644"/>
<schema location="/schema/log/log.format.csv" provider="csv"/>
</feed>
