From 7e473cafa09a8e271adcf50ce75dae4209dacb2f Mon Sep 17 00:00:00 2001
From: Andrew Bayer <abayer@apache.org>
Date: Fri, 22 Jul 2011 20:04:03 +0000
Subject: [PATCH] SQOOP-22. Sqoop date tests are too permissive.

Ensure that tests involving dates/times use proper ANSI SQL Date/Time escape
formatting (yyyy-mm-dd or hh:mm:ss). After Java 1.6u17, dates of the form
yyyy-m-dd or hh:m:ss are not parsed by java.sql.Date/Time and throw
IllegalArgumentException.

From: Aaron Kimball <aaron@cloudera.com>

git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1149934 13f79535-47bb-0310-9956-ffa450edef68
---
 src/test/com/cloudera/sqoop/TestExport.java              | 4 ++--
 .../cloudera/sqoop/testutil/ManagerCompatTestCase.java   | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/test/com/cloudera/sqoop/TestExport.java b/src/test/com/cloudera/sqoop/TestExport.java
index c6126e65..7afd0e9c 100644
--- a/src/test/com/cloudera/sqoop/TestExport.java
+++ b/src/test/com/cloudera/sqoop/TestExport.java
@@ -633,7 +633,7 @@ protected ColumnGenerator getDateColumnGenerator() {
     return new ColumnGenerator() {
       public String getExportText(int rowNum) {
         int day = rowNum + 1;
-        return "2009-10-" + day;
+        return "2009-10-" + pad(day);
       }
       public String getVerifyText(int rowNum) {
         int day = rowNum + 1;
@@ -651,7 +651,7 @@ public String getType() {
   protected ColumnGenerator getTimeColumnGenerator() {
     return new ColumnGenerator() {
       public String getExportText(int rowNum) {
-        return "10:01:" + rowNum;
+        return "10:01:" + pad(rowNum);
       }
       public String getVerifyText(int rowNum) {
         return "10:01:" + pad(rowNum);
diff --git a/src/test/com/cloudera/sqoop/testutil/ManagerCompatTestCase.java b/src/test/com/cloudera/sqoop/testutil/ManagerCompatTestCase.java
index 1237b35e..cea52272 100644
--- a/src/test/com/cloudera/sqoop/testutil/ManagerCompatTestCase.java
+++ b/src/test/com/cloudera/sqoop/testutil/ManagerCompatTestCase.java
@@ -721,20 +721,13 @@ public void testDouble2() {
 
   @Test
   public void testDate1() {
-    verifyType("DATE", getDateInsertStr("'2009-1-12'"),
-        getDateDbOutput("2009-01-12"),
-        getDateSeqOutput("2009-01-12"));
-  }
-
-  @Test
-  public void testDate2() {
     verifyType("DATE", getDateInsertStr("'2009-01-12'"),
         getDateDbOutput("2009-01-12"),
         getDateSeqOutput("2009-01-12"));
   }
 
   @Test
-  public void testDate3() {
+  public void testDate2() {
     verifyType("DATE", getDateInsertStr("'2009-04-24'"),
         getDateDbOutput("2009-04-24"),
         getDateSeqOutput("2009-04-24"));