fix unit tests

apache · Jan 30, 2024 · 9e0a8c8 · 9e0a8c8
1 parent c3d7ce6
commit 9e0a8c8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/api/src/main/java/com/datastrato/gravitino/NameIdentifier.java b/api/src/main/java/com/datastrato/gravitino/NameIdentifier.java
@@ -97,14 +97,14 @@ public static NameIdentifier ofTable(
   }
 
   /**
-   * Create the table {@link NameIdentifier} with the given metalake, catalog, schema and fileset
+   * Create the fileset {@link NameIdentifier} with the given metalake, catalog, schema and fileset
    * name.
    *
    * @param metalake The metalake name
    * @param catalog The catalog name
    * @param schema The schema name
    * @param fileset The fileset name
-   * @return The created table {@link NameIdentifier}
+   * @return The created fileset {@link NameIdentifier}
    */
   public static NameIdentifier ofFileset(
       String metalake, String catalog, String schema, String fileset) {

diff --git a/api/src/main/java/com/datastrato/gravitino/Namespace.java b/api/src/main/java/com/datastrato/gravitino/Namespace.java
@@ -97,7 +97,7 @@ public static Namespace ofTable(String metalake, String catalog, String schema)
    * @param metalake The metalake name
    * @param catalog The catalog name
    * @param schema The schema name
-   * @return A namespace for table
+   * @return A namespace for fileset
    */
   public static Namespace ofFileset(String metalake, String catalog, String schema) {
     return of(metalake, catalog, schema);

diff --git a/common/src/main/java/com/datastrato/gravitino/dto/requests/FilesetUpdateRequest.java b/common/src/main/java/com/datastrato/gravitino/dto/requests/FilesetUpdateRequest.java
@@ -14,6 +14,7 @@
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
 
@@ -35,6 +36,7 @@ public interface FilesetUpdateRequest extends RESTRequest {
   FilesetChange filesetChange();
 
   @EqualsAndHashCode
+  @NoArgsConstructor(force = true)
   @AllArgsConstructor
   @ToString
   class RenameFilesetRequest implements FilesetUpdateRequest {
@@ -56,6 +58,7 @@ public void validate() throws IllegalArgumentException {
   }
 
   @EqualsAndHashCode
+  @NoArgsConstructor(force = true)
   @AllArgsConstructor
   @ToString
   class UpdateFilesetCommentRequest implements FilesetUpdateRequest {
@@ -78,6 +81,7 @@ public void validate() throws IllegalArgumentException {
   }
 
   @EqualsAndHashCode
+  @NoArgsConstructor(force = true)
   @AllArgsConstructor
   @ToString
   class SetFilesetPropertiesRequest implements FilesetUpdateRequest {
@@ -104,6 +108,7 @@ public void validate() throws IllegalArgumentException {
   }
 
   @EqualsAndHashCode
+  @NoArgsConstructor(force = true)
   @AllArgsConstructor
   @ToString
   class RemoveFilesetPropertiesRequest implements FilesetUpdateRequest {

diff --git a/common/src/main/java/com/datastrato/gravitino/dto/requests/FilesetUpdatesRequest.java b/common/src/main/java/com/datastrato/gravitino/dto/requests/FilesetUpdatesRequest.java
@@ -8,7 +8,6 @@
 import com.datastrato.gravitino.rest.RESTRequest;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -17,7 +16,7 @@
 
 @Getter
 @EqualsAndHashCode
-@NoArgsConstructor(access = AccessLevel.PRIVATE, force = true)
+@NoArgsConstructor(force = true)
 @AllArgsConstructor
 @ToString
 public class FilesetUpdatesRequest implements RESTRequest {

diff --git a/server/src/test/java/com/datastrato/gravitino/server/web/rest/TestFilesetOperations.java b/server/src/test/java/com/datastrato/gravitino/server/web/rest/TestFilesetOperations.java
@@ -150,7 +150,7 @@ public void loadFileset() {
     when(dispatcher.loadFileset(any())).thenReturn(fileset);
 
     Response resp =
-        target(filesetPath(metalake, catalog, schema) + "table1")
+        target(filesetPath(metalake, catalog, schema) + "fileset1")
             .request(MediaType.APPLICATION_JSON_TYPE)
             .accept("application/vnd.gravitino.v1+json")
             .get();
@@ -166,32 +166,31 @@ public void loadFileset() {
     Assertions.assertEquals(fileset.properties(), filesetDTO.properties());
 
     // Test throw NoSuchFilesetException
-    when(dispatcher.loadFileset(any()))
-        .thenThrow(new NoSuchFilesetException("no such fileset error"));
+    doThrow(new NoSuchFilesetException("no found")).when(dispatcher).loadFileset(any());
     Response resp1 =
-        target(filesetPath(metalake, catalog, schema) + "table1")
+        target(filesetPath(metalake, catalog, schema) + "fileset1")
             .request(MediaType.APPLICATION_JSON_TYPE)
             .accept("application/vnd.gravitino.v1+json")
             .get();
-    Assertions.assertEquals(Response.Status.NOT_FOUND.getStatusCode(), resp.getStatus());
+    Assertions.assertEquals(Response.Status.NOT_FOUND.getStatusCode(), resp1.getStatus());
 
     ErrorResponse errorResp = resp1.readEntity(ErrorResponse.class);
     Assertions.assertEquals(ErrorConstants.NOT_FOUND_CODE, errorResp.getCode());
     Assertions.assertEquals(NoSuchFilesetException.class.getSimpleName(), errorResp.getType());
 
     // Test throw RuntimeException
-    when(dispatcher.loadFileset(any())).thenThrow(new NoSuchFilesetException("internal error"));
+    doThrow(new RuntimeException("internal error")).when(dispatcher).loadFileset(any());
     Response resp2 =
-        target(filesetPath(metalake, catalog, schema) + "table1")
+        target(filesetPath(metalake, catalog, schema) + "fileset1")
             .request(MediaType.APPLICATION_JSON_TYPE)
             .accept("application/vnd.gravitino.v1+json")
             .get();
     Assertions.assertEquals(
-        Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), resp.getStatus());
+        Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), resp2.getStatus());
 
     ErrorResponse errorResp2 = resp2.readEntity(ErrorResponse.class);
     Assertions.assertEquals(ErrorConstants.INTERNAL_ERROR_CODE, errorResp2.getCode());
-    Assertions.assertEquals(NoSuchFilesetException.class.getSimpleName(), errorResp2.getType());
+    Assertions.assertEquals(RuntimeException.class.getSimpleName(), errorResp2.getType());
   }
 
   @Test
@@ -441,7 +440,7 @@ private void assertUpdateFileset(FilesetUpdatesRequest req, Fileset updatedFiles
 
     FilesetDTO filesetDTO = filesetResp.getFileset();
     Assertions.assertEquals(updatedFileset.name(), filesetDTO.name());
-    Assertions.assertEquals(updatedFileset.comment(), filesetDTO.name());
+    Assertions.assertEquals(updatedFileset.comment(), filesetDTO.comment());
     Assertions.assertEquals(updatedFileset.type(), filesetDTO.type());
     Assertions.assertEquals(updatedFileset.properties(), filesetDTO.properties());
   }