Mike Kolesnik has uploaded a new change for review. Change subject: core: Replace test keys in AppErrors.properties ......................................................................
core: Replace test keys in AppErrors.properties Test keys should be used only by tests and not mimic real keys since someone could accidentally change the test key. Change-Id: I3789faa2721154a7ab31dacf0661861af5e9b4d4 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ErrorTranslatorTest.java M backend/manager/modules/utils/src/test/resources/AppErrors.properties M backend/manager/modules/utils/src/test/resources/AppErrors_de.properties M backend/manager/modules/utils/src/test/resources/AppErrors_it.properties 4 files changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/10853/1 diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ErrorTranslatorTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ErrorTranslatorTest.java index 2dd0042..1634385 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ErrorTranslatorTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ErrorTranslatorTest.java @@ -4,11 +4,14 @@ import java.util.List; import java.util.Locale; -import org.ovirt.engine.core.common.interfaces.ErrorTranslator; - import junit.framework.TestCase; +import org.ovirt.engine.core.common.interfaces.ErrorTranslator; + public class ErrorTranslatorTest extends TestCase { + + private static final String TEST_KEY_NO_REPLACEMENT = "TEST_KEY_NO_REPLACEMENT"; + private static final String TEST_KEY_WITH_REPLACEMENT = "TEST_KEY_WITH_REPLACEMENT"; public void testNoStringSubstitutionWithoutSuffix() { doTestNoStringSubstitution("AppErrors"); @@ -20,20 +23,20 @@ private void doTestNoStringSubstitution(String name) { ErrorTranslator et = new ErrorTranslatorImpl(name); - String error = et.TranslateErrorTextSingle("DB_NO_SUCH_VM"); + String error = et.TranslateErrorTextSingle(TEST_KEY_NO_REPLACEMENT); assertEquals("String should equal", "VM not found", error); } public void testNoStringSubstitutionWithList() { ErrorTranslator et = new ErrorTranslatorImpl("AppErrors"); - List<String> error = et.TranslateErrorText(Arrays.asList("DB_NO_SUCH_VM")); + List<String> error = et.TranslateErrorText(Arrays.asList(TEST_KEY_NO_REPLACEMENT)); assertTrue("Size", error.size() == 1); assertEquals("String should equal", "VM not found", error.get(0)); } public void testStringSubstitutionWithList() { ErrorTranslator et = new ErrorTranslatorImpl("AppErrors"); - List<String> error = et.TranslateErrorText(Arrays.asList("ACTION_TYPE_FAILED_VM_IMAGE_DOES_NOT_EXIST", + List<String> error = et.TranslateErrorText(Arrays.asList(TEST_KEY_WITH_REPLACEMENT, "$action SOMEACTION", "$type SOME Type")); String result = "Cannot SOMEACTION SOME Type. VM's Image doesn't exist."; assertTrue("Size", error.size() == 1); @@ -53,10 +56,10 @@ try { Locale.setDefault(Locale.GERMAN); ErrorTranslator et = new ErrorTranslatorImpl(name); - List<String> errors = et.TranslateErrorText(Arrays.asList("DB_NO_SUCH_VM")); + List<String> errors = et.TranslateErrorText(Arrays.asList(TEST_KEY_NO_REPLACEMENT)); assertEquals("Unexpected Size", 1, errors.size()); assertEquals("String should equal", "Desktop nicht gefunden", errors.get(0)); - String error = et.TranslateErrorTextSingle("DB_NO_SUCH_VM", Locale.GERMAN); + String error = et.TranslateErrorTextSingle(TEST_KEY_NO_REPLACEMENT, Locale.GERMAN); assertEquals("String should equal", "Desktop nicht gefunden", error); } finally { Locale.setDefault(locale); @@ -73,10 +76,10 @@ private void doTestLocaleOverride(String name) { ErrorTranslator et = new ErrorTranslatorImpl(name); - List<String> errors = et.TranslateErrorText(Arrays.asList("DB_NO_SUCH_VM"), Locale.ITALIAN); + List<String> errors = et.TranslateErrorText(Arrays.asList(TEST_KEY_NO_REPLACEMENT), Locale.ITALIAN); assertEquals("Unexpected Size", 1, errors.size()); assertEquals("String should equal", "Impossibile trovare il desktop", errors.get(0)); - String error = et.TranslateErrorTextSingle("DB_NO_SUCH_VM", Locale.ITALIAN); + String error = et.TranslateErrorTextSingle(TEST_KEY_NO_REPLACEMENT, Locale.ITALIAN); assertEquals("String should equal", "Impossibile trovare il desktop", error); } } diff --git a/backend/manager/modules/utils/src/test/resources/AppErrors.properties b/backend/manager/modules/utils/src/test/resources/AppErrors.properties index aa87928..ac9284f 100644 --- a/backend/manager/modules/utils/src/test/resources/AppErrors.properties +++ b/backend/manager/modules/utils/src/test/resources/AppErrors.properties @@ -1,2 +1,2 @@ -DB_NO_SUCH_VM=VM not found -ACTION_TYPE_FAILED_VM_IMAGE_DOES_NOT_EXIST=Cannot ${action} ${type}. VM's Image doesn't exist. +TEST_KEY_NO_REPLACEMENT=VM not found +TEST_KEY_WITH_REPLACEMENT=Cannot ${action} ${type}. VM's Image doesn't exist. diff --git a/backend/manager/modules/utils/src/test/resources/AppErrors_de.properties b/backend/manager/modules/utils/src/test/resources/AppErrors_de.properties index 4bbaa03..24e6eb8 100644 --- a/backend/manager/modules/utils/src/test/resources/AppErrors_de.properties +++ b/backend/manager/modules/utils/src/test/resources/AppErrors_de.properties @@ -1 +1 @@ -DB_NO_SUCH_VM=Desktop nicht gefunden +TEST_KEY_NO_REPLACEMENT=Desktop nicht gefunden diff --git a/backend/manager/modules/utils/src/test/resources/AppErrors_it.properties b/backend/manager/modules/utils/src/test/resources/AppErrors_it.properties index c2bf225..dd0c6dc 100644 --- a/backend/manager/modules/utils/src/test/resources/AppErrors_it.properties +++ b/backend/manager/modules/utils/src/test/resources/AppErrors_it.properties @@ -1 +1 @@ -DB_NO_SUCH_VM=Impossibile trovare il desktop +TEST_KEY_NO_REPLACEMENT=Impossibile trovare il desktop -- To view, visit http://gerrit.ovirt.org/10853 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3789faa2721154a7ab31dacf0661861af5e9b4d4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
