svn commit: r1239559 - in /whirr/trunk: CHANGES.txt services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java

[asavu]

Author: asavu
Date: Thu Feb  2 11:44:32 2012
New Revision: 1239559

URL: http://svn.apache.org/viewvc?rev=1239559&view=rev
Log:
WHIRR-493. Test override number of mappers for Hadoop (asavu)

Modified:
    whirr/trunk/CHANGES.txt
    
whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java

Modified: whirr/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1239559&r1=1239558&r2=1239559&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Thu Feb  2 11:44:32 2012
@@ -34,6 +34,8 @@ Trunk (unreleased changes)
 
     WHIRR-497. Update maven plugins & project deps (asavu)
 
+    WHIRR-493. Test override number of mappers for Hadoop (asavu)
+
   BUG FIXES
 
     WHIRR-367. Wrong groupId for zookeeper (Joe Crobak via asavu)

Modified: 
whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java?rev=1239559&r1=1239558&r2=1239559&view=diff
==============================================================================
--- 
whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java
 (original)
+++ 
whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java
 Thu Feb  2 11:44:32 2012
@@ -18,19 +18,11 @@
 
 package org.apache.whirr.service.hadoop;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
 import com.google.common.collect.ImmutableSet.Builder;
-
-import java.util.List;
-
+import com.google.common.collect.Iterators;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.whirr.Cluster;
@@ -49,6 +41,13 @@ import org.jclouds.domain.Credentials;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.List;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class HadoopConfigurationBuilderTest {
 
   static class RegexMatcher extends BaseMatcher<String> {
@@ -159,6 +158,16 @@ public class HadoopConfigurationBuilderT
     assertThat(conf.getString("mapred.tasktracker.reduce.tasks.maximum"), 
is("3"));
     assertThat(conf.getString("mapred.reduce.tasks"), is("15"));
   }
+
+  @Test
+  public void testOverridesNumberOfMappers() throws Exception {
+    Configuration overrides = new PropertiesConfiguration();
+    
overrides.addProperty("hadoop-mapreduce.mapred.tasktracker.map.tasks.maximum", 
"70");
+    clusterSpec = ClusterSpec.withNoDefaults(overrides);
+    Configuration conf = 
HadoopConfigurationBuilder.buildMapReduceConfiguration(
+        clusterSpec, cluster, defaults);
+    assertThat(conf.getString("mapred.tasktracker.map.tasks.maximum"), 
is("70"));
+  }
   
   @Test
   public void testOverridesNumberOfReducers() throws Exception {