Allon Mureinik has uploaded a new change for review. Change subject: core: Convert searchbackend tests to JUnit4 ......................................................................
core: Convert searchbackend tests to JUnit4 Change-Id: Id02d02f82f2d63642c52c92194a2c44f1b614473 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BitValueAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NumericConditionRelationAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectsBaseAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleterTest.java 12 files changed, 83 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/13861/1 diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleterTest.java index 39d2777..bb4ed1b 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleterTest.java @@ -1,11 +1,14 @@ package org.ovirt.engine.core.searchbackend; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; /** * @see BitValueAutoCompleterTest */ -public class BaseAutoCompleterTest extends TestCase { +public class BaseAutoCompleterTest { + @Test public void testChangeCaseDisplay() { BaseAutoCompleter bac = new BaseAutoCompleter(); assertEquals("normal", "jarjarbinks", bac.changeCaseDisplay("JarJarBinks")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BitValueAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BitValueAutoCompleterTest.java index b762d8d..97c0530 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BitValueAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/BitValueAutoCompleterTest.java @@ -1,16 +1,20 @@ package org.ovirt.engine.core.searchbackend; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; +import org.junit.Test; /** * this is the main test class for the BaseAutoCompleter class * */ -public class BitValueAutoCompleterTest extends TestCase { +public class BitValueAutoCompleterTest { + @Test public void testEmpty() { IAutoCompleter comp = new BitValueAutoCompleter(); List<String> comps = Arrays.asList(comp.getCompletion("")); @@ -19,6 +23,7 @@ assertTrue("False", !comps.contains("False")); } + @Test public void testSpace() { IAutoCompleter comp = new BitValueAutoCompleter(); List<String> comps = Arrays.asList(comp.getCompletion(" ")); @@ -27,6 +32,7 @@ assertTrue("False", !comps.contains("False")); } + @Test public void testValue() { IAutoCompleter comp = new BitValueAutoCompleter(); List<String> comps = Arrays.asList(comp.getCompletion("t")); @@ -34,6 +40,7 @@ assertTrue("false", !comps.contains("false")); } + @Test public void testValueCaps() { IAutoCompleter comp = new BitValueAutoCompleter(); List<String> comps = Arrays.asList(comp.getCompletion("FA")); @@ -41,6 +48,7 @@ assertTrue("true", !comps.contains("true")); } + @Test public void testValidate() { IAutoCompleter comp = new BitValueAutoCompleter(); assertTrue("true", comp.validate("true")); @@ -48,6 +56,7 @@ assertFalse("JarJar", comp.validate("JarJar")); } + @Test public void testValidateCompletion() { IAutoCompleter comp = new BitValueAutoCompleter(); assertTrue("TRUE", comp.validateCompletion("TRUE")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleterTest.java index 1cfed0e..6155a77 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DateEnumValueAutoCompleterTest.java @@ -1,12 +1,16 @@ package org.ovirt.engine.core.searchbackend; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; +import org.junit.Test; -public class DateEnumValueAutoCompleterTest extends TestCase { +public class DateEnumValueAutoCompleterTest { + @Test public void testValues() { DateEnumValueAutoCompleter comp = new DateEnumValueAutoCompleter(Jedi.class); List<String> comps = Arrays.asList(comp.getCompletion(" ")); @@ -15,6 +19,7 @@ assertTrue("mace", comps.contains("mace")); } + @Test public void testConvertFieldEnumValueToActualValue() { DateEnumValueAutoCompleter comp = new DateEnumValueAutoCompleter(Jedi.class); // Dates should return dates diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleterTest.java index b7afdc5..25496db 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/DiskConditionFieldAutoCompleterTest.java @@ -1,9 +1,12 @@ package org.ovirt.engine.core.searchbackend; -import junit.framework.TestCase; +import static org.junit.Assert.assertTrue; -public class DiskConditionFieldAutoCompleterTest extends TestCase { +import org.junit.Test; +public class DiskConditionFieldAutoCompleterTest { + + @Test public void testValidateFieldValueWithEnum() { IConditionFieldAutoCompleter comp = new DiskConditionFieldAutoCompleter(); assertTrue(comp.validateFieldValue("FORMAT", "RAW")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleterTest.java index 35852b3..5efc391 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/EnumValueAutoCompleterTest.java @@ -1,12 +1,16 @@ package org.ovirt.engine.core.searchbackend; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; +import org.junit.Test; -public class EnumValueAutoCompleterTest extends TestCase { +public class EnumValueAutoCompleterTest { + @Test public void testValues() { IAutoCompleter comp = new EnumValueAutoCompleter(Jedi.class); List<String> comps = Arrays.asList(comp.getCompletion("L")); @@ -15,6 +19,7 @@ assertTrue("leia", comps.contains("leia")); } + @Test public void testConvertFieldEnumValueToActualValue() { EnumValueAutoCompleter comp = new EnumValueAutoCompleter(Jedi.class); assertEquals("MACE", "4", comp.convertFieldEnumValueToActualValue("MACE")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleterTest.java index 2b6e858..8cc5bd9 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleterTest.java @@ -1,9 +1,12 @@ package org.ovirt.engine.core.searchbackend; -import junit.framework.TestCase; +import static org.junit.Assert.assertTrue; -public class NetworkConditionFieldAutoCompleterTest extends TestCase { +import org.junit.Test; +public class NetworkConditionFieldAutoCompleterTest { + + @Test public void testValidateFieldValueWithEnum() { IConditionFieldAutoCompleter comp = new NetworkConditionFieldAutoCompleter(); assertTrue(comp.validateFieldValue("NAME", "ABC")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NumericConditionRelationAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NumericConditionRelationAutoCompleterTest.java index b9d902c..746a6f4 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NumericConditionRelationAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/NumericConditionRelationAutoCompleterTest.java @@ -1,12 +1,16 @@ package org.ovirt.engine.core.searchbackend; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; +import org.junit.Test; -public class NumericConditionRelationAutoCompleterTest extends TestCase { +public class NumericConditionRelationAutoCompleterTest { + @Test public void testValue() { List<String> comps = Arrays.asList(NumericConditionRelationAutoCompleter.INSTANCE.getCompletion("<")); assertTrue("<", comps.contains("<")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java index 7607bb3..3feb6b7 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java @@ -1,11 +1,15 @@ package org.ovirt.engine.core.searchbackend; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import org.junit.Test; -import junit.framework.Assert; -import junit.framework.TestCase; - -public class SearchObjectAutoCompleterTest extends TestCase { +public class SearchObjectAutoCompleterTest { + @Test public void testGetDefaultSortbyPhrase() { SearchObjectAutoCompleter comp = new SearchObjectAutoCompleter(true); assertTrue("HOST", comp.getDefaultSort("HOST").contains("vds_name")); @@ -13,6 +17,7 @@ assertEquals("Null", "", comp.getDefaultSort(null)); } + @Test public void testGetRelatedTableName() { SearchObjectAutoCompleter comp = new SearchObjectAutoCompleter(true); assertEquals("EVENTS", "audit_log", comp.getRelatedTableName("EVENTS")); @@ -20,6 +25,7 @@ assertNull("Null", comp.getRelatedTableName(null)); } + @Test public void testIsCrossReference() { SearchObjectAutoCompleter comp = new SearchObjectAutoCompleter(true); assertTrue("EVENTS", comp.isCrossReferece("EVENTS", "TEMPLATES")); @@ -29,6 +35,7 @@ assertFalse("Null text", comp.isCrossReferece(null, "TEMPLATES")); } + @Test public void testGetInnerJoin() { SearchObjectAutoCompleter comp = new SearchObjectAutoCompleter(true); assertNotNull("Sanity test", comp.getInnerJoin("EVENT", "USER")); @@ -36,9 +43,9 @@ @Test public void testGetEntitySearchInfo() { - Assert.assertNotNull(SearchObjectAutoCompleter.getEntitySearchInfo(SearchObjects.AUDIT_PLU_OBJ_NAME)); - Assert.assertEquals(SearchObjectAutoCompleter.getEntitySearchInfo(SearchObjects.AUDIT_PLU_OBJ_NAME), + assertNotNull(SearchObjectAutoCompleter.getEntitySearchInfo(SearchObjects.AUDIT_PLU_OBJ_NAME)); + assertEquals(SearchObjectAutoCompleter.getEntitySearchInfo(SearchObjects.AUDIT_PLU_OBJ_NAME), SearchObjectAutoCompleter.getEntitySearchInfo(SearchObjects.AUDIT_OBJ_NAME)); - Assert.assertNull(SearchObjectAutoCompleter.getEntitySearchInfo("RANDOM_NOTEXISTING_KEY")); + assertNull(SearchObjectAutoCompleter.getEntitySearchInfo("RANDOM_NOTEXISTING_KEY")); } } diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectsBaseAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectsBaseAutoCompleterTest.java index 93fc338..a92339a 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectsBaseAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectsBaseAutoCompleterTest.java @@ -1,9 +1,12 @@ package org.ovirt.engine.core.searchbackend; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; -public class SearchObjectsBaseAutoCompleterTest extends TestCase { +import org.junit.Test; +public class SearchObjectsBaseAutoCompleterTest { + + @Test public void testChangeCaseDisplay() { SearchObjectsBaseAutoCompleter comp = new SearchObjectsBaseAutoCompleter(); assertEquals("hello", "Hello", comp.changeCaseDisplay("hello")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleterTest.java index ecc600a..64c5ddc 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleterTest.java @@ -1,14 +1,18 @@ package org.ovirt.engine.core.searchbackend; -import junit.framework.TestCase; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; /** * Use this to test the integer delegate * * */ -public class StorageDomainFieldAutoCompleterTest extends TestCase { +public class StorageDomainFieldAutoCompleterTest { + @Test public void testValidate() { StorageDomainFieldAutoCompleter comp = new StorageDomainFieldAutoCompleter(); assertTrue("1", comp.validateFieldValue("SIZE", "1")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleterTest.java index 0ca86cb..f8c63f9 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleterTest.java @@ -1,14 +1,18 @@ package org.ovirt.engine.core.searchbackend; -import junit.framework.TestCase; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; /** * Use this to test the BigDecimal delegate * * */ -public class VdsConditionFieldAutoCompleterTest extends TestCase { +public class VdsConditionFieldAutoCompleterTest { + @Test public void testValidate() { VdsConditionFieldAutoCompleter comp = new VdsConditionFieldAutoCompleter(); assertTrue("1", comp.validateFieldValue("LOAD", "1")); diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleterTest.java index f7c1f9d..46a05bc 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleterTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleterTest.java @@ -1,14 +1,18 @@ package org.ovirt.engine.core.searchbackend; -import junit.framework.TestCase; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; /** * Use this to test the TimeSpan validators * * */ -public class VmConditionFieldAutoCompleterTest extends TestCase { +public class VmConditionFieldAutoCompleterTest { + @Test public void testValidate() { VmConditionFieldAutoCompleter comp = new VmConditionFieldAutoCompleter(); assertTrue("-02:03:04.05", comp.validateFieldValue("UPTIME", "-02:03:04.05")); -- To view, visit http://gerrit.ovirt.org/13861 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id02d02f82f2d63642c52c92194a2c44f1b614473 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
