Allon Mureinik has uploaded a new change for review. Change subject: core: Use @Before in searchbackend tests ......................................................................
core: Use @Before in searchbackend tests Added an set up method (with @Before) to initialize the object being tested in test cases that have more than one test, as per proper JUnit4 conventions. Change-Id: Id3a1ca0aca1f570bf2763d6991d56427d0c17764 Signed-off-by: Allon Mureinik <[email protected]> --- 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/EnumValueAutoCompleterTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleterTest.java 4 files changed, 31 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/13863/1 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 97c0530..70aa0c1 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 @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.List; +import org.junit.Before; import org.junit.Test; /** @@ -13,10 +14,15 @@ * */ public class BitValueAutoCompleterTest { + private IAutoCompleter comp; + + @Before + public void setUp() { + comp = new BitValueAutoCompleter(); + } @Test public void testEmpty() { - IAutoCompleter comp = new BitValueAutoCompleter(); List<String> comps = Arrays.asList(comp.getCompletion("")); assertTrue("true", comps.contains("true")); assertTrue("false", comps.contains("false")); @@ -25,7 +31,6 @@ @Test public void testSpace() { - IAutoCompleter comp = new BitValueAutoCompleter(); List<String> comps = Arrays.asList(comp.getCompletion(" ")); assertTrue("true", comps.contains("true")); assertTrue("false", comps.contains("false")); @@ -34,7 +39,6 @@ @Test public void testValue() { - IAutoCompleter comp = new BitValueAutoCompleter(); List<String> comps = Arrays.asList(comp.getCompletion("t")); assertTrue("true", comps.contains("true")); assertTrue("false", !comps.contains("false")); @@ -42,7 +46,6 @@ @Test public void testValueCaps() { - IAutoCompleter comp = new BitValueAutoCompleter(); List<String> comps = Arrays.asList(comp.getCompletion("FA")); assertTrue("false", comps.contains("false")); assertTrue("true", !comps.contains("true")); @@ -50,7 +53,6 @@ @Test public void testValidate() { - IAutoCompleter comp = new BitValueAutoCompleter(); assertTrue("true", comp.validate("true")); assertTrue("TRUE", comp.validate("TRUE")); assertFalse("JarJar", comp.validate("JarJar")); @@ -58,7 +60,6 @@ @Test public void testValidateCompletion() { - IAutoCompleter comp = new BitValueAutoCompleter(); assertTrue("TRUE", comp.validateCompletion("TRUE")); assertTrue("TR", comp.validateCompletion("TR")); assertFalse("JarJar", comp.validateCompletion("JarJar")); 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 d39ae70..f0391e7 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 @@ -6,13 +6,20 @@ import java.util.Arrays; import java.util.List; +import org.junit.Before; import org.junit.Test; public class DateEnumValueAutoCompleterTest { + private DateEnumValueAutoCompleter comp; + + @Before + public void setUp() { + comp = new DateEnumValueAutoCompleter(Jedi.class); + } + @Test public void testValues() { - DateEnumValueAutoCompleter comp = new DateEnumValueAutoCompleter(Jedi.class); List<String> comps = Arrays.asList(comp.getCompletion(" ")); assertTrue("Monday", comps.contains("Monday") || comps.contains("Tuesday")); assertTrue("mace", comps.contains("mace")); @@ -20,7 +27,6 @@ @Test public void testConvertFieldEnumValueToActualValue() { - DateEnumValueAutoCompleter comp = new DateEnumValueAutoCompleter(Jedi.class); // Dates should return dates String test = "01/20/1972"; String expected = test; 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 fc7f7f1..703093f 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 @@ -6,13 +6,20 @@ import java.util.Arrays; import java.util.List; +import org.junit.Before; import org.junit.Test; public class EnumValueAutoCompleterTest { + private EnumValueAutoCompleter comp; + + @Before + public void setUp() { + comp = new EnumValueAutoCompleter(Jedi.class); + } + @Test public void testValues() { - IAutoCompleter comp = new EnumValueAutoCompleter(Jedi.class); List<String> comps = Arrays.asList(comp.getCompletion("L")); assertTrue("luke", comps.contains("luke")); assertTrue("leia", comps.contains("leia")); @@ -20,7 +27,6 @@ @Test public void testConvertFieldEnumValueToActualValue() { - EnumValueAutoCompleter comp = new EnumValueAutoCompleter(Jedi.class); assertEquals("MACE", "4", comp.convertFieldEnumValueToActualValue("MACE")); assertEquals("mace", "4", comp.convertFieldEnumValueToActualValue("mace")); } 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 3feb6b7..bc9dbc3 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 @@ -6,12 +6,19 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import org.junit.Before; import org.junit.Test; public class SearchObjectAutoCompleterTest { + private SearchObjectAutoCompleter comp; + + @Before + public void setUp() { + comp = new SearchObjectAutoCompleter(true); + } + @Test public void testGetDefaultSortbyPhrase() { - SearchObjectAutoCompleter comp = new SearchObjectAutoCompleter(true); assertTrue("HOST", comp.getDefaultSort("HOST").contains("vds_name")); assertEquals("Garbage", "", comp.getDefaultSort("kjfhkjdshkjfs")); assertEquals("Null", "", comp.getDefaultSort(null)); @@ -19,7 +26,6 @@ @Test public void testGetRelatedTableName() { - SearchObjectAutoCompleter comp = new SearchObjectAutoCompleter(true); assertEquals("EVENTS", "audit_log", comp.getRelatedTableName("EVENTS")); assertNull("Garbage", comp.getRelatedTableName("kjfhkjdshkjfs")); assertNull("Null", comp.getRelatedTableName(null)); @@ -27,7 +33,6 @@ @Test public void testIsCrossReference() { - SearchObjectAutoCompleter comp = new SearchObjectAutoCompleter(true); assertTrue("EVENTS", comp.isCrossReferece("EVENTS", "TEMPLATES")); assertFalse("Garbage Cross", comp.isCrossReferece("fsfsdf", "TEMPLATES")); assertFalse("Garbage Object", comp.isCrossReferece("EVENTS", "fsfds")); @@ -37,7 +42,6 @@ @Test public void testGetInnerJoin() { - SearchObjectAutoCompleter comp = new SearchObjectAutoCompleter(true); assertNotNull("Sanity test", comp.getInnerJoin("EVENT", "USER")); } -- To view, visit http://gerrit.ovirt.org/13863 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3a1ca0aca1f570bf2763d6991d56427d0c17764 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
