You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2012/06/22 12:42:57 UTC

svn commit: r1352835 - in /mahout/trunk/math/src: main/java/org/apache/mahout/math/list/ObjectArrayList.java test/java/org/apache/mahout/math/list/ test/java/org/apache/mahout/math/list/ObjectArrayListTest.java

Author: ssc
Date: Fri Jun 22 10:42:56 2012
New Revision: 1352835

URL: http://svn.apache.org/viewvc?rev=1352835&view=rev
Log:
MAHOUT-889 size() returns wrong value (10) on freshly instantiated ObjectArrayList

Added:
    mahout/trunk/math/src/test/java/org/apache/mahout/math/list/
    mahout/trunk/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java
Modified:
    mahout/trunk/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java?rev=1352835&r1=1352834&r2=1352835&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java Fri Jun 22 10:42:56 2012
@@ -69,7 +69,8 @@ public class ObjectArrayList<T> extends 
    */
   @SuppressWarnings("unchecked")
   public ObjectArrayList(int initialCapacity) {
-    elements((T[])new Object[initialCapacity]);
+    elements = new Object[initialCapacity];
+    size = 0;
   }
 
   /**

Added: mahout/trunk/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java?rev=1352835&view=auto
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java (added)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java Fri Jun 22 10:42:56 2012
@@ -0,0 +1,54 @@
+/**
+ * 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.mahout.math.list;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/** tests for {@link ObjectArrayList}*/
+public class ObjectArrayListTest {
+
+  @Test
+  public void emptyOnCreation() {
+    ObjectArrayList<String> list = new ObjectArrayList<String>();
+    assertTrue(list.isEmpty());
+    assertEquals(0, list.size());
+    list.add("1");
+    list.add("2");
+    list.add("3");
+    assertEquals(3, list.size());
+  }
+
+  @Test
+  public void correctSizeAfterInstantiation() {
+    ObjectArrayList<String> list = new ObjectArrayList<String>(100);
+    assertTrue(list.isEmpty());
+    assertEquals(0, list.size());
+  }
+
+  @Test
+  public void correctSizeAfterInstantiationWithElements() {
+    ObjectArrayList<String> list = new ObjectArrayList<String>(new String[] { "1", "2", "3" });
+    assertFalse(list.isEmpty());
+    assertEquals(3, list.size());
+  }
+
+}