You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2015/04/10 22:33:29 UTC

svn commit: r1672756 - /uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java

Author: schor
Date: Fri Apr 10 20:33:29 2015
New Revision: 1672756

URL: http://svn.apache.org/r1672756
Log:
[UIMA-4281] more conservative approach to shrinking internal data structures at reeset time - fix a test case to correspond to new method

Modified:
    uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java

Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java?rev=1672756&r1=1672755&r2=1672756&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasResetResizeTest.java Fri Apr 10 20:33:29 2015
@@ -89,11 +89,10 @@ public class CasResetResizeTest extends
       
 //      int[] expected = new int[] {8300000, 8300000, 3800000, 1300000, 400000, 200000, 100000, 50000};  // for doubling
       
-      int[] expected = {12800000, 12800000, 6400000, 3200000, 1600000, 800000, 400000, 200000};    // for 1 step
-      for (int i = 0; i < 8; i++) {
-        cas.reset();
-        heapSize = ((CASImpl) cas).getHeap().getHeapSize();
-        assertEquals(expected[i], heapSize);       
+      int[] expected = {6400000, 3200000, 1600000, 800000, 400000, 200000};    // for 1 step
+      resets(cas, 20, 12800000);
+      for (int i = 0; i < 6; i++) {
+        resets(cas, 5, expected[i]);
       }
 
       //If instead we create the annotations in smaller chunks and reset each time,
@@ -114,5 +113,16 @@ public class CasResetResizeTest extends
       JUnitExtension.handleException(e);
     }
   }
+  
+  void resets(CAS cas, int n, int expected) {
+    for (int i = 0; i < n; i++) {
+      cas.reset();
+    }
+    int heapSize = ((CASImpl) cas).getHeap().getHeapSize();
+//    System.out.format("Actual: %,d expected: %,d%n", heapSize, expected);
+    assertEquals(expected, heapSize);       
+  }
+  
+  
 
 }