Skip to content

Commit

Permalink
Added UT for ConfigUtils.toMap and handled more edge cases
Browse files Browse the repository at this point in the history
  • Loading branch information
voonhou.su committed Jul 4, 2022
1 parent e095404 commit 396022e
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@ public static class HiveSyncConfigParams {
public String bucketSpec;
@Parameter(names = {"--sync-comment"}, description = "synchronize table comments to hive")
public Boolean syncComment;
@Parameter(names = {"--with-operation-field"}, description = "Whether to include the '_hoodie_operation' field in the metadata fields")
public Boolean withOperationField; // TODO remove this as it's not used

public boolean isHelp() {
return hoodieSyncConfigParams.isHelp();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ public static Map<String, String> toMap(String keyValueConfig) {
String[] keyvalues = keyValueConfig.split("\n");
Map<String, String> tableProperties = new HashMap<>();
for (String keyValue : keyvalues) {
// Handle multiple new lines and lines that contain only spaces after splitting
if (keyValue.trim().isEmpty()) {
continue;
}
String[] keyValueArray = keyValue.split("=");
if (keyValueArray.length == 1 || keyValueArray.length == 2) {
String key = keyValueArray[0].trim();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package org.apache.hudi.sync.common.util;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.Test;

public class TestConfigUtils {

@Test
public void testToMapSucceeds() {
Map<String, String> expectedMap = new HashMap<>();
expectedMap.put("k.1.1.2", "v1");
expectedMap.put("k.2.1.2", "v2");
expectedMap.put("k.3.1.2", "v3");

// Test base case
String srcKv = "k.1.1.2=v1\nk.2.1.2=v2\nk.3.1.2=v3";
Map<String, String> outMap = ConfigUtils.toMap(srcKv);
assertEquals(expectedMap, outMap);

// Test ends with new line
srcKv = "k.1.1.2=v1\nk.2.1.2=v2\nk.3.1.2=v3\n";
outMap = ConfigUtils.toMap(srcKv);
assertEquals(expectedMap, outMap);

// Test delimited by multiple new lines
srcKv = "k.1.1.2=v1\nk.2.1.2=v2\n\nk.3.1.2=v3";
outMap = ConfigUtils.toMap(srcKv);
assertEquals(expectedMap, outMap);

// Test delimited by multiple new lines with spaces in between
srcKv = "k.1.1.2=v1\n \nk.2.1.2=v2\n\nk.3.1.2=v3";
outMap = ConfigUtils.toMap(srcKv);
assertEquals(expectedMap, outMap);

// Test with random spaces if trim works properly
srcKv = " k.1.1.2 = v1\n k.2.1.2 = v2 \nk.3.1.2 = v3";
outMap = ConfigUtils.toMap(srcKv);
assertEquals(expectedMap, outMap);
}

@Test
public void testToMapThrowError() {
String srcKv = "k.1.1.2=v1=v1.1\nk.2.1.2=v2\nk.3.1.2=v3";
assertThrows(IllegalArgumentException.class, () -> ConfigUtils.toMap(srcKv));
}
}

0 comments on commit 396022e

Please sign in to comment.