Revision 45025 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/test/java/org/gvsig/expresionevaluator/impl/TestDateInterpreter.java

View differences:

TestDateInterpreter.java
3 3 
import java.text.ParseException;
4 4 
import java.text.SimpleDateFormat;
5 5 
import java.util.Date;
6 
import java.util.Locale;
7 6 
import junit.framework.TestCase;
8 7 
import org.gvsig.expressionevaluator.Code;
9 8 
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
......
74 73 
        } else {
75 74 
          d = new SimpleDateFormat("yyyy-M-d").parse(x);
76 75 
        }
77 
        return new java.sql.Date(d.getTime());
76 
        return new java.sql.Date(d.getYear(), d.getMonth(), d.getDate());
78 77 
    }
79 78 

  		




  80
  79
  
    
    private java.sql.Time time(String x) throws ParseException {


  		




  81
  
  
    
        Date d = new SimpleDateFormat("H:mm:ss").parse(x);


  		




  82
  
  
    
        return new java.sql.Time(d.getTime());


  		




  
  80
  
    
        Date d;


  		




  
  81
  
    
        if( x == null ) {


  		




  
  82
  
    
          d = new Date();


  		




  
  83
  
    
        } else {


  		




  
  84
  
    
          d = new SimpleDateFormat("H:mm:ss").parse(x);


  		




  
  85
  
    
        }


  		




  
  86
  
    
        return new java.sql.Time(d.getHours(), d.getMinutes(), d.getSeconds());


  		




  83
  87
  
    
    }


  		




  84
  88
  
    

  		




  85
  89
  
    
    private java.sql.Timestamp timestamp(String x) throws ParseException {


  		












Also available in:  Unified diff