diff --git a/nessie/src/test/java/org/apache/iceberg/nessie/BaseTestIceberg.java b/nessie/src/test/java/org/apache/iceberg/nessie/BaseTestIceberg.java index 8566bce67c12..f4ebfdc4be85 100644 --- a/nessie/src/test/java/org/apache/iceberg/nessie/BaseTestIceberg.java +++ b/nessie/src/test/java/org/apache/iceberg/nessie/BaseTestIceberg.java @@ -124,7 +124,7 @@ public void beforeEach(NessieClientFactory clientFactory, @NessieClientUri URI n Branch defaultBranch = api.getDefaultBranch(); initialHashOfDefaultBranch = defaultBranch.getHash(); if (!branch.equals(defaultBranch.getName())) { - api.createReference().reference(Branch.of(branch, null)).create(); + createBranch(branch, initialHashOfDefaultBranch); } hadoopConfig = new Configuration(); @@ -202,6 +202,10 @@ protected static Schema schema(int count) { return new Schema(Types.StructType.of(fields).fields()); } + void createBranch(String name) throws NessieNotFoundException, NessieConflictException { + createBranch(name, catalog.currentHash()); + } + void createBranch(String name, String hash) throws NessieNotFoundException, NessieConflictException { createBranch(name, hash, "main"); diff --git a/nessie/src/test/java/org/apache/iceberg/nessie/TestBranchVisibility.java b/nessie/src/test/java/org/apache/iceberg/nessie/TestBranchVisibility.java index 98e2834d6df4..31a6d57c9c02 100644 --- a/nessie/src/test/java/org/apache/iceberg/nessie/TestBranchVisibility.java +++ b/nessie/src/test/java/org/apache/iceberg/nessie/TestBranchVisibility.java @@ -67,7 +67,7 @@ public TestBranchVisibility() { public void before() throws NessieNotFoundException, NessieConflictException { createTable(tableIdentifier1, 1); // table 1 createTable(tableIdentifier2, 1); // table 2 - createBranch("test", catalog.currentHash()); + createBranch("test"); testCatalog = initCatalog("test"); } @@ -447,7 +447,7 @@ private void testCatalogEquality( @Test public void testWithRefAndHash() throws NessieConflictException, NessieNotFoundException { String testBranch = "testBranch"; - createBranch(testBranch, null); + createBranch(testBranch); Schema schema = new Schema(Types.StructType.of(required(1, "id", Types.LongType.get())).fields()); @@ -495,8 +495,8 @@ public void testWithRefAndHash() throws NessieConflictException, NessieNotFoundE public void testDifferentTableSameName() throws NessieConflictException, NessieNotFoundException { String branch1 = "branch1"; String branch2 = "branch2"; - createBranch(branch1, null); - createBranch(branch2, null); + createBranch(branch1); + createBranch(branch2); Schema schema1 = new Schema(Types.StructType.of(required(1, "id", Types.LongType.get())).fields()); Schema schema2 = diff --git a/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieIcebergClient.java b/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieIcebergClient.java index 12fa807dcfb6..f1d6159d93f1 100644 --- a/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieIcebergClient.java +++ b/nessie/src/test/java/org/apache/iceberg/nessie/TestNessieIcebergClient.java @@ -70,7 +70,7 @@ public void testWithReference() throws NessieNotFoundException { public void testWithReferenceAfterRecreatingBranch() throws NessieConflictException, NessieNotFoundException { String branch = "branchToBeDropped"; - createBranch(branch, null); + createBranch(branch); NessieIcebergClient client = new NessieIcebergClient(api, branch, null, ImmutableMap.of()); // just create a new commit on the branch and then delete & re-create it @@ -82,7 +82,7 @@ public void testWithReferenceAfterRecreatingBranch() .deleteBranch() .branch((Branch) client.getApi().getReference().refName(branch).get()) .delete(); - createBranch(branch, null); + createBranch(branch); // make sure the client uses the re-created branch Reference ref = client.getApi().getReference().refName(branch).get();