dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16429
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-08-17 14:26:09 +0700
message:
  tests and bugfixes for complex nodes (fields only)
added:
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldComplexNodePropertyIntrospectorServiceTest.java
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/NodePropertyIntrospectorService.java
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldSimpleNodePropertyIntrospectorServiceTest.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-core/src/main/java/org/hisp/dhis/schema/NodePropertyIntrospectorService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/NodePropertyIntrospectorService.java	2014-08-16 16:27:06 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/NodePropertyIntrospectorService.java	2014-08-17 07:26:09 +0000
@@ -164,6 +164,7 @@
     private void handleNodeComplex( NodeComplex nodeComplex, Property property )
     {
         property.setSimple( false );
+        property.setPersisted( nodeComplex.isPersisted() );
         property.setNamespace( nodeComplex.namespace() );
         property.setWritable( nodeComplex.isWritable() );
         property.setReadable( nodeComplex.isReadable() );

=== added file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldComplexNodePropertyIntrospectorServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldComplexNodePropertyIntrospectorServiceTest.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldComplexNodePropertyIntrospectorServiceTest.java	2014-08-17 07:26:09 +0000
@@ -0,0 +1,134 @@
+package org.hisp.dhis.schema;
+
+/*
+ * Copyright (c) 2004-2014, 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.node.annotation.NodeComplex;
+import org.hisp.dhis.node.annotation.NodeSimple;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+class Value
+{
+    @NodeSimple
+    private String value;
+}
+
+class ComplexFields
+{
+    @NodeComplex
+    private Value property;
+
+    @NodeComplex( value = "propertyRenamed" )
+    private Value propertyToBeRenamed;
+
+    @NodeComplex( isReadable = true, isWritable = false )
+    private Value readOnly;
+
+    @NodeComplex( isReadable = false, isWritable = true )
+    private Value writeOnly;
+
+    @NodeComplex( isPersisted = false )
+    private Value notPersistedProperty;
+
+    @NodeComplex( namespace = "http://ns.example.org"; )
+    private Value propertyWithNamespace;
+}
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class FieldComplexNodePropertyIntrospectorServiceTest
+{
+    private Map<String, Property> propertyMap;
+
+    @Before
+    public void setup()
+    {
+        propertyMap = new NodePropertyIntrospectorService().scanClass( ComplexFields.class );
+    }
+
+    @Test
+    public void testContainsKey()
+    {
+        assertTrue( propertyMap.containsKey( "property" ) );
+        assertFalse( propertyMap.containsKey( "propertyToBeRenamed" ) );
+        assertTrue( propertyMap.containsKey( "propertyRenamed" ) );
+        assertTrue( propertyMap.containsKey( "readOnly" ) );
+        assertTrue( propertyMap.containsKey( "writeOnly" ) );
+        assertTrue( propertyMap.containsKey( "propertyRenamed" ) );
+        assertTrue( propertyMap.containsKey( "propertyWithNamespace" ) );
+    }
+
+    @Test
+    public void testPersisted()
+    {
+        assertTrue( propertyMap.get( "property" ).isPersisted() );
+        assertFalse( propertyMap.get( "notPersistedProperty" ).isPersisted() );
+    }
+
+    @Test
+    public void testReadWrite()
+    {
+        assertTrue( propertyMap.get( "readOnly" ).isReadable() );
+        assertFalse( propertyMap.get( "readOnly" ).isWritable() );
+
+        assertFalse( propertyMap.get( "writeOnly" ).isReadable() );
+        assertTrue( propertyMap.get( "writeOnly" ).isWritable() );
+
+        assertNull( propertyMap.get( "readOnly" ).getSetterMethod() );
+        assertNull( propertyMap.get( "writeOnly" ).getGetterMethod() );
+    }
+
+    @Test
+    public void testFieldName()
+    {
+        assertEquals( "property", propertyMap.get( "property" ).getFieldName() );
+        assertEquals( "propertyToBeRenamed", propertyMap.get( "propertyRenamed" ).getFieldName() );
+    }
+
+    @Test
+    public void testNamespace()
+    {
+        assertEquals( "http://ns.example.org";, propertyMap.get( "propertyWithNamespace" ).getNamespace() );
+    }
+
+    @Test
+    public void testGetter()
+    {
+    }
+
+    @Test
+    public void testSetter()
+    {
+    }
+}

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldSimpleNodePropertyIntrospectorServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldSimpleNodePropertyIntrospectorServiceTest.java	2014-08-16 15:11:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldSimpleNodePropertyIntrospectorServiceTest.java	2014-08-17 07:26:09 +0000
@@ -36,7 +36,7 @@
 
 import static org.junit.Assert.*;
 
-class SimpleFieldsOnly
+class SimpleFields
 {
     @NodeSimple( isAttribute = false )
     private String simpleProperty;
@@ -77,7 +77,7 @@
     @Before
     public void setup()
     {
-        propertyMap = new NodePropertyIntrospectorService().scanClass( SimpleFieldsOnly.class );
+        propertyMap = new NodePropertyIntrospectorService().scanClass( SimpleFields.class );
     }
 
     @Test