Skip to content

Commit 806bdf9

Browse files
authored
fix failing NewTableConfigurationIT (#6037)
1 parent 9ffe92b commit 806bdf9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,12 @@ public void testConflictsWithDefaults() throws Exception {
536536
var iterator1 = new IteratorSetting(20, "foo", "foo.bar");
537537
var exception = assertThrows(IllegalStateException.class, () -> client.tableOperations()
538538
.create(table, new NewTableConfiguration().attachIterator(iterator1)));
539-
assertTrue(exception.getMessage().contains("iterator priority conflict"));
539+
assertTrue(exception.getMessage().contains("conflict with default table iterator"));
540540
// add an iterator with same name as the default iterator
541541
var iterator2 = new IteratorSetting(10, "vers", "foo.bar");
542542
exception = assertThrows(IllegalStateException.class, () -> client.tableOperations()
543543
.create(table, new NewTableConfiguration().attachIterator(iterator2)));
544-
assertTrue(exception.getMessage().contains("iterator name conflict"));
544+
assertTrue(exception.getMessage().contains("conflict with default table iterator"));
545545
// try to attach the exact default iterators, should not present a conflict as they are
546546
// equivalent to what would be added
547547
IteratorConfigUtil.getInitialTableIteratorSettings().forEach((setting, scopes) -> {
@@ -563,15 +563,15 @@ public void testConflictsWithDefaults() throws Exception {
563563
}
564564
exception = assertThrows(IllegalStateException.class, () -> client.tableOperations()
565565
.create(table2, new NewTableConfiguration().setProperties(props)));
566-
assertTrue(exception.getMessage().contains("iterator priority conflict"));
566+
assertTrue(exception.getMessage().contains("conflict with default table iterator"));
567567
props.clear();
568568
// add an iterator with same name as the default iterator
569569
for (IteratorScope iterScope : IteratorScope.values()) {
570570
props.put(Property.TABLE_ITERATOR_PREFIX + iterScope.name() + ".vers", "10,foo.bar");
571571
}
572572
exception = assertThrows(IllegalStateException.class, () -> client.tableOperations()
573573
.create(table2, new NewTableConfiguration().setProperties(props)));
574-
assertTrue(exception.getMessage().contains("iterator name conflict"));
574+
assertTrue(exception.getMessage().contains("conflict with default table iterator"));
575575
props.clear();
576576
// try to attach the exact default iterators, should not present a conflict as they are
577577
// equivalent to what would be added

0 commit comments

Comments
 (0)