------------------------------------------------------------
revno: 13721
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-01-14 12:43:48 +0100
message:
SystemSettingStore text fix
modified:
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/setting/SystemSettingStoreTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.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/setting/SystemSettingStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/setting/SystemSettingStoreTest.java 2013-09-17 18:07:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/setting/SystemSettingStoreTest.java 2014-01-14 11:43:48 +0000
@@ -92,9 +92,9 @@
@Test
public void testUpdateSystemSetting()
{
- systemSettingStore.save( settingA );
+ int id = systemSettingStore.save( settingA );
- settingA = systemSettingStore.getByName( "Setting1" );
+ settingA = systemSettingStore.get( id );
assertEquals( "Value1", settingA.getValue() );
@@ -102,7 +102,7 @@
systemSettingStore.update( settingA );
- settingA = systemSettingStore.getByName( "Setting1" );
+ settingA = systemSettingStore.get( id );
assertEquals( "Value2", settingA.getValue() );
}
=== 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 2013-10-01 16:44:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.java 2014-01-14 11:43:48 +0000
@@ -49,16 +49,6 @@
private TranslationService translationService;
// -------------------------------------------------------------------------
- // Set up/tear down
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- {
- translationService = (TranslationService) getBean( TranslationService.ID );
- }
-
- // -------------------------------------------------------------------------
// Testdata
// -------------------------------------------------------------------------
@@ -79,6 +69,16 @@
private Translation translation2c = new Translation( className2, id2, locale3, "name", "bonjour" );
// -------------------------------------------------------------------------
+ // Set up/tear down
+ // -------------------------------------------------------------------------
+
+ @Override
+ public void setUpTest()
+ {
+ translationService = (TranslationService) getBean( TranslationService.ID );
+ }
+
+ // -------------------------------------------------------------------------
// Tests
// -------------------------------------------------------------------------
_______________________________________________
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
