removed MapUtils

src/test/java/org/scribe/extractors/BaseStringExtractorTest.java

@@ -41,7 +41,7 @@ public class BaseStringExtractorTest
     OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");
     extractor.extract(request);
   }
-  
+
   @Test
   public void shouldProperlyEncodeSpaces()
   {

src/test/java/org/scribe/model/ParameterListTest.java

@@ -1,12 +1,17 @@
 package org.scribe.model;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.scribe.utils.URLUtils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
 /**
  * @author: Pablo Fernandez
  */
@@ -59,4 +64,33 @@ public class ParameterListTest
     url = params.appendTo(url);
     Assert.assertEquals(url, expectedUrl);
   }
+
+  @Test
+  public void shouldProperlySortParameters()
+  {
+    params.add("param1", "v1");
+    params.add("param6", "v2");
+    params.add("a_param", "v3");
+    params.add("param2", "v4");
+    Assert.assertEquals("a_param=v3&param1=v1&param2=v4&param6=v2", params.sort().asFormUrlEncodedString());
+  }
+
+  @Test
+  public void shouldProperlySortParametersWithTheSameName()
+  {
+    params.add("param1", "v1");
+    params.add("param6", "v2");
+    params.add("a_param", "v3");
+    params.add("param2", "v4");
+    Assert.assertEquals("a_param=v3&param1=v1&param2=v4&param6=v2", params.sort().asFormUrlEncodedString());
+  }
+
+  @Test
+  public void shouldNotModifyTheOriginalParameterList()
+  {
+    params.add("param1", "v1");
+    params.add("param6", "v2");
+
+    assertNotSame(params, params.sort());
+  }
 }

src/test/java/org/scribe/utils/MapUtilsTest.java

@@ -1,53 +0,0 @@
-package org.scribe.utils;
-
-import static org.junit.Assert.*;
-
-import java.util.*;
-
-import org.junit.*;
-
-public class MapUtilsTest
-{
-
-  private Map<String, String> unsorted;
-
-  @Before
-  public void setup()
-  {
-    unsorted = new LinkedHashMap<String, String>();
-    unsorted.put("d", "fourth");
-    unsorted.put("a", "first");
-    unsorted.put("c", "third");
-    unsorted.put("b", "second");
-  }
-
-  @Test
-  public void shouldSortMap()
-  {
-    Map<String, String> sorted = MapUtils.sort(unsorted);
-    List<String> values = new ArrayList<String>(sorted.values());
-    assertEquals("first", values.get(0));
-    assertEquals("second", values.get(1));
-    assertEquals("third", values.get(2));
-    assertEquals("fourth", values.get(3));
-  }
-
-  @Test
-  public void shouldNotModifyTheOriginalMap()
-  {
-    Map<String, String> sorted = MapUtils.sort(unsorted);
-    assertNotSame(sorted, unsorted);
-
-    List<String> values = new ArrayList<String>(unsorted.values());
-    assertEquals("fourth", values.get(0));
-    assertEquals("first", values.get(1));
-    assertEquals("third", values.get(2));
-    assertEquals("second", values.get(3));
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void shouldThrowExceptionForNullMap()
-  {
-    MapUtils.sort(null);
-  }
-}