Change in asterixdb[master]: Read Test Resources as UTF-8

2016-08-19 Thread Michael Blow (Code Review) 
Michael Blow has submitted this change and it was merged.

Change subject: Read Test Resources as UTF-8
..


Read Test Resources as UTF-8

Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1090
Sonar-Qube: Jenkins 
Reviewed-by: Till Westmann 
Tested-by: Jenkins 
---
M 
asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Till Westmann: Looks good to me, approved
  Jenkins: Verified; No violations found



diff --git 
a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
 
b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
index 45a5fc4..3321065 100644
--- 
a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
+++ 
b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
@@ -23,7 +23,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
@@ -423,8 +422,9 @@
 // and returns the contents as a string
 // This string is later passed to REST API for execution.
 public String readTestFile(File testFile) throws Exception {
-BufferedReader reader = new BufferedReader(new FileReader(testFile));
-String line = null;
+BufferedReader reader =
+new BufferedReader(new InputStreamReader(new 
FileInputStream(testFile), StandardCharsets.UTF_8));
+String line;
 StringBuilder stringBuilder = new StringBuilder();
 String ls = System.getProperty("line.separator");
 while ((line = reader.readLine()) != null) {

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1090
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann

Change in asterixdb[master]: Read Test Resources as UTF-8

2016-08-19 Thread Till Westmann (Code Review) 
Till Westmann has posted comments on this change.

Change subject: Read Test Resources as UTF-8
..


Patch Set 2: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1090
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: Read Test Resources as UTF-8

2016-08-19 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Read Test Resources as UTF-8
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2303/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1090
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: Read Test Resources as UTF-8

2016-08-19 Thread Michael Blow (Code Review) 
Hello Till Westmann, Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1090

to look at the new patch set (#2).

Change subject: Read Test Resources as UTF-8
..

Read Test Resources as UTF-8

Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
---
M 
asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/90/1090/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1090
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann

Change in asterixdb[master]: Read Test Resources as UTF-8

2016-08-18 Thread Till Westmann (Code Review) 
Till Westmann has posted comments on this change.

Change subject: Read Test Resources as UTF-8
..


Patch Set 1: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1090
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: Read Test Resources as UTF-8

2016-08-18 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Read Test Resources as UTF-8
..


Patch Set 1: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/363/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1090
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Read Test Resources as UTF-8

2016-08-18 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Read Test Resources as UTF-8
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2283/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1090
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Read Test Resources as UTF-8

2016-08-18 Thread Michael Blow (Code Review) 
Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1090

Change subject: Read Test Resources as UTF-8
..

Read Test Resources as UTF-8

Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
---
M 
asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/90/1090/1

diff --git 
a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
 
b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
index 6bfbd64..3bac454 100644
--- 
a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
+++ 
b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
@@ -23,7 +23,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
@@ -413,8 +412,9 @@
 // and returns the contents as a string
 // This string is later passed to REST API for execution.
 public String readTestFile(File testFile) throws Exception {
-BufferedReader reader = new BufferedReader(new FileReader(testFile));
-String line = null;
+BufferedReader reader =
+new BufferedReader(new InputStreamReader(new 
FileInputStream(testFile), StandardCharsets.UTF_8));
+String line;
 StringBuilder stringBuilder = new StringBuilder();
 String ls = System.getProperty("line.separator");
 while ((line = reader.readLine()) != null) {

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1090
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow