=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2011-09-24 20:57:32 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2011-10-06 17:00:43 +0000 @@ -28,6 +28,7 @@ */ import java.util.Locale; +import java.util.regex.Pattern; import org.apache.commons.validator.DateValidator; import org.apache.commons.validator.EmailValidator; @@ -39,6 +40,8 @@ */ public class ValidationUtils { + private static Pattern REGEX_PATTERN = Pattern.compile( "\\[[\\+\\-]*\\d+\\.*\\d*,[\\+\\-]*\\d+\\.*\\d*\\]" ); + /** * Validates whether an email string is valid. * @@ -100,8 +103,8 @@ * * @return true if the coordinate is valid, false otherwise. */ - public static boolean validateGeoCoordinates( String coordinate ) + public static boolean coordinateIsValid( String coordinate ) { - return true; + return coordinate != null ? REGEX_PATTERN.matcher( coordinate ).matches() : false; } } === added file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java' --- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java 2011-10-06 17:00:43 +0000 @@ -0,0 +1,57 @@ +package org.hisp.dhis.system.util; + +/* + * Copyright (c) 2004-2010, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import static junit.framework.Assert.*; +import static org.hisp.dhis.system.util.ValidationUtils.*; + +import org.junit.Test; + +/** + * @author Lars Helge Overland + */ +public class ValidationUtilsTest +{ + @Test + public void testCoordinateIsValid() + { + assertTrue( coordinateIsValid( "[+37.99034,-28.94221]" ) ); + assertTrue( coordinateIsValid( "[37.99034,-28.94221]" ) ); + assertTrue( coordinateIsValid( "[+37.99034,28.94221]" ) ); + assertTrue( coordinateIsValid( "[37.99034,28.94221]" ) ); + assertTrue( coordinateIsValid( "[+37,-28.94221]" ) ); + assertTrue( coordinateIsValid( "[37.99034,28]" ) ); + + assertFalse( coordinateIsValid( "23.34343,56.3232" ) ); + assertFalse( coordinateIsValid( "23.34343 56.3232" ) ); + assertFalse( coordinateIsValid( "[23.34f43,56.3232]" ) ); + assertFalse( coordinateIsValid( "23.34343,56.323.2" ) ); + assertFalse( coordinateIsValid( "S-0.27726 E37.08472" ) ); + assertFalse( coordinateIsValid( "17298" ) ); + } +}