------------------------------------------------------------
revno: 13727
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-01-14 14:28:28 +0100
message:
Removed duplicate translation test
modified:
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.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/test/java/org/hisp/dhis/translation/TranslationServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.java 2014-01-14 11:43:48 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.java 2014-01-14 13:28:28 +0000
@@ -127,21 +127,7 @@
}
@Test
- public void testGetTranslations1()
- {
- translationService.addTranslation( translation1a );
- translationService.addTranslation( translation1b );
- translationService.addTranslation( translation2a );
- translationService.addTranslation( translation2b );
- translationService.addTranslation( translation2c );
-
- assertEquals( 2, translationService.getTranslations( className1, id1, Locale.UK ).size() );
- assertTrue( translationService.getTranslations( className1, id1, Locale.UK ).contains( translation1a ) );
- assertTrue( translationService.getTranslations( className1, id1, Locale.UK ).contains( translation1b ) );
- }
-
- @Test
- public void testGetTranslations2()
+ public void testGetTranslations()
{
translationService.addTranslation( translation1a );
translationService.addTranslation( translation1b );
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2014-01-14 10:21:12 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2014-01-14 13:28:28 +0000
@@ -294,8 +294,8 @@
executeSql( "ALTER TABLE program DROP COLUMN useBirthDateAsIncidentDate" );
executeSql( "ALTER TABLE program DROP COLUMN useBirthDateAsEnrollmentDate" );
- executeSql( "UPDATE patientattribute SET displayInListNoProgram=false WHERE displayInListNoProgram is null" );
- executeSql( "UPDATE patientidentifiertype SET displayInListNoProgram=false WHERE displayInListNoProgram is null" );
+ executeSql( "UPDATE patientattribute SET displayinlistnoprogram=false WHERE displayinlistnoprogram is null" );
+ executeSql( "UPDATE patientidentifiertype SET displayinlistnoprogram=false WHERE displayinlistnoprogram is null" );
updateProgramAttributes();
}
@@ -321,8 +321,8 @@
executeSql( "DROP TABLE program_patientattributes" );
executeSql( "DROP TABLE program_patientidentifiertypes" );
- executeSql( "ALTER TABLE patientattribute DROP COLUMN displayedInList" );
- executeSql( "ALTER TABLE patientidentifiertype DROP COLUMN personDisplayName" );
+ executeSql( "ALTER TABLE patientattribute DROP COLUMN displayedinlist" );
+ executeSql( "ALTER TABLE patientidentifiertype DROP COLUMN persondisplayname" );
}
private void updateUid()
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
