Skip to content

Commit b7bea83

Browse files
Fix some tests
1 parent b38af02 commit b7bea83

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
141141

142142
var cacheHashtable = MultipleQueriesFixture.GetHashTableUsedAsQueryCache(Sfi);
143143
var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
144-
var cachedQuery = (IList)cachedListEntry[1];
144+
// The first element is a timestamp, the second is aliases, then only we have the cached data.
145+
var cachedQuery = (IList)cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
145146

146147
var firstQueryResults = (IList)cachedQuery[0];
147148
firstQueryResults.Clear();

src/NHibernate.Test/QueryTest/MultipleMixedQueriesFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
7171

7272
var cacheHashtable = MultipleQueriesFixture.GetHashTableUsedAsQueryCache(Sfi);
7373
var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
74-
var cachedQuery = (IList)cachedListEntry[1];
74+
// The first element is a timestamp, the second is aliases, then only we have the cached data.
75+
var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
7576

7677
var firstQueryResults = (IList)cachedQuery[0];
7778
firstQueryResults.Clear();

src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
7474

7575
var cacheHashtable = GetHashTableUsedAsQueryCache(Sfi);
7676
var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
77-
var cachedQuery = (IList)cachedListEntry[1];
77+
// The first element is a timestamp, the second is aliases, then only we have the cached data.
78+
var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
7879

7980
var firstQueryResults = (IList)cachedQuery[0];
8081
firstQueryResults.Clear();

0 commit comments

Comments
 (0)