DRILL-1497: Fix test failure in o.a.drill.jdbc.test.TestMetadataDDL

Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/d29c7c4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/d29c7c4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/d29c7c4a

Branch: refs/heads/master
Commit: d29c7c4ad02462a0d005363393a599a869b09d89
Parents: 7715543
Author: Aditya Kishore <adi...@maprtech.com>
Authored: Fri Oct 3 18:37:01 2014 -0700
Committer: Aditya Kishore <adi...@maprtech.com>
Committed: Thu Oct 9 13:59:14 2014 -0700

----------------------------------------------------------------------
 .../org/apache/drill/jdbc/test/JdbcAssert.java  |  45 ++++-
 .../apache/drill/jdbc/test/TestMetadataDDL.java | 168 +++++++++----------
 2 files changed, 127 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d29c7c4a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java 
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
index 8f2ddd9..49d7c11 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -39,6 +40,8 @@ import org.junit.Assert;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSet.Builder;
 import com.google.common.collect.Iterables;
 
 /**
@@ -93,6 +96,19 @@ public class JdbcAssert {
     return buf.toString();
   }
 
+  static Set<String> toStringSet(ResultSet resultSet) throws SQLException {
+    Builder<String> builder = ImmutableSet.builder();
+    final List<Ord<String>> columns = columnLabels(resultSet);
+    while (resultSet.next()) {
+      StringBuilder buf = new StringBuilder();
+      for (Ord<String> column : columns) {
+        buf.append(column.i == 1 ? "" : "; 
").append(column.e).append("=").append(resultSet.getObject(column.i));
+      }
+      builder.add(buf.toString());
+      buf.setLength(0);
+    }
+    return builder.build();
+  }
 
   static List<String> toStrings(ResultSet resultSet) throws SQLException {
     final List<String> list = new ArrayList<>();
@@ -173,10 +189,35 @@ public class JdbcAssert {
         ResultSet resultSet = statement.executeQuery(sql);
         expected = expected.trim();
         String result = JdbcAssert.toString(resultSet).trim();
+        resultSet.close();
 
-        Assert.assertTrue(String.format("Generated string:\n%s\ndoes not 
match:\n%s", result, expected), expected.equals(result));
-        Assert.assertEquals(expected, result);
+        if (!expected.equals(result)) {
+          Assert.fail(String.format("Generated string:\n%s\ndoes not 
match:\n%s", result, expected));
+        }
+        return this;
+      } finally {
+        if (statement != null) {
+          statement.close();
+        }
+        if (connection != null) {
+          connection.close();
+        }
+      }
+    }
+
+    public TestDataConnection returnsSet(Set<String> expected) throws 
Exception {
+      Connection connection = null;
+      Statement statement = null;
+      try {
+        connection = connectionFactory.createConnection();
+        statement = connection.createStatement();
+        ResultSet resultSet = statement.executeQuery(sql);
+        Set<String> result = JdbcAssert.toStringSet(resultSet);
         resultSet.close();
+
+        if (!expected.equals(result)) {
+          Assert.fail(String.format("Generated set:\n%s\ndoes not match:\n%s", 
result, expected));
+        }
         return this;
       } finally {
         if (statement != null) {

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d29c7c4a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java
----------------------------------------------------------------------
diff --git 
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java 
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java
index 4dad7b3..918a547 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java
@@ -22,12 +22,14 @@ import static org.junit.Assert.assertTrue;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.Set;
 
 import org.apache.drill.exec.store.hive.HiveTestDataGenerator;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * Contains tests for
@@ -56,18 +58,18 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
   public void testSchemata() throws Exception{
     JdbcAssert.withNoDefaultSchema()
         .sql("SELECT * FROM INFORMATION_SCHEMA.SCHEMATA")
-        .returns(
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.default; 
SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.root; SCHEMA_OWNER=<owner>; 
TYPE=file; IS_MUTABLE=NO\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.tmp; SCHEMA_OWNER=<owner>; 
TYPE=file; IS_MUTABLE=YES\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=sys; SCHEMA_OWNER=<owner>; 
TYPE=system-tables; IS_MUTABLE=NO\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.home; 
SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.default; 
SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.tmp; 
SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=YES\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=cp.default; SCHEMA_OWNER=<owner>; 
TYPE=file; IS_MUTABLE=NO\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=hive_test.default; 
SCHEMA_OWNER=<owner>; TYPE=hive; IS_MUTABLE=NO\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=hive_test.db1; 
SCHEMA_OWNER=<owner>; TYPE=hive; IS_MUTABLE=NO\n" +
-            "CATALOG_NAME=DRILL; SCHEMA_NAME=INFORMATION_SCHEMA; 
SCHEMA_OWNER=<owner>; TYPE=ischema; IS_MUTABLE=NO\n"
+        .returnsSet(ImmutableSet.of(
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.default; 
SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.root; SCHEMA_OWNER=<owner>; 
TYPE=file; IS_MUTABLE=NO",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.tmp; SCHEMA_OWNER=<owner>; 
TYPE=file; IS_MUTABLE=YES",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=sys; SCHEMA_OWNER=<owner>; 
TYPE=system-tables; IS_MUTABLE=NO",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.home; 
SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.default; 
SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.tmp; 
SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=YES",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=cp.default; SCHEMA_OWNER=<owner>; 
TYPE=file; IS_MUTABLE=NO",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=hive_test.default; 
SCHEMA_OWNER=<owner>; TYPE=hive; IS_MUTABLE=NO",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=hive_test.db1; 
SCHEMA_OWNER=<owner>; TYPE=hive; IS_MUTABLE=NO",
+            "CATALOG_NAME=DRILL; SCHEMA_NAME=INFORMATION_SCHEMA; 
SCHEMA_OWNER=<owner>; TYPE=ischema; IS_MUTABLE=NO")
         );
   }
 
@@ -75,13 +77,13 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
   public void testShowTables() throws Exception{
     JdbcAssert.withFull("hive_test.default")
         .sql("SHOW TABLES")
-        .returns(
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=readtest\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=empty_table\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=infoschematest\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=hiveview\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=kv\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=foodate\n"
+        .returnsSet(ImmutableSet.of(
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=readtest",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=empty_table",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=infoschematest",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=hiveview",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=kv",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=foodate")
         );
   }
 
@@ -89,23 +91,22 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
   public void testShowTablesFromDb() throws Exception{
     JdbcAssert.withNoDefaultSchema()
         .sql("SHOW TABLES FROM INFORMATION_SCHEMA")
-        .returns(
-            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=VIEWS\n" +
-            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=COLUMNS\n" +
-            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=TABLES\n" +
-            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=CATALOGS\n" +
-            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=SCHEMATA\n"
-        );
+        .returnsSet(ImmutableSet.of(
+            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=VIEWS",
+            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=COLUMNS",
+            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=TABLES",
+            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=CATALOGS",
+            "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=SCHEMATA"));
 
     JdbcAssert.withFull("dfs_test.tmp")
         .sql("SHOW TABLES IN hive_test.`default`")
-        .returns(
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=readtest\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=empty_table\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=infoschematest\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=hiveview\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=kv\n" +
-            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=foodate\n");
+        .returnsSet(ImmutableSet.of(
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=readtest",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=empty_table",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=infoschematest",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=hiveview",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=kv",
+            "TABLE_SCHEMA=hive_test.default; TABLE_NAME=foodate"));
   }
 
   @Test
@@ -124,21 +125,21 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
 
   @Test
   public void testShowDatabases() throws Exception{
-    String expected =
-        "SCHEMA_NAME=dfs.default\n" +
-        "SCHEMA_NAME=dfs.root\n" +
-        "SCHEMA_NAME=dfs.tmp\n" +
-        "SCHEMA_NAME=sys\n" +
-        "SCHEMA_NAME=dfs_test.home\n" +
-        "SCHEMA_NAME=dfs_test.default\n" +
-        "SCHEMA_NAME=dfs_test.tmp\n" +
-        "SCHEMA_NAME=cp.default\n" +
-        "SCHEMA_NAME=hive_test.default\n" +
-        "SCHEMA_NAME=hive_test.db1\n" +
-        "SCHEMA_NAME=INFORMATION_SCHEMA\n";
-
-    JdbcAssert.withNoDefaultSchema().sql("SHOW DATABASES").returns(expected);
-    JdbcAssert.withNoDefaultSchema().sql("SHOW SCHEMAS").returns(expected);
+    Set<String> expected = ImmutableSet.of(
+        "SCHEMA_NAME=dfs.default",
+        "SCHEMA_NAME=dfs.root",
+        "SCHEMA_NAME=dfs.tmp",
+        "SCHEMA_NAME=sys",
+        "SCHEMA_NAME=dfs_test.home",
+        "SCHEMA_NAME=dfs_test.default",
+        "SCHEMA_NAME=dfs_test.tmp",
+        "SCHEMA_NAME=cp.default",
+        "SCHEMA_NAME=hive_test.default",
+        "SCHEMA_NAME=hive_test.db1",
+        "SCHEMA_NAME=INFORMATION_SCHEMA");
+
+    JdbcAssert.withNoDefaultSchema().sql("SHOW 
DATABASES").returnsSet(expected);
+    JdbcAssert.withNoDefaultSchema().sql("SHOW SCHEMAS").returnsSet(expected);
   }
 
   @Test
@@ -152,19 +153,19 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
   public void testShowDatabasesLike() throws Exception{
     JdbcAssert.withNoDefaultSchema()
         .sql("SHOW DATABASES LIKE '%i%'")
-        .returns(
-            "SCHEMA_NAME=hive_test.default\n"+
-            "SCHEMA_NAME=hive_test.db1");
+        .returnsSet(ImmutableSet.of(
+            "SCHEMA_NAME=hive_test.default",
+            "SCHEMA_NAME=hive_test.db1"));
   }
 
   @Test
   public void testDescribeTable() throws Exception{
     JdbcAssert.withFull("INFORMATION_SCHEMA")
         .sql("DESCRIBE CATALOGS")
-        .returns(
-            "COLUMN_NAME=CATALOG_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
-            "COLUMN_NAME=CATALOG_DESCRIPTION; DATA_TYPE=VARCHAR; 
IS_NULLABLE=NO\n"+
-            "COLUMN_NAME=CATALOG_CONNECT; DATA_TYPE=VARCHAR; 
IS_NULLABLE=NO\n");
+        .returnsSet(ImmutableSet.of(
+            "COLUMN_NAME=CATALOG_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+            "COLUMN_NAME=CATALOG_DESCRIPTION; DATA_TYPE=VARCHAR; 
IS_NULLABLE=NO",
+            "COLUMN_NAME=CATALOG_CONNECT; DATA_TYPE=VARCHAR; IS_NULLABLE=NO"));
   }
 
 
@@ -172,21 +173,20 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
   public void testDescribeTableNullableColumns() throws Exception{
     JdbcAssert.withNoDefaultSchema()
         .sql("DESCRIBE hive_test.`default`.kv")
-        .returns(
-            "COLUMN_NAME=key; DATA_TYPE=INTEGER; IS_NULLABLE=YES\n" +
-            "COLUMN_NAME=value; DATA_TYPE=VARCHAR; IS_NULLABLE=YES\n"
-        );
+        .returnsSet(ImmutableSet.of(
+            "COLUMN_NAME=key; DATA_TYPE=INTEGER; IS_NULLABLE=YES",
+            "COLUMN_NAME=value; DATA_TYPE=VARCHAR; IS_NULLABLE=YES"));
   }
 
   @Test
   public void testDescribeTableWithSchema() throws Exception{
     JdbcAssert.withNoDefaultSchema()
         .sql("DESCRIBE INFORMATION_SCHEMA.`TABLES`")
-        .returns(
-            "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
-            "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
-            "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
-            "COLUMN_NAME=TABLE_TYPE; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n");
+        .returnsSet(ImmutableSet.of(
+            "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+            "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+            "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+            "COLUMN_NAME=TABLE_TYPE; DATA_TYPE=VARCHAR; IS_NULLABLE=NO"));
   }
 
   @Test
@@ -202,20 +202,20 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
 
           // Test describe of `TABLES` with no schema qualifier
           ResultSet resultSet = statement.executeQuery("DESCRIBE `TABLES`");
-          String result = JdbcAssert.toString(resultSet).trim();
+          Set<String> result = JdbcAssert.toStringSet(resultSet);
           resultSet.close();
-          String expected = "COLUMN_NAME=key; DATA_TYPE=INTEGER; 
IS_NULLABLE=NO";
+          ImmutableSet<String> expected = ImmutableSet.of("COLUMN_NAME=key; 
DATA_TYPE=INTEGER; IS_NULLABLE=NO");
           assertTrue(String.format("Generated string:\n%s\ndoes not 
match:\n%s", result, expected), expected.equals(result));
 
           // Test describe of `TABLES` with a schema qualifier which is not in 
default schema
           resultSet = statement.executeQuery("DESCRIBE 
INFORMATION_SCHEMA.`TABLES`");
-          result = JdbcAssert.toString(resultSet).trim();
+          result = JdbcAssert.toStringSet(resultSet);
           resultSet.close();
-          expected =
-              "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n" 
+
-              "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n" +
-              "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n" +
-              "COLUMN_NAME=TABLE_TYPE; DATA_TYPE=VARCHAR; IS_NULLABLE=NO";
+          expected = ImmutableSet.of(
+              "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+              "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+              "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+              "COLUMN_NAME=TABLE_TYPE; DATA_TYPE=VARCHAR; IS_NULLABLE=NO");
           assertTrue(String.format("Generated string:\n%s\ndoes not 
match:\n%s", result, expected), expected.equals(result));
 
           // drop created view
@@ -248,19 +248,19 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
   public void testDescribeTableWithColQualifier() throws Exception{
     JdbcAssert.withFull("INFORMATION_SCHEMA")
         .sql("DESCRIBE COLUMNS 'TABLE%'")
-        .returns(
-            "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
-            "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
-            "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n");
+        .returnsSet(ImmutableSet.of(
+            "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+            "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+            "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO"));
   }
 
   @Test
   public void testDescribeTableWithSchemaAndColQualifier() throws Exception{
     JdbcAssert.withNoDefaultSchema()
         .sql("DESCRIBE INFORMATION_SCHEMA.SCHEMATA 'SCHEMA%'")
-        .returns(
-            "COLUMN_NAME=SCHEMA_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
-            "COLUMN_NAME=SCHEMA_OWNER; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n");
+        .returnsSet(ImmutableSet.of(
+            "COLUMN_NAME=SCHEMA_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+            "COLUMN_NAME=SCHEMA_OWNER; DATA_TYPE=VARCHAR; IS_NULLABLE=NO"));
   }
 
   @Test
@@ -271,11 +271,11 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
             "WHERE TABLE_SCHEMA = 'hive_test.default' AND TABLE_NAME = 
'infoschematest' AND " +
             "(COLUMN_NAME = 'stringtype' OR COLUMN_NAME = 'varchartype' OR " +
             "COLUMN_NAME = 'inttype' OR COLUMN_NAME = 'decimaltype')")
-        .returns(
-            "COLUMN_NAME=inttype; DATA_TYPE=INTEGER; 
CHARACTER_MAXIMUM_LENGTH=-1; NUMERIC_PRECISION=-1\n" +
-            "COLUMN_NAME=decimaltype; DATA_TYPE=DECIMAL; 
CHARACTER_MAXIMUM_LENGTH=-1; NUMERIC_PRECISION=38\n" +
-            "COLUMN_NAME=stringtype; DATA_TYPE=VARCHAR; 
CHARACTER_MAXIMUM_LENGTH=65535; NUMERIC_PRECISION=-1\n" +
-            "COLUMN_NAME=varchartype; DATA_TYPE=VARCHAR; 
CHARACTER_MAXIMUM_LENGTH=20; NUMERIC_PRECISION=-1");
+        .returnsSet(ImmutableSet.of(
+            "COLUMN_NAME=inttype; DATA_TYPE=INTEGER; 
CHARACTER_MAXIMUM_LENGTH=-1; NUMERIC_PRECISION=-1",
+            "COLUMN_NAME=decimaltype; DATA_TYPE=DECIMAL; 
CHARACTER_MAXIMUM_LENGTH=-1; NUMERIC_PRECISION=38",
+            "COLUMN_NAME=stringtype; DATA_TYPE=VARCHAR; 
CHARACTER_MAXIMUM_LENGTH=65535; NUMERIC_PRECISION=-1",
+            "COLUMN_NAME=varchartype; DATA_TYPE=VARCHAR; 
CHARACTER_MAXIMUM_LENGTH=20; NUMERIC_PRECISION=-1"));
   }
 
   @Test

Reply via email to