Allon Mureinik has uploaded a new change for review. Change subject: core: Convert ErrorTranslatorTest to JUnit4 syntax ......................................................................
core: Convert ErrorTranslatorTest to JUnit4 syntax Change-Id: I072de540ba81f6ac79edeaf5657ffdb4fc1cdf79 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ErrorTranslatorTest.java 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/13857/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 b25b97c..854f573 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 @@ -1,24 +1,28 @@ package org.ovirt.engine.core.utils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.List; import java.util.Locale; -import junit.framework.TestCase; - +import org.junit.Test; import org.ovirt.engine.core.common.interfaces.ErrorTranslator; -public class ErrorTranslatorTest extends TestCase { +public class ErrorTranslatorTest { private static final String TEST_KEY_NO_REPLACEMENT = "TEST_KEY_NO_REPLACEMENT"; private static final String TEST_KEY_WITH_REPLACEMENT = "TEST_KEY_WITH_REPLACEMENT"; private static final String FILENAME = "TestAppErrors"; private static final String FILENAME_WITH_SUFFIX = FILENAME + ".properties"; + @Test public void testNoStringSubstitutionWithoutSuffix() { doTestNoStringSubstitution(FILENAME); } + @Test public void testNoStringSubstitutionWithSuffix() { doTestNoStringSubstitution(FILENAME_WITH_SUFFIX); } @@ -29,6 +33,7 @@ assertEquals("String should equal", "VM not found", error); } + @Test public void testNoStringSubstitutionWithList() { ErrorTranslator et = new ErrorTranslatorImpl(FILENAME); List<String> error = et.TranslateErrorText(Arrays.asList(TEST_KEY_NO_REPLACEMENT)); @@ -36,6 +41,7 @@ assertEquals("String should equal", "VM not found", error.get(0)); } + @Test public void testStringSubstitutionWithList() { ErrorTranslator et = new ErrorTranslatorImpl(FILENAME); List<String> error = et.TranslateErrorText(Arrays.asList(TEST_KEY_WITH_REPLACEMENT, @@ -45,10 +51,12 @@ assertEquals("String should equal", result, error.get(0)); } + @Test public void testLocaleSpecificWithoutSuffix() { doTestLocaleSpecific(FILENAME); } + @Test public void testLocaleSpecificWithSuffix() { doTestLocaleSpecific(FILENAME_WITH_SUFFIX); } @@ -68,10 +76,12 @@ } } + @Test public void testLocaleOverrideWithoutSuffix() { doTestLocaleOverride(FILENAME); } + @Test public void testLocaleOverrideWithSuffix() { doTestLocaleOverride(FILENAME_WITH_SUFFIX); } -- To view, visit http://gerrit.ovirt.org/13857 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I072de540ba81f6ac79edeaf5657ffdb4fc1cdf79 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
