From e128c7dc2696bba126ca0281073e872a2c9b9ab8 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Wed, 13 Nov 2013 17:39:52 +0000
Subject: [PATCH] SP-1001 / BIS-578 : Column index is out of range when listing
nodes using PathInfoProviderBasedHierarchicalContent - fix unit tests
SVN: 30142
---
.../systemtests/PathInfoDatabaseTest.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/PathInfoDatabaseTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/PathInfoDatabaseTest.java
index c1c5b517129..f6751130b76 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/PathInfoDatabaseTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/PathInfoDatabaseTest.java
@@ -21,6 +21,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -318,12 +319,18 @@ public class PathInfoDatabaseTest extends SystemTestCase
{
Assert.assertEquals(actualFiles.size(), expectedRelativePaths.length);
- for (int i = 0; i < expectedRelativePaths.length; i++)
+ if (actualFiles.size() > 0)
{
- String expectedRelativePath = expectedRelativePaths[i];
- DataSetPathInfo actualFile = actualFiles.get(i);
+ String[] actualRelativePaths = new String[actualFiles.size()];
- Assert.assertEquals(actualFile.getRelativePath(), expectedRelativePath);
+ for (int i = 0; i < actualFiles.size(); i++)
+ {
+ actualRelativePaths[i] = actualFiles.get(i).getRelativePath();
+ }
+
+ Arrays.sort(actualRelativePaths);
+ Arrays.sort(expectedRelativePaths);
+ Assert.assertEquals(actualRelativePaths, expectedRelativePaths);
}
}
--
GitLab