dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07814
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2302: Increasing unit test - SqlView functionality - SqlViewServiceTest
------------------------------------------------------------
revno: 2302
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-10-04 15:56:54 +0700
message:
Increasing unit test - SqlView functionality - SqlViewServiceTest
added:
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewTest.java
modified:
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java 2010-10-01 09:05:32 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java 2010-10-04 08:56:54 +0000
@@ -112,8 +112,6 @@
log.info( sql );
- System.out.println("getNumberOfOverlappingValues = " + jdbcTemplate.queryForInt( sql ));
-
return jdbcTemplate.queryForInt( sql );
}
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java 2010-09-16 10:04:16 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java 2010-10-04 08:56:54 +0000
@@ -100,7 +100,7 @@
@Override
public String makeUpForQueryStatement( String query )
{
- return query.replaceAll( ";\\s+", ";" ).replaceAll( ";+", ";" ).replaceAll( "\\s+", " " ).trim();
+ return query.replaceAll( "\\s*;\\s+", ";" ).replaceAll( ";+", ";" ).replaceAll( "\\s+", " " ).trim();
}
// -------------------------------------------------------------------------
@@ -132,8 +132,6 @@
for ( SqlView sqlView : getAllSqlViews() )
{
- setUpViewTableName( sqlView.getName() );
-
if ( !createViewTable( sqlView ) )
{
success = false;
=== added directory 'dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview'
=== added file 'dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java'
--- dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java 2010-10-04 08:56:54 +0000
@@ -0,0 +1,217 @@
+package org.hisp.dhis.sqlview;
+
+/*
+ * 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.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertNotSame;
+
+import java.util.Collection;
+
+import org.junit.Test;
+
+/**
+ * @author Lars Helge Overland
+ * @version $Id$
+ */
+public class SqlViewServiceTest
+ extends SqlViewTest
+{
+ @Override
+ public void setUpTest()
+ throws Exception
+ {
+ setUpSqlViewTest();
+ }
+
+ // -------------------------------------------------------------------------
+ // Supportive methods
+ // -------------------------------------------------------------------------
+
+ private void assertEq( char uniqueCharacter, SqlView sqlView, String sql )
+ {
+ assertEquals( "SqlView" + uniqueCharacter, sqlView.getName() );
+ assertEquals( "Description" + uniqueCharacter, sqlView.getDescription() );
+ assertEquals( sql, sqlView.getSqlQuery() );
+ }
+
+ // -------------------------------------------------------------------------
+ // SqlView
+ // -------------------------------------------------------------------------
+
+ @Test
+ public void testAddSqlView()
+ {
+ SqlView sqlViewA = createSqlView( 'A', sql1 );
+ SqlView sqlViewB = createSqlView( 'B', sql2 );
+
+ int idA = sqlViewService.saveSqlView( sqlViewA );
+ int idB = sqlViewService.saveSqlView( sqlViewB );
+
+ sqlViewA = sqlViewService.getSqlView( idA );
+ sqlViewB = sqlViewService.getSqlView( idB );
+
+ assertEquals( idA, sqlViewA.getId() );
+ assertEq( 'A', sqlViewA, sql1 );
+
+ assertEquals( idB, sqlViewB.getId() );
+ assertEq( 'B', sqlViewB, sql2 );
+ }
+
+ @Test
+ public void testUpdateSqlView()
+ {
+ SqlView sqlView = createSqlView( 'A', sql1 );
+
+ int id = sqlViewService.saveSqlView( sqlView );
+
+ sqlView = sqlViewService.getSqlView( id );
+
+ assertEq( 'A', sqlView, sql1 );
+
+ sqlView.setName( "SqlViewC" );
+
+ sqlViewService.updateSqlView( sqlView );
+
+ sqlView = sqlViewService.getSqlView( id );
+
+ assertEquals( sqlView.getName(), "SqlViewC" );
+ }
+
+ @Test
+ public void testDeleteAndGetSqlView()
+ {
+ SqlView sqlViewA = createSqlView( 'A', sql3 );
+ SqlView sqlViewB = createSqlView( 'B', sql4 );
+
+ int idA = sqlViewService.saveSqlView( sqlViewA );
+ int idB = sqlViewService.saveSqlView( sqlViewB );
+
+ assertNotNull( sqlViewService.getSqlView( idA ) );
+ assertNotNull( sqlViewService.getSqlView( idB ) );
+
+ sqlViewService.deleteSqlView( sqlViewService.getSqlView( idA ) );
+
+ assertNull( sqlViewService.getSqlView( idA ) );
+ assertNotNull( sqlViewService.getSqlView( idB ) );
+
+ sqlViewService.deleteSqlView( sqlViewService.getSqlView( idB ) );
+
+ assertNull( sqlViewService.getSqlView( idA ) );
+ assertNull( sqlViewService.getSqlView( idB ) );
+ }
+
+ @Test
+ public void testGetSqlViewByName()
+ throws Exception
+ {
+ SqlView sqlViewA = createSqlView( 'A', sql1 );
+ SqlView sqlViewB = createSqlView( 'B', sql2 );
+
+ int idA = sqlViewService.saveSqlView( sqlViewA );
+ int idB = sqlViewService.saveSqlView( sqlViewB );
+
+ assertEquals( sqlViewService.getSqlView( "SqlViewA" ).getId(), idA );
+ assertEquals( sqlViewService.getSqlView( "SqlViewB" ).getId(), idB );
+ assertNull( sqlViewService.getSqlView( "SqlViewC" ) );
+ }
+
+ @Test
+ public void testGetAllSqlViews()
+ {
+ SqlView sqlViewA = createSqlView( 'A', sql1 );
+ SqlView sqlViewB = createSqlView( 'B', sql2 );
+ SqlView sqlViewC = createSqlView( 'C', sql3 );
+ SqlView sqlViewD = createSqlView( 'D', sql4 );
+
+ sqlViewService.saveSqlView( sqlViewA );
+ sqlViewService.saveSqlView( sqlViewB );
+ sqlViewService.saveSqlView( sqlViewC );
+
+ Collection<SqlView> sqlViews = sqlViewService.getAllSqlViews();
+
+ assertEquals( sqlViews.size(), 3 );
+ assertTrue( sqlViews.contains( sqlViewA ) );
+ assertTrue( sqlViews.contains( sqlViewB ) );
+ assertTrue( sqlViews.contains( sqlViewC ) );
+ assertTrue( !sqlViews.contains( sqlViewD ) );
+ }
+
+ @Test
+ public void testMakeUpForQueryStatement()
+ {
+ SqlView sqlViewA = createSqlView( 'A', sql1 );
+
+ sqlViewA.setSqlQuery( sqlViewService.makeUpForQueryStatement( sqlViewA.getSqlQuery() ) );
+
+ int idA = sqlViewService.saveSqlView( sqlViewA );
+
+ assertEquals( sqlViewService.getSqlView( "SqlViewA" ).getId(), idA );
+
+ SqlView sqlViewB = sqlViewService.getSqlView( idA );
+
+ assertEq( 'A', sqlViewB, "SELECT * FROM _categorystructure;" );
+ }
+
+ @Test
+ public void testSetUpViewTableName()
+ {
+ SqlView sqlViewC = createSqlView( 'C', sql3 );
+ SqlView sqlViewD = createSqlView( 'D', sql4 );
+
+ sqlViewService.saveSqlView( sqlViewC );
+ sqlViewService.saveSqlView( sqlViewD );
+
+ String viewC = sqlViewService.setUpViewTableName( sqlViewService.getSqlView( "SqlViewC" ).getName() );
+ String viewD = sqlViewService.setUpViewTableName( sqlViewService.getSqlView( "SqlViewD" ).getName() );
+
+ assertEquals( "_view_SqlViewC", viewC );
+ assertNotSame( "_view_SqlViewC", viewD );
+
+ }
+
+ @Test
+ public void testGetAllSqlViewNames()
+ {
+ SqlView sqlViewA = createSqlView( 'A', sql4 );
+ SqlView sqlViewB = createSqlView( 'B', sql4 );
+ SqlView sqlViewC = createSqlView( 'C', sql4 );
+ SqlView sqlViewD = createSqlView( 'D', sql4 );
+
+ sqlViewService.saveSqlView( sqlViewA );
+ sqlViewService.saveSqlView( sqlViewB );
+ sqlViewService.saveSqlView( sqlViewC );
+ sqlViewService.saveSqlView( sqlViewD );
+
+ boolean flag = sqlViewService.createAllViewTables();
+
+ assertTrue( flag );
+ }
+}
=== added file 'dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewTest.java'
--- dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewTest.java 2010-10-04 08:56:54 +0000
@@ -0,0 +1,59 @@
+package org.hisp.dhis.sqlview;
+
+/*
+ * Copyright (c) 2004-2008, 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 org.hisp.dhis.DhisSpringTest;
+
+/**
+ * @author Dang Duy Hieu
+ * @version $Id$
+ */
+public abstract class SqlViewTest
+ extends DhisSpringTest
+{
+ protected SqlViewService sqlViewService;
+
+ protected static final String sql1 = "SELECT * FROM _categorystructure;; ; ;;; ;; ; ";
+
+ protected static final String sql2 = "SELECT COUNT(_ous.*) AS so_dem FROM _orgunitstructure AS _ous";
+
+ protected static final String sql3 = "SELECT COUNT(_cocn.*) AS so_dem, _icgss.indicatorid AS in_id"
+ + "FROM _indicatorgroupsetstructure AS _icgss, _categoryoptioncomboname AS _cocn "
+ + "GROUP BY _icgss.indicatorid;";
+
+ protected static final String sql4 = "SELECT de.name, dv.sourceid, dv.value, p.startdate "
+ + "FROM dataelement AS de, datavalue AS dv, period AS p "
+ + "WHERE de.dataelementid=dv.dataelementid "
+ + "AND dv.periodid=p.periodid LIMIT 10";
+
+ public void setUpSqlViewTest()
+ throws Exception
+ {
+ sqlViewService = (SqlViewService) getBean( SqlViewService.ID );
+ }
+}
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2010-09-10 09:54:49 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2010-10-04 08:56:54 +0000
@@ -88,6 +88,7 @@
import org.hisp.dhis.resourcetable.ResourceTableService;
import org.hisp.dhis.source.Source;
import org.hisp.dhis.source.SourceStore;
+import org.hisp.dhis.sqlview.SqlView;
import org.hisp.dhis.user.User;
import org.hisp.dhis.validation.ValidationCriteria;
import org.hisp.dhis.validation.ValidationCriteriaService;
@@ -913,6 +914,22 @@
return validationCriteria;
}
+
+ /**
+ * @param uniqueCharacter A unique character to identify the object.
+ * @param sql A query statement to retreive record/data from database.
+ */
+ protected static SqlView createSqlView( char uniqueCharacter, String sql )
+ {
+ SqlView sqlView = new SqlView();
+
+ sqlView.setName( "SqlView" + uniqueCharacter);
+ sqlView.setDescription( "Description" + uniqueCharacter );
+ sqlView.setSqlQuery( sql );
+
+ return sqlView;
+ }
+
// -------------------------------------------------------------------------
// Supportive methods
// -------------------------------------------------------------------------
