dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21792
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-01-21 16:05:12 +0700
message:
  Add PreheatParams validation + tests
added:
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/preheat/
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/preheat/PreheatServiceTest.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatParams.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.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-api/src/main/java/org/hisp/dhis/preheat/PreheatParams.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatParams.java	2016-01-21 05:06:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatParams.java	2016-01-21 09:05:12 +0000
@@ -40,6 +40,8 @@
 {
     private PreheatMode preheatMode = PreheatMode.ALL;
 
+    private PreheatIdentifier preheatIdentifier = PreheatIdentifier.UID;
+
     private Collection<Class<?>> classes = new ArrayList<>();
 
     private Map<Class<?>, Collection<String>> references = new HashMap<>();
@@ -59,6 +61,17 @@
         return this;
     }
 
+    public PreheatIdentifier getPreheatIdentifier()
+    {
+        return preheatIdentifier;
+    }
+
+    public PreheatParams setPreheatIdentifier( PreheatIdentifier preheatIdentifier )
+    {
+        this.preheatIdentifier = preheatIdentifier;
+        return this;
+    }
+
     public Collection<Class<?>> getClasses()
     {
         return classes;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-01-21 06:50:38 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-01-21 09:05:12 +0000
@@ -45,6 +45,23 @@
     @Override
     public void validate( PreheatParams params ) throws PreheatException
     {
-
+        if ( PreheatMode.ALL == params.getPreheatMode() )
+        {
+            if ( params.getClasses().isEmpty() )
+            {
+                throw new PreheatException( "PreheatMode.ALL, but no classes was provided." );
+            }
+        }
+        else if ( PreheatMode.REFERENCE == params.getPreheatMode() )
+        {
+            if ( params.getReferences().isEmpty() )
+            {
+                throw new PreheatException( "PreheatMode.REFERENCE, but no references was provided." );
+            }
+        }
+        else
+        {
+            throw new PreheatException( "Invalid preheat mode." );
+        }
     }
 }

=== added directory 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/preheat'
=== added file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/preheat/PreheatServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/preheat/PreheatServiceTest.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/preheat/PreheatServiceTest.java	2016-01-21 09:05:12 +0000
@@ -0,0 +1,77 @@
+package org.hisp.dhis.preheat;
+
+/*
+ * Copyright (c) 2004-2016, 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 com.google.common.collect.Lists;
+import org.hisp.dhis.DhisSpringTest;
+import org.hisp.dhis.dataelement.DataElement;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class PreheatServiceTest
+    extends DhisSpringTest
+{
+    @Autowired
+    private PreheatService preheatService;
+
+    @Test( expected = PreheatException.class )
+    public void testValidateAllFail()
+    {
+        PreheatParams params = new PreheatParams().setPreheatMode( PreheatMode.ALL );
+        preheatService.validate( params );
+    }
+
+    @Test
+    public void testValidateAll()
+    {
+        PreheatParams params = new PreheatParams().setPreheatMode( PreheatMode.ALL );
+        params.getClasses().add( DataElement.class );
+
+        preheatService.validate( params );
+    }
+
+    @Test( expected = PreheatException.class )
+    public void testValidateRefFail()
+    {
+        PreheatParams params = new PreheatParams().setPreheatMode( PreheatMode.REFERENCE );
+        preheatService.validate( params );
+    }
+
+    @Test
+    public void testValidateRef()
+    {
+        PreheatParams params = new PreheatParams().setPreheatMode( PreheatMode.REFERENCE );
+        params.getReferences().put( DataElement.class, Lists.newArrayList( "ID1", "ID2" ) );
+
+        preheatService.validate( params );
+    }
+}