Import Debian changes 0.7.1-1

elki (0.7.1-1) unstable; urgency=low

  * New upstream release (mostly bug fixes)
  * Drop patches included upstream
  * Build-dep on default-jdk instead of openjdk7-jdk (Closes: #814163)

1 files changed, 121 insertions, 0 deletions

diff --git a/elki/src/test/java/de/lmu/ifi/dbs/elki/persistent/OnDiskArrayTest.java b/elki/src/test/java/de/lmu/ifi/dbs/elki/persistent/OnDiskArrayTest.java
new file mode 100755
index 00000000..a67ad5e6
--- /dev/null
+++ b/elki/src/test/java/de/lmu/ifi/dbs/elki/persistent/OnDiskArrayTest.java
@@ -0,0 +1,121 @@
+package de.lmu.ifi.dbs.elki.persistent;
+
+/*
+ This file is part of ELKI:
+ Environment for Developing KDD-Applications Supported by Index-Structures
+
+ Copyright (C) 2015
+ Ludwig-Maximilians-Universität München
+ Lehr- und Forschungseinheit für Datenbanksysteme
+ ELKI Development Team
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import de.lmu.ifi.dbs.elki.JUnit4Test;
+
+/**
+ * Test to validate proper OnDiskArray operation.
+ * 
+ * @author Erich Schubert
+ * @since 0.2
+ */
+// TODO: also test with a static sample file.
+public class OnDiskArrayTest implements JUnit4Test {
+  File file = new File("OnDiskArrayTestFile.test.dat");
+
+  /**
+   * Check that we don't overwrite any file.
+   * 
+   * @throws Exception on errors.
+   */
+  @Before
+  public void safetyCheck() throws Exception {
+    if(file.exists()) {
+      Assert.fail("Could not run test - test file already exists.");
+    }
+  }
+
+  /**
+   * Clean up afterwards
+   * 
+   * @throws Exception on errors.
+   */
+  @After
+  public void cleanup() throws Exception {
+    if(file != null && file.exists()) {
+      if(!file.delete()) {
+        Assert.fail("Error cleaning up: can't remove test file.");
+      }
+    }
+  }
+
+  /**
+   * Test the OnDiskArray class.
+   * 
+   * @throws IOException on errors.
+   */
+  @Test
+  public void dotestOnDiskArray() throws IOException {
+    final int extraheadersize = 2;
+    final int recsize = 3;
+    int numrec = 4;
+    // Only applicable to the version we are testing.
+    final int ODR_HEADER_SIZE = 4 * 4;
+    OnDiskArray array = new OnDiskArray(file, 1, extraheadersize, recsize, numrec);
+    byte[] header = { 42, 23 };
+    array.getExtraHeader().put(header);
+    byte[] record1 = { 31, 41, 59 };
+    byte[] record2 = { 26, 53, 58 };
+    array.getRecordBuffer(0).put(record1);
+    array.getRecordBuffer(1).put(record2);
+    array.getRecordBuffer(2).put(record2);
+    array.getRecordBuffer(3).put(record1);
+    array.resizeFile(5);
+    numrec = 5;
+    array.getRecordBuffer(4).put(record1);
+    array.close();
+
+    // validate file size
+    Assert.assertEquals("File size doesn't match.", ODR_HEADER_SIZE + extraheadersize + recsize * numrec, file.length());
+
+    OnDiskArray roarray = new OnDiskArray(file, 1, 2, 3, false);
+    Assert.assertEquals("Number of records incorrect.", numrec, roarray.getNumRecords());
+
+    byte[] buf = new byte[recsize];
+    ByteBuffer hbuf = roarray.getExtraHeader();
+    for(int i = 0; i < header.length; i++) {
+      Assert.assertEquals("Header doesn't match.", header[i], hbuf.get());
+    }
+    roarray.getRecordBuffer(0).get(buf);
+    Assert.assertArrayEquals("Record 0 doesn't match.", record1, buf);
+    roarray.getRecordBuffer(4).get(buf);
+    Assert.assertArrayEquals("Record 4 doesn't match.", record1, buf);
+    roarray.getRecordBuffer(1).get(buf);
+    Assert.assertArrayEquals("Record 1 doesn't match.", record2, buf);
+    roarray.getRecordBuffer(2).get(buf);
+    Assert.assertArrayEquals("Record 2 doesn't match.", record2, buf);
+    roarray.getRecordBuffer(3).get(buf);
+    Assert.assertArrayEquals("Record 3 doesn't match.", record1, buf);
+  }
+}
\ No newline at end of file