[systemds] branch master updated: [MINOR] Fix federated component tests and frame csv reader robustness

[mboehm7]

This is an automated email from the ASF dual-hosted git repository.

mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/master by this push:
     new bcd4ead  [MINOR] Fix federated component tests and frame csv reader 
robustness
bcd4ead is described below

commit bcd4ead93b7927aed647024ed6e91ce95e72ffaf
Author: Matthias Boehm <mboe...@gmail.com>
AuthorDate: Thu Aug 20 01:23:49 2020 +0200

    [MINOR] Fix federated component tests and frame csv reader robustness
---
 src/main/java/org/apache/sysds/runtime/io/FrameReaderTextCSV.java   | 5 +++--
 .../sysds/test/component/federated/FederatedUrlParserTest.java      | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sysds/runtime/io/FrameReaderTextCSV.java 
b/src/main/java/org/apache/sysds/runtime/io/FrameReaderTextCSV.java
index 87e81c8..254f9fc 100644
--- a/src/main/java/org/apache/sysds/runtime/io/FrameReaderTextCSV.java
+++ b/src/main/java/org/apache/sysds/runtime/io/FrameReaderTextCSV.java
@@ -48,10 +48,11 @@ import org.apache.sysds.runtime.util.UtilFunctions;
  * 
  */
 public class FrameReaderTextCSV extends FrameReader {
-       protected FileFormatPropertiesCSV _props;
+       protected final FileFormatPropertiesCSV _props;
 
        public FrameReaderTextCSV(FileFormatPropertiesCSV props) {
-               _props = props;
+               //if unspecified use default properties for robustness
+               _props = props != null ? props : new FileFormatPropertiesCSV();
        }
 
        @Override
diff --git 
a/src/test/java/org/apache/sysds/test/component/federated/FederatedUrlParserTest.java
 
b/src/test/java/org/apache/sysds/test/component/federated/FederatedUrlParserTest.java
index edcc477..10e1e6b 100644
--- 
a/src/test/java/org/apache/sysds/test/component/federated/FederatedUrlParserTest.java
+++ 
b/src/test/java/org/apache/sysds/test/component/federated/FederatedUrlParserTest.java
@@ -67,7 +67,7 @@ public class FederatedUrlParserTest
                // Parse Ip normally, with filepath without port specified.
                String[] values = 
InitFEDInstruction.parseURL("123.123.41.22/file.txt");
                assertEquals("123.123.41.22", values[0]);
-               assertEquals(DMLConfig.DEFAULT_FEDERATED_PORT, values[1]);
+               assertEquals(String.valueOf(DMLConfig.DEFAULT_FEDERATED_PORT), 
values[1]);
                assertEquals("file.txt", values[2]);
        }
 
@@ -85,7 +85,7 @@ public class FederatedUrlParserTest
                // parse URL without port.
                String[] values = 
InitFEDInstruction.parseURL("hello.com/file.txt");
                assertEquals("hello.com", values[0]);
-               assertEquals(DMLConfig.DEFAULT_FEDERATED_PORT, values[1]);
+               assertEquals(String.valueOf(DMLConfig.DEFAULT_FEDERATED_PORT), 
values[1]);
                assertEquals("file.txt", values[2]);
        }
 
@@ -95,7 +95,7 @@ public class FederatedUrlParserTest
                // Here Japanese: Hello.World
                String[] values = 
InitFEDInstruction.parseURL("今日は.世界/file.txt");
                assertEquals("今日は.世界", values[0]);
-               assertEquals(DMLConfig.DEFAULT_FEDERATED_PORT, values[1]);
+               assertEquals(String.valueOf(DMLConfig.DEFAULT_FEDERATED_PORT), 
values[1]);
                assertEquals("file.txt", values[2]);
        }