dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10074
committer: Long <Long@Long-Laptop>
branch nick: dhis2
timestamp: Fri 2013-03-08 17:55:15 +0700
message:
  [mobile] fix test fail
modified:
  dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java
  dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java
  dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.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-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java	2013-03-08 09:38:34 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java	2013-03-08 10:55:15 +0000
@@ -61,20 +61,16 @@
     public static double currentVersion = 2.9;
 
     private String updateNewVersionUrl;
-    
+
     private String updateContactUrl;
-    
+
     private String findPatientUrl;
 
-    
-    private String registerPersonUrl;
-
-    
     private String uploadProgramStageUrl;
-    
+
     private String enrollProgramUrl;
-    
 
+    private String registerPersonUrl;
 
     @XmlAttribute
     public int getId()
@@ -187,7 +183,7 @@
     {
         this.updateNewVersionUrl = updateNewVersionUrl;
     }
-    
+
     public String getUpdateContactUrl()
     {
         return updateContactUrl;
@@ -208,18 +204,6 @@
         this.findPatientUrl = findPatientUrl;
     }
 
-    
-    
-
-    public String getRegisterPerson() {
-		return registerPersonUrl;
-	}
-
-	public void setRegisterPerson(String registerPersonUrl) {
-		this.registerPersonUrl = registerPersonUrl;
-	}
-
-
     public String getUploadProgramStageUrl()
     {
         return uploadProgramStageUrl;
@@ -239,10 +223,19 @@
     {
         this.enrollProgramUrl = enrollProgramUrl;
     }
+    
+    public String getRegisterPersonUrl()
+    {
+        return registerPersonUrl;
+    }
+
+    public void setRegisterPersonUrl( String registerPersonUrl )
+    {
+        this.registerPersonUrl = registerPersonUrl;
+    }
 
     public void serialize( DataOutputStream dataOutputStream )
 
-
         throws IOException
     {
         dataOutputStream.writeInt( this.id );
@@ -257,7 +250,7 @@
         dataOutputStream.writeUTF( this.updateNewVersionUrl );
         dataOutputStream.writeUTF( this.updateContactUrl );
         dataOutputStream.writeUTF( this.findPatientUrl );
-        dataOutputStream.writeUTF(this.registerPersonUrl);
+        dataOutputStream.writeUTF( this.registerPersonUrl );
         dataOutputStream.writeUTF( this.uploadProgramStageUrl );
         dataOutputStream.writeUTF( this.enrollProgramUrl );
     }
@@ -277,15 +270,11 @@
         this.updateNewVersionUrl = dataInputStream.readUTF();
         this.updateContactUrl = dataInputStream.readUTF();
         this.findPatientUrl = dataInputStream.readUTF();
-		this.uploadProgramStageUrl = dataInputStream.readUTF();
+        this.uploadProgramStageUrl = dataInputStream.readUTF();
         this.registerPersonUrl = dataInputStream.readUTF();
-        this.uploadProgramStageUrl = dataInputStream.readUTF();
         this.enrollProgramUrl = dataInputStream.readUTF();
     }
 
-
- 
-
     @Override
     public void serializeVersion2_8( DataOutputStream dataOutputStream )
         throws IOException
@@ -335,10 +324,8 @@
         dataOutputStream.writeUTF( this.updateContactUrl );
         dataOutputStream.writeUTF( this.findPatientUrl );
         dataOutputStream.writeUTF( this.uploadProgramStageUrl );
-        dataOutputStream.writeUTF(this.registerPersonUrl);
+        dataOutputStream.writeUTF( this.registerPersonUrl );
         dataOutputStream.writeUTF( this.enrollProgramUrl );
     }
 
-
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java	2013-03-06 04:25:38 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java	2013-03-08 10:55:15 +0000
@@ -49,10 +49,10 @@
         
         unit.setId( 1 );
         unit.setName( "name" );
+        unit.setDownloadAllUrl( "downloadAllUrl" );
         unit.setUpdateActivityPlanUrl("updateActivityPlanUrl");
-        unit.setDownloadAllUrl( "downloadAllUrl" );
+        unit.setUploadFacilityReportUrl( "uploadFacilityReportUrl" );
         unit.setUploadActivityReportUrl( "uploadActivityReportUrl" );
-        unit.setUploadFacilityReportUrl( "uploadFacilityReportUrl" );
         unit.setUpdateDataSetUrl( "updateDataSetUrl" );
         unit.setChangeUpdateDataSetLangUrl( "changeUpdateDataSetLangUrl" );
         unit.setSearchUrl( "search" );
@@ -61,6 +61,7 @@
         unit.setFindPatientUrl( "findPatientUrl" );
         unit.setUploadProgramStageUrl( "uploadProgramStageUrl" );
         unit.setEnrollProgramUrl( "enrollProgramUrl" );
+        unit.setRegisterPersonUrl( "registerPersonUrl" );
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream dos = new DataOutputStream( baos );

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java	2013-03-06 04:25:38 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java	2013-03-08 10:55:15 +0000
@@ -74,18 +74,19 @@
         
         unit.setId( 1 );
         unit.setName( "name" );
+        unit.setDownloadAllUrl( "downloadAllUrl" );
         unit.setUpdateActivityPlanUrl("updateActivityPlanUrl");
-        unit.setDownloadAllUrl( "downloadAllUrl" );
+        unit.setUploadFacilityReportUrl( "uploadFacilityReportUrl" );
         unit.setUploadActivityReportUrl( "uploadActivityReportUrl" );
-        unit.setUploadFacilityReportUrl( "uploadFacilityReportUrl" );
         unit.setUpdateDataSetUrl( "updateDataSetUrl" );
         unit.setChangeUpdateDataSetLangUrl( "changeUpdateDataSetLangUrl" );
         unit.setSearchUrl( "search" );
-        unit.setUpdateNewVersionUrl( "test" );
+        unit.setUpdateNewVersionUrl( "" );
         unit.setUpdateContactUrl( "updateContactUrl" );
         unit.setFindPatientUrl( "findPatientUrl" );
         unit.setUploadProgramStageUrl( "uploadProgramStageUrl" );
         unit.setEnrollProgramUrl( "enrollProgramUrl" );
+        unit.setRegisterPersonUrl( "registerPersonUrl" );
         return unit;
     }
 }