Repository: sqoop Updated Branches: refs/heads/SQOOP-1367 5f04f5307 -> 3bb7ff834
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMConnection.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMConnection.java b/common/src/test/java/org/apache/sqoop/model/TestMConnection.java index aa58f05..27959fb 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMConnection.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMConnection.java @@ -29,94 +29,94 @@ import org.junit.Test; */ public class TestMConnection { -// /** -// * Test for initialization -// */ -// @Test -// public void testInitialization() { -// // Test default constructor -// MConnection connection = connection(); -// assertEquals(123l, connection.getConnectorId()); -// assertEquals("Vampire", connection.getName()); -// assertEquals("Buffy", connection.getCreationUser()); -// assertEquals(forms1(), connection.getConnectorPart()); -// assertEquals(forms2(), connection.getFrameworkPart()); -// -// // Test copy constructor -// MConnection copy = new MConnection(connection); -// assertEquals(123l, copy.getConnectorId()); -// assertEquals("Vampire", copy.getName()); -// assertEquals("Buffy", copy.getCreationUser()); -// assertEquals(connection.getCreationDate(), copy.getCreationDate()); -// assertEquals(forms1(), copy.getConnectorPart()); -// assertEquals(forms2(), copy.getFrameworkPart()); -// -// // Test constructor for metadata upgrade (the order of forms is different) -// MConnection upgradeCopy = new MConnection(connection, forms2(), forms1()); -// assertEquals(123l, upgradeCopy.getConnectorId()); -// assertEquals("Vampire", upgradeCopy.getName()); -// assertEquals("Buffy", upgradeCopy.getCreationUser()); -// assertEquals(connection.getCreationDate(), upgradeCopy.getCreationDate()); -// assertEquals(forms2(), upgradeCopy.getConnectorPart()); -// assertEquals(forms1(), upgradeCopy.getFrameworkPart()); -// } -// -// @Test -// public void testClone() { -// MConnection connection = connection(); -// -// // Clone without value -// MConnection withoutValue = connection.clone(false); -// assertEquals(connection, withoutValue); -// assertEquals(MPersistableEntity.PERSISTANCE_ID_DEFAULT, withoutValue.getPersistenceId()); -// assertNull(withoutValue.getName()); -// assertNull(withoutValue.getCreationUser()); -// assertEquals(forms1(), withoutValue.getConnectorPart()); -// assertEquals(forms2(), withoutValue.getFrameworkPart()); -// assertNull(withoutValue.getConnectorPart().getForm("FORMNAME").getInput("INTEGER-INPUT").getValue()); -// assertNull(withoutValue.getConnectorPart().getForm("FORMNAME").getInput("STRING-INPUT").getValue()); -// -// // Clone with value -// MConnection withValue = connection.clone(true); -// assertEquals(connection, withValue); -// assertEquals(connection.getPersistenceId(), withValue.getPersistenceId()); -// assertEquals(connection.getName(), withValue.getName()); -// assertEquals(connection.getCreationUser(), withValue.getCreationUser()); -// assertEquals(forms1(), withValue.getConnectorPart()); -// assertEquals(forms2(), withValue.getFrameworkPart()); -// assertEquals(100, withValue.getConnectorPart().getForm("FORMNAME").getInput("INTEGER-INPUT").getValue()); -// assertEquals("TEST-VALUE", withValue.getConnectorPart().getForm("FORMNAME").getInput("STRING-INPUT").getValue()); -// } -// -// private MConnection connection() { -// MConnection connection = new MConnection(123l, forms1(), forms2()); -// connection.setName("Vampire"); -// connection.setCreationUser("Buffy"); -// return connection; -// } -// -// private MConnectionForms forms1() { -// List<MForm> forms = new ArrayList<MForm>(); -// MIntegerInput input = new MIntegerInput("INTEGER-INPUT", false); -// input.setValue(100); -// MStringInput strInput = new MStringInput("STRING-INPUT",false,(short)20); -// strInput.setValue("TEST-VALUE"); -// List<MInput<?>> list = new ArrayList<MInput<?>>(); -// list.add(input); -// list.add(strInput); -// MForm form = new MForm("FORMNAME", list); -// forms.add(form); -// return new MConnectionForms(forms); -// } -// -// private MConnectionForms forms2() { -// List<MForm> forms = new ArrayList<MForm>(); -// MMapInput input = new MMapInput("MAP-INPUT", false); -// List<MInput<?>> list = new ArrayList<MInput<?>>(); -// list.add(input); -// MForm form = new MForm("form", list); -// forms.add(form); -// return new MConnectionForms(forms); -// } + /** + * Test for initialization + */ + @Test + public void testInitialization() { + // Test default constructor + MConnection connection = connection(); + assertEquals(123l, connection.getConnectorId()); + assertEquals("Vampire", connection.getName()); + assertEquals("Buffy", connection.getCreationUser()); + assertEquals(forms1(), connection.getConnectorPart()); + assertEquals(forms2(), connection.getFrameworkPart()); + + // Test copy constructor + MConnection copy = new MConnection(connection); + assertEquals(123l, copy.getConnectorId()); + assertEquals("Vampire", copy.getName()); + assertEquals("Buffy", copy.getCreationUser()); + assertEquals(connection.getCreationDate(), copy.getCreationDate()); + assertEquals(forms1(), copy.getConnectorPart()); + assertEquals(forms2(), copy.getFrameworkPart()); + + // Test constructor for metadata upgrade (the order of forms is different) + MConnection upgradeCopy = new MConnection(connection, forms2(), forms1()); + assertEquals(123l, upgradeCopy.getConnectorId()); + assertEquals("Vampire", upgradeCopy.getName()); + assertEquals("Buffy", upgradeCopy.getCreationUser()); + assertEquals(connection.getCreationDate(), upgradeCopy.getCreationDate()); + assertEquals(forms2(), upgradeCopy.getConnectorPart()); + assertEquals(forms1(), upgradeCopy.getFrameworkPart()); + } + + @Test + public void testClone() { + MConnection connection = connection(); + + // Clone without value + MConnection withoutValue = connection.clone(false); + assertEquals(connection, withoutValue); + assertEquals(MPersistableEntity.PERSISTANCE_ID_DEFAULT, withoutValue.getPersistenceId()); + assertNull(withoutValue.getName()); + assertNull(withoutValue.getCreationUser()); + assertEquals(forms1(), withoutValue.getConnectorPart()); + assertEquals(forms2(), withoutValue.getFrameworkPart()); + assertNull(withoutValue.getConnectorPart().getForm("FORMNAME").getInput("INTEGER-INPUT").getValue()); + assertNull(withoutValue.getConnectorPart().getForm("FORMNAME").getInput("STRING-INPUT").getValue()); + + // Clone with value + MConnection withValue = connection.clone(true); + assertEquals(connection, withValue); + assertEquals(connection.getPersistenceId(), withValue.getPersistenceId()); + assertEquals(connection.getName(), withValue.getName()); + assertEquals(connection.getCreationUser(), withValue.getCreationUser()); + assertEquals(forms1(), withValue.getConnectorPart()); + assertEquals(forms2(), withValue.getFrameworkPart()); + assertEquals(100, withValue.getConnectorPart().getForm("FORMNAME").getInput("INTEGER-INPUT").getValue()); + assertEquals("TEST-VALUE", withValue.getConnectorPart().getForm("FORMNAME").getInput("STRING-INPUT").getValue()); + } + + private MConnection connection() { + MConnection connection = new MConnection(123l, forms1(), forms2()); + connection.setName("Vampire"); + connection.setCreationUser("Buffy"); + return connection; + } + + private MConnectionForms forms1() { + List<MForm> forms = new ArrayList<MForm>(); + MIntegerInput input = new MIntegerInput("INTEGER-INPUT", false); + input.setValue(100); + MStringInput strInput = new MStringInput("STRING-INPUT",false,(short)20); + strInput.setValue("TEST-VALUE"); + List<MInput<?>> list = new ArrayList<MInput<?>>(); + list.add(input); + list.add(strInput); + MForm form = new MForm("FORMNAME", list); + forms.add(form); + return new MConnectionForms(forms); + } + + private MConnectionForms forms2() { + List<MForm> forms = new ArrayList<MForm>(); + MMapInput input = new MMapInput("MAP-INPUT", false); + List<MInput<?>> list = new ArrayList<MInput<?>>(); + list.add(input); + MForm form = new MForm("form", list); + forms.add(form); + return new MConnectionForms(forms); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMConnectionForms.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMConnectionForms.java b/common/src/test/java/org/apache/sqoop/model/TestMConnectionForms.java index 0899dc3..e2d2717 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMConnectionForms.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMConnectionForms.java @@ -29,20 +29,20 @@ import org.junit.Test; */ public class TestMConnectionForms { -// /** -// * Test for class initialization and values -// */ -// @Test -// public void testInitialization() { -// List<MForm> forms = new ArrayList<MForm>(); -// MConnectionForms connectionForms1 = new MConnectionForms(forms); -// List<MForm> testForms = new ArrayList<MForm>(); -// assertEquals(testForms, connectionForms1.getForms()); -// MConnectionForms connectionForms2 = new MConnectionForms(testForms); -// assertEquals(connectionForms2, connectionForms1); -// // Add a form to list for checking not equals -// MForm m = new MForm("test", null); -// testForms.add(m); -// assertFalse(connectionForms1.equals(connectionForms2)); -// } + /** + * Test for class initialization and values + */ + @Test + public void testInitialization() { + List<MForm> forms = new ArrayList<MForm>(); + MConnectionForms connectionForms1 = new MConnectionForms(forms); + List<MForm> testForms = new ArrayList<MForm>(); + assertEquals(testForms, connectionForms1.getForms()); + MConnectionForms connectionForms2 = new MConnectionForms(testForms); + assertEquals(connectionForms2, connectionForms1); + // Add a form to list for checking not equals + MForm m = new MForm("test", null); + testForms.add(m); + assertFalse(connectionForms1.equals(connectionForms2)); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMConnector.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMConnector.java b/common/src/test/java/org/apache/sqoop/model/TestMConnector.java index b94c7de..9672d9d 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMConnector.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMConnector.java @@ -29,42 +29,42 @@ import org.junit.Test; */ public class TestMConnector { -// /** -// * Test for initialization -// */ -// @Test -// public void testInitialization() { -// List<MForm> forms = new ArrayList<MForm>(); -// MConnectionForms connectionForms1 = new MConnectionForms(forms); -// MJobForms jobform1 = new MJobForms(MJob.Type.EXPORT, forms); -// List<MJobForms> jobFormList = new ArrayList<MJobForms>(); -// jobFormList.add(jobform1); -// MConnector connector1 = new MConnector("NAME", "CLASSNAME", "1.0", -// connectionForms1, jobFormList); -// assertEquals("NAME", connector1.getUniqueName()); -// assertEquals("CLASSNAME", connector1.getClassName()); -// assertEquals("1.0", connector1.getVersion()); -// MConnector connector2 = new MConnector("NAME", "CLASSNAME", "1.0", -// connectionForms1, jobFormList); -// assertEquals(connector2, connector1); -// MConnector connector3 = new MConnector("NAME1", "CLASSNAME", "2.0", -// connectionForms1, jobFormList); -// assertFalse(connector1.equals(connector3)); -// -// try { -// connector1 = new MConnector(null, "CLASSNAME", "1.0", connectionForms1, -// jobFormList); // Expecting null pointer exception -// } catch (NullPointerException e) { -// assertTrue(true); -// } -// try { -// connector1 = new MConnector("NAME", null, "1.0", connectionForms1, -// jobFormList); // Expecting null pointer exception -// } catch (NullPointerException e) { -// assertTrue(true); -// } -// } -// + /** + * Test for initialization + */ + @Test + public void testInitialization() { + List<MForm> fromJobForms = new ArrayList<MForm>(); + List<MForm> toJobForms = new ArrayList<MForm>(); + MConnectionForms connectionForms1 = new MConnectionForms(fromJobForms); + MJobForms fromJobForm1 = new MJobForms(fromJobForms); + MJobForms toJobForm1 = new MJobForms(toJobForms); + MConnector connector1 = new MConnector("NAME", "CLASSNAME", "1.0", + connectionForms1, fromJobForm1, toJobForm1); + assertEquals("NAME", connector1.getUniqueName()); + assertEquals("CLASSNAME", connector1.getClassName()); + assertEquals("1.0", connector1.getVersion()); + MConnector connector2 = new MConnector("NAME", "CLASSNAME", "1.0", + connectionForms1, fromJobForm1, toJobForm1); + assertEquals(connector2, connector1); + MConnector connector3 = new MConnector("NAME1", "CLASSNAME", "2.0", + connectionForms1, fromJobForm1, toJobForm1); + assertFalse(connector1.equals(connector3)); + + try { + connector1 = new MConnector(null, "CLASSNAME", "1.0", connectionForms1, + fromJobForm1, toJobForm1); // Expecting null pointer exception + } catch (NullPointerException e) { + assertTrue(true); + } + try { + connector1 = new MConnector("NAME", null, "1.0", connectionForms1, + fromJobForm1, toJobForm1); // Expecting null pointer exception + } catch (NullPointerException e) { + assertTrue(true); + } + } + // @Test // public void testClone() { // List<MForm> forms = new ArrayList<MForm>(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java b/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java index 97baa32..a25016a 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java @@ -26,38 +26,38 @@ import org.junit.Test; */ public class TestMEnumInput { -// public enum Enumeration { value1, value2} -// /** -// * Test for class initialization -// */ -// @Test -// public void testInitialization() { -// String[] values = { "value1", "value2" }; -// MEnumInput input = new MEnumInput("NAME", false, values); -// assertEquals("NAME", input.getName()); -// assertArrayEquals(values, input.getValues()); -// assertEquals(MInputType.ENUM, input.getType()); -// -// MEnumInput input1 = new MEnumInput("NAME", false, values); -// assertEquals(input1, input); -// String[] testVal = { "val", "test" }; -// MEnumInput input2 = new MEnumInput("NAME1", false, testVal); -// assertFalse(input1.equals(input2)); -// -// MEnumInput input3 = new MEnumInput("NAME", false, values); -// input3.setValue(Enumeration.value1); -// assertEquals("value1", input3.getValue()); -// } -// -// /** -// * Test for sensitivity -// */ -// @Test -// public void testSensitivity() { -// String[] values = { "value1", "value2" }; -// MEnumInput input1 = new MEnumInput("NAME", false, values); -// MEnumInput input2 = new MEnumInput("NAME", true, values); -// assertFalse(input1.isSensitive()); -// assertTrue(input2.isSensitive()); -// } + public enum Enumeration { value1, value2} + /** + * Test for class initialization + */ + @Test + public void testInitialization() { + String[] values = { "value1", "value2" }; + MEnumInput input = new MEnumInput("NAME", false, values); + assertEquals("NAME", input.getName()); + assertArrayEquals(values, input.getValues()); + assertEquals(MInputType.ENUM, input.getType()); + + MEnumInput input1 = new MEnumInput("NAME", false, values); + assertEquals(input1, input); + String[] testVal = { "val", "test" }; + MEnumInput input2 = new MEnumInput("NAME1", false, testVal); + assertFalse(input1.equals(input2)); + + MEnumInput input3 = new MEnumInput("NAME", false, values); + input3.setValue(Enumeration.value1); + assertEquals("value1", input3.getValue()); + } + + /** + * Test for sensitivity + */ + @Test + public void testSensitivity() { + String[] values = { "value1", "value2" }; + MEnumInput input1 = new MEnumInput("NAME", false, values); + MEnumInput input2 = new MEnumInput("NAME", true, values); + assertFalse(input1.isSensitive()); + assertTrue(input2.isSensitive()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMForm.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMForm.java b/common/src/test/java/org/apache/sqoop/model/TestMForm.java index 109f1f5..0bd55d9 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMForm.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMForm.java @@ -28,61 +28,61 @@ import org.junit.Test; */ public class TestMForm { -// /** -// * Test for initialization -// */ -// @Test -// public void testInitialization() { -// MInput<String> input1 = new MStringInput("sqoopsqoop1", true, (short) 5); -// MInput<String> input2 = new MStringInput("sqoopsqoop2", true, (short) 5); -// -// List<MInput<?>> list = new ArrayList<MInput<?>>(); -// list.add(input1); -// list.add(input2); -// MForm mform = new MForm("form", list); -// -// assertEquals("form", mform.getName()); -// assertEquals(2, mform.getInputs().size()); -// } -// -// /** -// * Test for equals method -// */ -// @Test -// public void testEquals() { -// MInput<Integer> input1 = new MIntegerInput("sqoopsqoop1", false); -// MInput<Integer> input2 = new MIntegerInput("sqoopsqoop2", false); -// List<MInput<?>> list1 = new ArrayList<MInput<?>>(); -// list1.add(input1); -// list1.add(input2); -// MForm mform1 = new MForm("form", list1); -// -// MInput<Integer> input3 = new MIntegerInput("sqoopsqoop1", false); -// MInput<Integer> input4 = new MIntegerInput("sqoopsqoop2", false); -// List<MInput<?>> list2 = new ArrayList<MInput<?>>(); -// list2.add(input3); -// list2.add(input4); -// MForm mform2 = new MForm("form", list2); -// assertEquals(mform2, mform1); -// } -// -// @Test -// public void testGetInputs() { -// MIntegerInput intInput = new MIntegerInput("Form.A", false); -// MMapInput mapInput = new MMapInput("Form.B", false); -// MStringInput stringInput = new MStringInput("Form.C", false, (short)3); -// MEnumInput enumInput = new MEnumInput("Form.D", false, new String[] {"I", "V"}); -// -// List<MInput<?>> inputs = new ArrayList<MInput<?>>(); -// inputs.add(intInput); -// inputs.add(mapInput); -// inputs.add(stringInput); -// inputs.add(enumInput); -// -// MForm form = new MForm("Form", inputs); -// assertEquals(intInput, form.getIntegerInput("Form.A")); -// assertEquals(mapInput, form.getMapInput("Form.B")); -// assertEquals(stringInput, form.getStringInput("Form.C")); -// assertEquals(enumInput, form.getEnumInput("Form.D")); -// } + /** + * Test for initialization + */ + @Test + public void testInitialization() { + MInput<String> input1 = new MStringInput("sqoopsqoop1", true, (short) 5); + MInput<String> input2 = new MStringInput("sqoopsqoop2", true, (short) 5); + + List<MInput<?>> list = new ArrayList<MInput<?>>(); + list.add(input1); + list.add(input2); + MForm mform = new MForm("form", list); + + assertEquals("form", mform.getName()); + assertEquals(2, mform.getInputs().size()); + } + + /** + * Test for equals method + */ + @Test + public void testEquals() { + MInput<Integer> input1 = new MIntegerInput("sqoopsqoop1", false); + MInput<Integer> input2 = new MIntegerInput("sqoopsqoop2", false); + List<MInput<?>> list1 = new ArrayList<MInput<?>>(); + list1.add(input1); + list1.add(input2); + MForm mform1 = new MForm("form", list1); + + MInput<Integer> input3 = new MIntegerInput("sqoopsqoop1", false); + MInput<Integer> input4 = new MIntegerInput("sqoopsqoop2", false); + List<MInput<?>> list2 = new ArrayList<MInput<?>>(); + list2.add(input3); + list2.add(input4); + MForm mform2 = new MForm("form", list2); + assertEquals(mform2, mform1); + } + + @Test + public void testGetInputs() { + MIntegerInput intInput = new MIntegerInput("Form.A", false); + MMapInput mapInput = new MMapInput("Form.B", false); + MStringInput stringInput = new MStringInput("Form.C", false, (short)3); + MEnumInput enumInput = new MEnumInput("Form.D", false, new String[] {"I", "V"}); + + List<MInput<?>> inputs = new ArrayList<MInput<?>>(); + inputs.add(intInput); + inputs.add(mapInput); + inputs.add(stringInput); + inputs.add(enumInput); + + MForm form = new MForm("Form", inputs); + assertEquals(intInput, form.getIntegerInput("Form.A")); + assertEquals(mapInput, form.getMapInput("Form.B")); + assertEquals(stringInput, form.getStringInput("Form.C")); + assertEquals(enumInput, form.getEnumInput("Form.D")); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMFormList.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMFormList.java b/common/src/test/java/org/apache/sqoop/model/TestMFormList.java index 4894d2e..c7ee682 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMFormList.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMFormList.java @@ -29,30 +29,30 @@ import static junit.framework.Assert.assertEquals; * */ public class TestMFormList { -// @Test -// public void testGetInputs() { -// List<MForm> forms = new LinkedList<MForm>(); -// -// MIntegerInput intInput = new MIntegerInput("Form1.A", false); -// MMapInput mapInput = new MMapInput("Form1.B", false); -// -// List<MInput<?>> inputs = new ArrayList<MInput<?>>(); -// inputs.add(intInput); -// inputs.add(mapInput); -// forms.add(new MForm("Form1", inputs)); -// -// MStringInput stringInput = new MStringInput("Form2.C", false, (short)3); -// MEnumInput enumInput = new MEnumInput("Form2.D", false, new String[] {"I", "V"}); -// -// inputs = new ArrayList<MInput<?>>(); -// inputs.add(stringInput); -// inputs.add(enumInput); -// forms.add(new MForm("Form2", inputs)); -// -// MFormList form = new MFormList(forms); -// assertEquals(intInput, form.getIntegerInput("Form1.A")); -// assertEquals(mapInput, form.getMapInput("Form1.B")); -// assertEquals(stringInput, form.getStringInput("Form2.C")); -// assertEquals(enumInput, form.getEnumInput("Form2.D")); -// } + @Test + public void testGetInputs() { + List<MForm> forms = new LinkedList<MForm>(); + + MIntegerInput intInput = new MIntegerInput("Form1.A", false); + MMapInput mapInput = new MMapInput("Form1.B", false); + + List<MInput<?>> inputs = new ArrayList<MInput<?>>(); + inputs.add(intInput); + inputs.add(mapInput); + forms.add(new MForm("Form1", inputs)); + + MStringInput stringInput = new MStringInput("Form2.C", false, (short)3); + MEnumInput enumInput = new MEnumInput("Form2.D", false, new String[] {"I", "V"}); + + inputs = new ArrayList<MInput<?>>(); + inputs.add(stringInput); + inputs.add(enumInput); + forms.add(new MForm("Form2", inputs)); + + MFormList form = new MFormList(forms); + assertEquals(intInput, form.getIntegerInput("Form1.A")); + assertEquals(mapInput, form.getMapInput("Form1.B")); + assertEquals(stringInput, form.getStringInput("Form2.C")); + assertEquals(enumInput, form.getEnumInput("Form2.D")); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMFramework.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMFramework.java b/common/src/test/java/org/apache/sqoop/model/TestMFramework.java index d0720f0..5273a90 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMFramework.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMFramework.java @@ -29,18 +29,19 @@ import static org.junit.Assert.*; */ public class TestMFramework { -// @Test -// public void testFailureOnDuplicateJobTypes() { -// MConnectionForms connectionForms = new MConnectionForms(new ArrayList<MForm>()); -// List<MJobForms> jobForms = new ArrayList<MJobForms>(); -// jobForms.add(new MJobForms(MJob.Type.IMPORT, new ArrayList<MForm>())); -// jobForms.add(new MJobForms(MJob.Type.IMPORT, new ArrayList<MForm>())); -// -// try { -// new MFramework(connectionForms, jobForms, "1"); -// fail("We we're expecting exception for invalid usage"); -// } catch(Exception ex) { -// // Expected case -// } -// } + @Test + public void testForms() { + List<MForm> connectionFormList = new ArrayList<MForm>(); + List<MForm> jobFormList = new ArrayList<MForm>(); + connectionFormList.add(new MForm("connection-test", new ArrayList<MInput<?>>())); + jobFormList.add(new MForm("job-test", new ArrayList<MInput<?>>())); + MConnectionForms connectionForms = new MConnectionForms(connectionFormList); + MJobForms jobForms = new MJobForms(jobFormList); + + MFramework framework = new MFramework(connectionForms, jobForms, "1"); + assertEquals(1, framework.getJobForms().getForms().size()); + assertEquals("job-test", framework.getJobForms().getForms().get(0).getName()); + assertEquals(1, framework.getConnectionForms().getForms().size()); + assertEquals("connection-test", framework.getConnectionForms().getForms().get(0).getName()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java b/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java index 14bca67..1f38e6d 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java @@ -28,76 +28,76 @@ import org.junit.Test; * Test class for org.apache.sqoop.model.MInputInput */ public class TestMIntegerInput { -// /** -// * Test for class initialization -// */ -// @Test -// public void testInitialization() { -// MIntegerInput input = new MIntegerInput("sqoopsqoop", false); -// assertEquals("sqoopsqoop", input.getName()); -// assertEquals(MInputType.INTEGER, input.getType()); -// } -// -// /** -// * Test for equals() method -// */ -// @Test -// public void testEquals() { -// // Positive test -// MIntegerInput input1 = new MIntegerInput("sqoopsqoop", false); -// MIntegerInput input2 = new MIntegerInput("sqoopsqoop", false); -// assertTrue(input1.equals(input2)); -// -// // Negative test -// MIntegerInput input3 = new MIntegerInput("sqoopsqoop", false); -// MIntegerInput input4 = new MIntegerInput("sqoopsqoop1", false); -// assertFalse(input3.equals(input4)); -// } -// -// /** -// * Test for value -// */ -// @Test -// public void testValue() { -// MIntegerInput input1 = new MIntegerInput("sqoopsqoop", false); -// input1.setValue(99); -// assertEquals(new Integer(99), input1.getValue()); -// input1.setEmpty(); -// assertNull(input1.getValue()); -// } -// -// /** -// * Test for getUrlSafeValueString() and restoreFromUrlSafeValueString() -// */ -// @Test -// public void testUrlSafe() { -// MIntegerInput input1 = new MIntegerInput("sqoopsqoop", false); -// input1.setValue(1001); -// // Getting URL safe string -// String tmp = input1.getUrlSafeValueString(); -// // Restore to actual value -// input1.restoreFromUrlSafeValueString(tmp); -// assertEquals(new Integer(1001), input1.getValue()); -// } -// -// /** -// * Test case for MNamedElement.getLabelKey() and MNamedElement.getHelpKey() -// */ -// @Test -// public void testNamedElement() { -// MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); -// assertEquals("sqoopsqoop.label", input1.getLabelKey()); -// assertEquals("sqoopsqoop.help", input1.getHelpKey()); -// } -// -// /** -// * Test for sensitivity -// */ -// @Test -// public void testSensitivity() { -// MIntegerInput input1 = new MIntegerInput("NAME", false); -// MIntegerInput input2 = new MIntegerInput("NAME", true); -// assertFalse(input1.isSensitive()); -// assertTrue(input2.isSensitive()); -// } + /** + * Test for class initialization + */ + @Test + public void testInitialization() { + MIntegerInput input = new MIntegerInput("sqoopsqoop", false); + assertEquals("sqoopsqoop", input.getName()); + assertEquals(MInputType.INTEGER, input.getType()); + } + + /** + * Test for equals() method + */ + @Test + public void testEquals() { + // Positive test + MIntegerInput input1 = new MIntegerInput("sqoopsqoop", false); + MIntegerInput input2 = new MIntegerInput("sqoopsqoop", false); + assertTrue(input1.equals(input2)); + + // Negative test + MIntegerInput input3 = new MIntegerInput("sqoopsqoop", false); + MIntegerInput input4 = new MIntegerInput("sqoopsqoop1", false); + assertFalse(input3.equals(input4)); + } + + /** + * Test for value + */ + @Test + public void testValue() { + MIntegerInput input1 = new MIntegerInput("sqoopsqoop", false); + input1.setValue(99); + assertEquals(new Integer(99), input1.getValue()); + input1.setEmpty(); + assertNull(input1.getValue()); + } + + /** + * Test for getUrlSafeValueString() and restoreFromUrlSafeValueString() + */ + @Test + public void testUrlSafe() { + MIntegerInput input1 = new MIntegerInput("sqoopsqoop", false); + input1.setValue(1001); + // Getting URL safe string + String tmp = input1.getUrlSafeValueString(); + // Restore to actual value + input1.restoreFromUrlSafeValueString(tmp); + assertEquals(new Integer(1001), input1.getValue()); + } + + /** + * Test case for MNamedElement.getLabelKey() and MNamedElement.getHelpKey() + */ + @Test + public void testNamedElement() { + MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); + assertEquals("sqoopsqoop.label", input1.getLabelKey()); + assertEquals("sqoopsqoop.help", input1.getHelpKey()); + } + + /** + * Test for sensitivity + */ + @Test + public void testSensitivity() { + MIntegerInput input1 = new MIntegerInput("NAME", false); + MIntegerInput input2 = new MIntegerInput("NAME", true); + assertFalse(input1.isSensitive()); + assertTrue(input2.isSensitive()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMJob.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMJob.java b/common/src/test/java/org/apache/sqoop/model/TestMJob.java index 355cdb9..96c316a 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMJob.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMJob.java @@ -22,114 +22,119 @@ import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; -import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.common.Direction; import org.junit.Test; /** * Test class for org.apache.sqoop.model.MJob */ public class TestMJob { -// /** -// * Test class for initialization -// */ -// @Test -// public void testInitialization() { -// // Test default constructor -// MJob job = job(MJob.Type.IMPORT); -// assertEquals(123l, job.getFromConnectorId()); -// assertEquals(MJob.Type.IMPORT, job.getType()); -// assertEquals("Buffy", job.getCreationUser()); -// assertEquals("Vampire", job.getName()); -// assertEquals(forms1(MJob.Type.IMPORT), job.getFromPart()); -// assertEquals(forms2(MJob.Type.IMPORT), job.getFrameworkPart()); -// -// // Test copy constructor -// MJob copy = new MJob(job); -// assertEquals(123l, copy.getFromConnectorId()); -// assertEquals(MJob.Type.IMPORT, copy.getType()); -// assertEquals("Vampire", copy.getName()); -// assertEquals("Buffy", copy.getCreationUser()); -// assertEquals(job.getCreationDate(), copy.getCreationDate()); -// assertEquals(forms1(MJob.Type.IMPORT), copy.getFromPart()); -// assertEquals(forms2(MJob.Type.IMPORT), copy.getFrameworkPart()); -// -// // Test constructor for metadata upgrade (the order of forms is different) -// MJob upgradeCopy = new MJob(job, forms2(MJob.Type.IMPORT), forms1(MJob.Type.IMPORT)); -// assertEquals(123l, upgradeCopy.getFromConnectorId()); -// assertEquals(MJob.Type.IMPORT, upgradeCopy.getType()); -// assertEquals("Vampire", upgradeCopy.getName()); -// assertEquals("Buffy", upgradeCopy.getCreationUser()); -// assertEquals(job.getCreationDate(), upgradeCopy.getCreationDate()); -// assertEquals(forms2(MJob.Type.IMPORT), upgradeCopy.getFromPart()); -// assertEquals(forms1(MJob.Type.IMPORT), upgradeCopy.getFrameworkPart()); -// } -// -// @Test(expected = SqoopException.class) -// public void testIncorrectDefaultConstructor() { -// new MJob(1l, 1l, MJob.Type.IMPORT, forms1(MJob.Type.IMPORT), forms2(MJob.Type.EXPORT)); -// } -// -// @Test(expected = SqoopException.class) -// public void testIncorrectUpgradeConstructor() { -// new MJob(job(MJob.Type.EXPORT), forms1(MJob.Type.IMPORT), forms2(MJob.Type.IMPORT)); -// } -// -// @Test -// public void testClone() { -// MJob job = job(MJob.Type.IMPORT); -// -// // Clone without value -// MJob withoutValue = job.clone(false); -// assertEquals(job, withoutValue); -// assertEquals(MPersistableEntity.PERSISTANCE_ID_DEFAULT, withoutValue.getPersistenceId()); -// assertEquals(MJob.Type.IMPORT, withoutValue.getType()); -// assertNull(withoutValue.getName()); -// assertNull(withoutValue.getCreationUser()); -// assertEquals(forms1(MJob.Type.IMPORT), withoutValue.getFromPart()); -// assertEquals(forms2(MJob.Type.IMPORT), withoutValue.getFrameworkPart()); -// assertNull(withoutValue.getFromPart().getForm("FORMNAME").getInput("INTEGER-INPUT").getValue()); -// assertNull(withoutValue.getFromPart().getForm("FORMNAME").getInput("STRING-INPUT").getValue()); -// -// // Clone with value -// MJob withValue = job.clone(true); -// assertEquals(job, withValue); -// assertEquals(job.getPersistenceId(), withValue.getPersistenceId()); -// assertEquals(MJob.Type.IMPORT, withValue.getType()); -// assertEquals(job.getName(), withValue.getName()); -// assertEquals(job.getCreationUser(), withValue.getCreationUser()); -// assertEquals(forms1(MJob.Type.IMPORT), withValue.getFromPart()); -// assertEquals(forms2(MJob.Type.IMPORT), withValue.getFrameworkPart()); -// assertEquals(100, withValue.getFromPart().getForm("FORMNAME").getInput("INTEGER-INPUT").getValue()); -// assertEquals("TEST-VALUE", withValue.getFromPart().getForm("FORMNAME").getInput("STRING-INPUT").getValue()); } -// -// private MJob job(MJob.Type type) { -// MJob job = new MJob(123l, 456l, type, forms1(type), forms2(type)); -// job.setName("Vampire"); -// job.setCreationUser("Buffy"); -// return job; -// } -// -// private MJobForms forms1(MJob.Type type) { -// List<MForm> forms = new ArrayList<MForm>(); -// MIntegerInput input = new MIntegerInput("INTEGER-INPUT", false); -// input.setValue(100); -// MStringInput strInput = new MStringInput("STRING-INPUT",false,(short)20); -// strInput.setValue("TEST-VALUE"); -// List<MInput<?>> list = new ArrayList<MInput<?>>(); -// list.add(input); -// list.add(strInput); -// MForm form = new MForm("FORMNAME", list); -// forms.add(form); -// return new MJobForms(type, forms); -// } -// -// private MJobForms forms2(MJob.Type type) { -// List<MForm> forms = new ArrayList<MForm>(); -// MMapInput input = new MMapInput("MAP-INPUT", false); -// List<MInput<?>> list = new ArrayList<MInput<?>>(); -// list.add(input); -// MForm form = new MForm("form", list); -// forms.add(form); -// return new MJobForms(type, forms); -// } + /** + * Test class for initialization + */ + @Test + public void testInitialization() { + // Test default constructor + MJob job = job(); + assertEquals(123l, job.getConnectorId(Direction.FROM)); + assertEquals(456l, job.getConnectorId(Direction.TO)); + assertEquals("Buffy", job.getCreationUser()); + assertEquals("Vampire", job.getName()); + assertEquals(fromForms(), job.getConnectorPart(Direction.FROM)); + assertEquals(toForms(), job.getConnectorPart(Direction.TO)); + assertEquals(frameworkForms(), job.getFrameworkPart()); + + // Test copy constructor + MJob copy = new MJob(job); + assertEquals(123l, copy.getConnectorId(Direction.FROM)); + assertEquals(456l, copy.getConnectorId(Direction.TO)); + assertEquals("Buffy", copy.getCreationUser()); + assertEquals("Vampire", copy.getName()); + assertEquals(fromForms(), copy.getConnectorPart(Direction.FROM)); + assertEquals(toForms(), copy.getConnectorPart(Direction.TO)); + assertEquals(frameworkForms(), copy.getFrameworkPart()); + + // Test constructor for metadata upgrade (the order of forms is different) + MJob upgradeCopy = new MJob(job, fromForms(), toForms(), frameworkForms()); + assertEquals(123l, upgradeCopy.getConnectorId(Direction.FROM)); + assertEquals(456l, upgradeCopy.getConnectorId(Direction.TO)); + assertEquals("Buffy", upgradeCopy.getCreationUser()); + assertEquals("Vampire", upgradeCopy.getName()); + assertEquals(fromForms(), upgradeCopy.getConnectorPart(Direction.FROM)); + assertEquals(toForms(), upgradeCopy.getConnectorPart(Direction.TO)); + assertEquals(frameworkForms(), upgradeCopy.getFrameworkPart()); + } + + @Test + public void testClone() { + MJob job = job(); + + // Clone without value + MJob withoutValue = job.clone(false); + assertEquals(job, withoutValue); + assertEquals(MPersistableEntity.PERSISTANCE_ID_DEFAULT, withoutValue.getPersistenceId()); + assertNull(withoutValue.getName()); + assertNull(withoutValue.getCreationUser()); + assertEquals(fromForms(), withoutValue.getConnectorPart(Direction.FROM)); + assertEquals(toForms(), withoutValue.getConnectorPart(Direction.TO)); + assertEquals(frameworkForms(), withoutValue.getFrameworkPart()); + assertNull(withoutValue.getConnectorPart(Direction.FROM) + .getForm("FORMNAME").getInput("INTEGER-INPUT").getValue()); + assertNull(withoutValue.getConnectorPart(Direction.FROM) + .getForm("FORMNAME").getInput("STRING-INPUT").getValue()); + + // Clone with value + MJob withValue = job.clone(true); + assertEquals(job, withValue); + assertEquals(job.getPersistenceId(), withValue.getPersistenceId()); + assertEquals(job.getName(), withValue.getName()); + assertEquals(job.getCreationUser(), withValue.getCreationUser()); + assertEquals(fromForms(), withValue.getConnectorPart(Direction.FROM)); + assertEquals(toForms(), withValue.getConnectorPart(Direction.TO)); + assertEquals(frameworkForms(), withValue.getFrameworkPart()); + assertEquals(100, withValue.getConnectorPart(Direction.FROM) + .getForm("FORMNAME").getInput("INTEGER-INPUT").getValue()); + assertEquals("TEST-VALUE", withValue.getConnectorPart(Direction.FROM) + .getForm("FORMNAME").getInput("STRING-INPUT").getValue()); } + + private MJob job() { + MJob job = new MJob(123l, 456l, 1L, 2L, fromForms(), toForms(), frameworkForms()); + job.setName("Vampire"); + job.setCreationUser("Buffy"); + return job; + } + + private MJobForms fromForms() { + List<MForm> forms = new ArrayList<MForm>(); + MIntegerInput input = new MIntegerInput("INTEGER-INPUT", false); + input.setValue(100); + MStringInput strInput = new MStringInput("STRING-INPUT",false,(short)20); + strInput.setValue("TEST-VALUE"); + List<MInput<?>> list = new ArrayList<MInput<?>>(); + list.add(input); + list.add(strInput); + MForm form = new MForm("FORMNAME", list); + forms.add(form); + return new MJobForms(forms); + } + + private MJobForms toForms() { + List<MForm> forms = new ArrayList<MForm>(); + MMapInput input = new MMapInput("MAP-INPUT", false); + List<MInput<?>> list = new ArrayList<MInput<?>>(); + list.add(input); + MForm form = new MForm("form", list); + forms.add(form); + return new MJobForms(forms); + } + + private MJobForms frameworkForms() { + List<MForm> forms = new ArrayList<MForm>(); + MMapInput input = new MMapInput("MAP-INPUT", false); + List<MInput<?>> list = new ArrayList<MInput<?>>(); + list.add(input); + MForm form = new MForm("form", list); + forms.add(form); + return new MJobForms(forms); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMJobForms.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMJobForms.java b/common/src/test/java/org/apache/sqoop/model/TestMJobForms.java index 5c44c0a..81a8614 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMJobForms.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMJobForms.java @@ -28,20 +28,19 @@ import org.junit.Test; * Test class for org.apache.sqoop.model.MJobForms */ public class TestMJobForms { -// /** -// * Test for class initialization and values -// */ -// @Test -// public void testInitialization() { -// List<MForm> forms = new ArrayList<MForm>(); -// MJobForms jobform1 = new MJobForms(MJob.Type.EXPORT, forms); -// assertEquals(MJob.Type.EXPORT, jobform1.getType()); -// List<MForm> forms2 = new ArrayList<MForm>(); -// MJobForms jobform2 = new MJobForms(MJob.Type.EXPORT, forms2); -// assertEquals(jobform2, jobform1); -// // Add a form to list for checking not equals -// MForm m = new MForm("test", null); -// forms2.add(m); -// assertFalse(jobform1.equals(jobform2)); -// } + /** + * Test for class initialization and values + */ + @Test + public void testInitialization() { + List<MForm> forms = new ArrayList<MForm>(); + MJobForms jobform1 = new MJobForms(forms); + List<MForm> forms2 = new ArrayList<MForm>(); + MJobForms jobform2 = new MJobForms(forms2); + assertEquals(jobform2, jobform1); + // Add a form to list for checking not equals + MForm m = new MForm("test", null); + forms2.add(m); + assertFalse(jobform1.equals(jobform2)); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java b/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java index 99d147c..120fb07 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java @@ -32,84 +32,84 @@ import org.junit.Test; * Test class for org.apache.sqoop.model.MMapInput */ public class TestMMapInput { -// /** -// * Test for class initialization -// */ -// @Test -// public void testInitialization() { -// MMapInput input = new MMapInput("sqoopsqoop", false); -// assertEquals("sqoopsqoop", input.getName()); -// assertEquals(MInputType.MAP, input.getType()); -// } -// -// /** -// * Test for equals() method -// */ -// @Test -// public void testEquals() { -// // Positive test -// MMapInput input1 = new MMapInput("sqoopsqoop", false); -// MMapInput input2 = new MMapInput("sqoopsqoop", false); -// assertTrue(input1.equals(input2)); -// -// // Negative test -// MMapInput input3 = new MMapInput("sqoopsqoop", false); -// MMapInput input4 = new MMapInput("sqoopsqoop1", false); -// assertFalse(input3.equals(input4)); -// } -// -// /** -// * Test for value -// */ -// @Test -// public void testValue() { -// MMapInput input1 = new MMapInput("sqoopsqoop", false); -// Map<String, String> map1 = new HashMap<String, String>(); -// input1.setValue(map1); -// assertEquals(map1, input1.getValue()); -// input1.setEmpty(); -// assertNull(input1.getValue()); -// } -// -// /** -// * Test for getUrlSafeValueString() and restoreFromUrlSafeValueString() -// */ -// @Test -// public void testUrlSafe() { -// MMapInput input1 = new MMapInput("sqoopsqoop", false); -// Map<String, String> map1 = new HashMap<String, String>(); -// input1.setValue(map1); -// // Getting URL safe string -// String tmp = input1.getUrlSafeValueString(); -// // Restore to actual value -// input1.restoreFromUrlSafeValueString(tmp); -// assertNotNull(input1.getValue()); -// assertEquals(0, input1.getValue().size()); -// -// input1.setValue(null); -// tmp = input1.getUrlSafeValueString(); -// input1.restoreFromUrlSafeValueString(tmp); -// assertNull(input1.getValue()); -// } -// -// /** -// * Test case for MNamedElement.getLabelKey() and MNamedElement.getHelpKey() -// */ -// @Test -// public void testNamedElement() { -// MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); -// assertEquals("sqoopsqoop.label", input1.getLabelKey()); -// assertEquals("sqoopsqoop.help", input1.getHelpKey()); -// } -// -// /** -// * Test for sensitivity -// */ -// @Test -// public void testSensitivity() { -// MMapInput input1 = new MMapInput("NAME", false); -// MMapInput input2 = new MMapInput("NAME", true); -// assertFalse(input1.isSensitive()); -// assertTrue(input2.isSensitive()); -// } + /** + * Test for class initialization + */ + @Test + public void testInitialization() { + MMapInput input = new MMapInput("sqoopsqoop", false); + assertEquals("sqoopsqoop", input.getName()); + assertEquals(MInputType.MAP, input.getType()); + } + + /** + * Test for equals() method + */ + @Test + public void testEquals() { + // Positive test + MMapInput input1 = new MMapInput("sqoopsqoop", false); + MMapInput input2 = new MMapInput("sqoopsqoop", false); + assertTrue(input1.equals(input2)); + + // Negative test + MMapInput input3 = new MMapInput("sqoopsqoop", false); + MMapInput input4 = new MMapInput("sqoopsqoop1", false); + assertFalse(input3.equals(input4)); + } + + /** + * Test for value + */ + @Test + public void testValue() { + MMapInput input1 = new MMapInput("sqoopsqoop", false); + Map<String, String> map1 = new HashMap<String, String>(); + input1.setValue(map1); + assertEquals(map1, input1.getValue()); + input1.setEmpty(); + assertNull(input1.getValue()); + } + + /** + * Test for getUrlSafeValueString() and restoreFromUrlSafeValueString() + */ + @Test + public void testUrlSafe() { + MMapInput input1 = new MMapInput("sqoopsqoop", false); + Map<String, String> map1 = new HashMap<String, String>(); + input1.setValue(map1); + // Getting URL safe string + String tmp = input1.getUrlSafeValueString(); + // Restore to actual value + input1.restoreFromUrlSafeValueString(tmp); + assertNotNull(input1.getValue()); + assertEquals(0, input1.getValue().size()); + + input1.setValue(null); + tmp = input1.getUrlSafeValueString(); + input1.restoreFromUrlSafeValueString(tmp); + assertNull(input1.getValue()); + } + + /** + * Test case for MNamedElement.getLabelKey() and MNamedElement.getHelpKey() + */ + @Test + public void testNamedElement() { + MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); + assertEquals("sqoopsqoop.label", input1.getLabelKey()); + assertEquals("sqoopsqoop.help", input1.getHelpKey()); + } + + /** + * Test for sensitivity + */ + @Test + public void testSensitivity() { + MMapInput input1 = new MMapInput("NAME", false); + MMapInput input2 = new MMapInput("NAME", true); + assertFalse(input1.isSensitive()); + assertTrue(input2.isSensitive()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java b/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java index 4fcb212..f336bab 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java @@ -26,14 +26,14 @@ import org.junit.Test; */ public class TestMNamedElement { -// /** -// * Test initialization and values -// */ -// @Test -// public void testInitialization() { -// MNamedElement named = new MIntegerInput("SQOOP", false); -// assertEquals("SQOOP", named.getName()); -// assertEquals("SQOOP.label", named.getLabelKey()); -// assertEquals("SQOOP.help", named.getHelpKey()); -// } + /** + * Test initialization and values + */ + @Test + public void testInitialization() { + MNamedElement named = new MIntegerInput("SQOOP", false); + assertEquals("SQOOP", named.getName()); + assertEquals("SQOOP.label", named.getLabelKey()); + assertEquals("SQOOP.help", named.getHelpKey()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java b/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java index d68f06c..000c6be 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java @@ -22,28 +22,28 @@ import org.junit.Test; public class TestMPersistableEntity { -// @Test -// public void testPersistableId() { -// PersistentId id = new PersistentId(); -// -// assertFalse(id.hasPersistenceId()); -// -// id.setPersistenceId(666); -// assertTrue(id.hasPersistenceId()); -// assertEquals(666, id.getPersistenceId()); -// } -// -// /** -// * Testing class extending MPersistableEntity. -// * -// * Empty implementation with purpose to just test methods available -// * directly in the abstract class. -// */ -// public static class PersistentId extends MPersistableEntity { -// @Override -// public String toString() { -// return null; -// } -// } + @Test + public void testPersistableId() { + PersistentId id = new PersistentId(); + + assertFalse(id.hasPersistenceId()); + + id.setPersistenceId(666); + assertTrue(id.hasPersistenceId()); + assertEquals(666, id.getPersistenceId()); + } + + /** + * Testing class extending MPersistableEntity. + * + * Empty implementation with purpose to just test methods available + * directly in the abstract class. + */ + public static class PersistentId extends MPersistableEntity { + @Override + public String toString() { + return null; + } + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java b/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java index b0223a7..2fe0335 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java @@ -26,70 +26,70 @@ import org.junit.Test; */ public class TestMStringInput { -// /** -// * Test for class initialization -// */ -// @Test -// public void testInitialization() { -// short len = 6; -// MStringInput input = new MStringInput("sqoopsqoop", true, len); -// assertEquals("sqoopsqoop", input.getName()); -// assertEquals(true, input.isSensitive()); -// assertEquals(len, input.getMaxLength()); -// assertEquals(MInputType.STRING, input.getType()); -// } -// -// /** -// * Test for equals() method -// */ -// @Test -// public void testEquals() { -// short len = 6; -// // Positive test -// MStringInput input1 = new MStringInput("sqoopsqoop", true, len); -// MStringInput input2 = new MStringInput("sqoopsqoop", true, len); -// assertTrue(input1.equals(input2)); -// -// // Negative test -// MStringInput input3 = new MStringInput("sqoopsqoop", false, len); -// MStringInput input4 = new MStringInput("sqoopsqoop", true, len); -// assertFalse(input3.equals(input4)); -// } -// -// /** -// * Test for value -// */ -// @Test -// public void testValue() { -// MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); -// input1.setValue("sqoop"); -// assertEquals("sqoop", input1.getValue()); -// input1.setEmpty(); -// assertNull(input1.getValue()); -// } -// -// /** -// * Test for getUrlSafeValueString() and restoreFromUrlSafeValueString() -// */ -// @Test -// public void testUrlSafe() { -// MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); -// String s = "Sqoop%$!@#&*()Sqoop"; -// input1.setValue(s); -// // Getting URL safe string -// String tmp = input1.getUrlSafeValueString(); -// // Restore to actual value -// input1.restoreFromUrlSafeValueString(tmp); -// assertEquals(s, input1.getValue()); -// } -// -// /** -// * Test case for MNamedElement.getLabelKey() and MNamedElement.getHelpKey() -// */ -// @Test -// public void testNamedElement() { -// MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); -// assertEquals("sqoopsqoop.label", input1.getLabelKey()); -// assertEquals("sqoopsqoop.help", input1.getHelpKey()); -// } + /** + * Test for class initialization + */ + @Test + public void testInitialization() { + short len = 6; + MStringInput input = new MStringInput("sqoopsqoop", true, len); + assertEquals("sqoopsqoop", input.getName()); + assertEquals(true, input.isSensitive()); + assertEquals(len, input.getMaxLength()); + assertEquals(MInputType.STRING, input.getType()); + } + + /** + * Test for equals() method + */ + @Test + public void testEquals() { + short len = 6; + // Positive test + MStringInput input1 = new MStringInput("sqoopsqoop", true, len); + MStringInput input2 = new MStringInput("sqoopsqoop", true, len); + assertTrue(input1.equals(input2)); + + // Negative test + MStringInput input3 = new MStringInput("sqoopsqoop", false, len); + MStringInput input4 = new MStringInput("sqoopsqoop", true, len); + assertFalse(input3.equals(input4)); + } + + /** + * Test for value + */ + @Test + public void testValue() { + MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); + input1.setValue("sqoop"); + assertEquals("sqoop", input1.getValue()); + input1.setEmpty(); + assertNull(input1.getValue()); + } + + /** + * Test for getUrlSafeValueString() and restoreFromUrlSafeValueString() + */ + @Test + public void testUrlSafe() { + MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); + String s = "Sqoop%$!@#&*()Sqoop"; + input1.setValue(s); + // Getting URL safe string + String tmp = input1.getUrlSafeValueString(); + // Restore to actual value + input1.restoreFromUrlSafeValueString(tmp); + assertEquals(s, input1.getValue()); + } + + /** + * Test case for MNamedElement.getLabelKey() and MNamedElement.getHelpKey() + */ + @Test + public void testNamedElement() { + MStringInput input1 = new MStringInput("sqoopsqoop", true, (short) 5); + assertEquals("sqoopsqoop.label", input1.getLabelKey()); + assertEquals("sqoopsqoop.help", input1.getHelpKey()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java b/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java index 7c9a3d9..3fd5a95 100644 --- a/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java +++ b/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java @@ -27,44 +27,44 @@ import org.junit.Test; */ public class TestMValidatedElement { -// /** -// * Test for initalization -// */ -// @Test -// public void testInitialization() { -// MValidatedElement input = new MIntegerInput("input", false); -// assertEquals("input", input.getName()); -// assertEquals(Status.FINE, input.getValidationStatus()); -// } -// -// /** -// * Test for validation message and status -// */ -// @Test -// public void testValidationMessageStatus() { -// MValidatedElement input = new MIntegerInput("input", false); -// // Default status -// assertEquals(Status.FINE, input.getValidationStatus()); -// // Set status and user message -// input.setValidationMessage(Status.ACCEPTABLE, "MY_MESSAGE"); -// assertEquals(Status.ACCEPTABLE, input.getValidationStatus()); -// assertEquals("MY_MESSAGE", input.getValidationMessage()); -// // Check for null if status does not equal -// assertNull(input.getValidationMessage(Status.FINE)); -// assertNull(input.getErrorMessage()); -// assertNotNull(input.getWarningMessage()); -// // Set unacceptable status -// input.setValidationMessage(Status.UNACCEPTABLE, "MY_MESSAGE"); -// assertNotNull(input.getErrorMessage()); -// assertEquals("MY_MESSAGE", input.getErrorMessage()); -// assertNull(input.getWarningMessage()); -// // Set warning -// input.setWarningMessage("WARN"); -// assertEquals(Status.ACCEPTABLE, input.getValidationStatus()); -// assertEquals("WARN", input.getValidationMessage()); -// // Unacceptable method -// input.setErrorMessage("ERROR"); -// assertEquals(Status.UNACCEPTABLE, input.getValidationStatus()); -// assertEquals("ERROR", input.getValidationMessage()); -// } + /** + * Test for initalization + */ + @Test + public void testInitialization() { + MValidatedElement input = new MIntegerInput("input", false); + assertEquals("input", input.getName()); + assertEquals(Status.FINE, input.getValidationStatus()); + } + + /** + * Test for validation message and status + */ + @Test + public void testValidationMessageStatus() { + MValidatedElement input = new MIntegerInput("input", false); + // Default status + assertEquals(Status.FINE, input.getValidationStatus()); + // Set status and user message + input.setValidationMessage(Status.ACCEPTABLE, "MY_MESSAGE"); + assertEquals(Status.ACCEPTABLE, input.getValidationStatus()); + assertEquals("MY_MESSAGE", input.getValidationMessage()); + // Check for null if status does not equal + assertNull(input.getValidationMessage(Status.FINE)); + assertNull(input.getErrorMessage()); + assertNotNull(input.getWarningMessage()); + // Set unacceptable status + input.setValidationMessage(Status.UNACCEPTABLE, "MY_MESSAGE"); + assertNotNull(input.getErrorMessage()); + assertEquals("MY_MESSAGE", input.getErrorMessage()); + assertNull(input.getWarningMessage()); + // Set warning + input.setWarningMessage("WARN"); + assertEquals(Status.ACCEPTABLE, input.getValidationStatus()); + assertEquals("WARN", input.getValidationMessage()); + // Unacceptable method + input.setErrorMessage("ERROR"); + assertEquals(Status.UNACCEPTABLE, input.getValidationStatus()); + assertEquals("ERROR", input.getValidationMessage()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java b/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java index 5d6692d..99f4767 100644 --- a/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java +++ b/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java @@ -27,38 +27,38 @@ import junit.framework.TestCase; */ public class TestSubmissionStatus extends TestCase { -// /** -// * unfinished() test -// */ -// public void testUnfinished() { -// SubmissionStatus subStatus[] = SubmissionStatus.unfinished(); -// SubmissionStatus subStatusTest[] = new SubmissionStatus[] { -// SubmissionStatus.RUNNING, SubmissionStatus.BOOTING }; -// List<SubmissionStatus> tempSubmissionStatusList = Arrays.asList(subStatus); -// for (SubmissionStatus stat : subStatusTest) { -// assertTrue(tempSubmissionStatusList.contains(stat)); -// } -// } -// -// /** -// * isRunning() test -// */ -// public void testIsRunning() { -// assertTrue(SubmissionStatus.RUNNING.isRunning()); -// assertTrue(SubmissionStatus.BOOTING.isRunning()); -// assertFalse(SubmissionStatus.FAILED.isRunning()); -// assertFalse(SubmissionStatus.UNKNOWN.isRunning()); -// assertFalse(SubmissionStatus.FAILURE_ON_SUBMIT.isRunning()); -// } -// -// /** -// * isFailure() test -// */ -// public void testIsFailure() { -// assertTrue(SubmissionStatus.FAILED.isFailure()); -// assertTrue(SubmissionStatus.UNKNOWN.isFailure()); -// assertTrue(SubmissionStatus.FAILURE_ON_SUBMIT.isFailure()); -// assertFalse(SubmissionStatus.RUNNING.isFailure()); -// assertFalse(SubmissionStatus.BOOTING.isFailure()); -// } + /** + * unfinished() test + */ + public void testUnfinished() { + SubmissionStatus subStatus[] = SubmissionStatus.unfinished(); + SubmissionStatus subStatusTest[] = new SubmissionStatus[] { + SubmissionStatus.RUNNING, SubmissionStatus.BOOTING }; + List<SubmissionStatus> tempSubmissionStatusList = Arrays.asList(subStatus); + for (SubmissionStatus stat : subStatusTest) { + assertTrue(tempSubmissionStatusList.contains(stat)); + } + } + + /** + * isRunning() test + */ + public void testIsRunning() { + assertTrue(SubmissionStatus.RUNNING.isRunning()); + assertTrue(SubmissionStatus.BOOTING.isRunning()); + assertFalse(SubmissionStatus.FAILED.isRunning()); + assertFalse(SubmissionStatus.UNKNOWN.isRunning()); + assertFalse(SubmissionStatus.FAILURE_ON_SUBMIT.isRunning()); + } + + /** + * isFailure() test + */ + public void testIsFailure() { + assertTrue(SubmissionStatus.FAILED.isFailure()); + assertTrue(SubmissionStatus.UNKNOWN.isFailure()); + assertTrue(SubmissionStatus.FAILURE_ON_SUBMIT.isFailure()); + assertFalse(SubmissionStatus.RUNNING.isFailure()); + assertFalse(SubmissionStatus.BOOTING.isFailure()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java index 962a535..0cf5d2b 100644 --- a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java +++ b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java @@ -25,20 +25,20 @@ import org.junit.Test; */ public class TestCounter { -// /** -// * Test method for initialization -// */ -// @Test -// public void testInitialization() { -// Counter counter = new Counter("sqoop"); -// Assert.assertEquals("sqoop", counter.getName()); -// Assert.assertEquals(0l, counter.getValue()); -// -// Counter counter1 = new Counter("sqoop", 1000l); -// Assert.assertEquals("sqoop", counter1.getName()); -// Assert.assertEquals(1000l, counter1.getValue()); -// -// counter1.setValue(2000l); -// Assert.assertEquals(2000l, counter1.getValue()); -// } + /** + * Test method for initialization + */ + @Test + public void testInitialization() { + Counter counter = new Counter("sqoop"); + Assert.assertEquals("sqoop", counter.getName()); + Assert.assertEquals(0l, counter.getValue()); + + Counter counter1 = new Counter("sqoop", 1000l); + Assert.assertEquals("sqoop", counter1.getName()); + Assert.assertEquals(1000l, counter1.getValue()); + + counter1.setValue(2000l); + Assert.assertEquals(2000l, counter1.getValue()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java index aac80d4..985009a 100644 --- a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java +++ b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java @@ -26,56 +26,56 @@ import org.junit.Test; */ public class TestCounterGroup { -// /** -// * CounterGroup initialization -// */ -// @Test -// public void testInitialization() { -// CounterGroup cg = new CounterGroup("sqoop"); -// Assert.assertEquals("sqoop", cg.getName()); -// Assert.assertFalse(cg.iterator().hasNext()); -// -// Counter c1 = new Counter("counter"); -// cg.addCounter(c1); -// } -// -// /** -// * Test for add and get counter -// */ -// @Test -// public void testAddGetCounter() { -// CounterGroup cg = new CounterGroup("sqoop"); -// Counter c1 = new Counter("counter"); -// cg.addCounter(c1); -// Assert.assertNotNull(cg.getCounter("counter")); -// Assert.assertNull(cg.getCounter("NA")); -// } -// -// /** -// * Test for iterator -// */ -// @Test -// public void testIterator() { -// CounterGroup cg = new CounterGroup("sqoop"); -// Counter c1 = new Counter("counter1"); -// Counter c2 = new Counter("counter2"); -// // Adding 2 Counter into CounterGroup -// cg.addCounter(c1); -// cg.addCounter(c2); -// int count = 0; -// -// for (Counter c : cg) { -// count++; -// } -// Assert.assertEquals(2, count); -// -// Counter c3 = new Counter("counter3"); -// cg.addCounter(c3); -// count = 0; -// -// for (Counter c : cg) { -// count++; -// } -// Assert.assertEquals(3, count); -// } + /** + * CounterGroup initialization + */ + @Test + public void testInitialization() { + CounterGroup cg = new CounterGroup("sqoop"); + Assert.assertEquals("sqoop", cg.getName()); + Assert.assertFalse(cg.iterator().hasNext()); + + Counter c1 = new Counter("counter"); + cg.addCounter(c1); + } + + /** + * Test for add and get counter + */ + @Test + public void testAddGetCounter() { + CounterGroup cg = new CounterGroup("sqoop"); + Counter c1 = new Counter("counter"); + cg.addCounter(c1); + Assert.assertNotNull(cg.getCounter("counter")); + Assert.assertNull(cg.getCounter("NA")); + } + + /** + * Test for iterator + */ + @Test + public void testIterator() { + CounterGroup cg = new CounterGroup("sqoop"); + Counter c1 = new Counter("counter1"); + Counter c2 = new Counter("counter2"); + // Adding 2 Counter into CounterGroup + cg.addCounter(c1); + cg.addCounter(c2); + int count = 0; + + for (Counter c : cg) { + count++; + } + Assert.assertEquals(2, count); + + Counter c3 = new Counter("counter3"); + cg.addCounter(c3); + count = 0; + + for (Counter c : cg) { + count++; + } + Assert.assertEquals(3, count); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java index 22839c9..8f8d617 100644 --- a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java +++ b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java @@ -26,42 +26,42 @@ import junit.framework.Assert; */ public class TestCounters { -// /** -// * Test initialization -// */ -// @Test -// public void testInitialization() { -// Counters counters = new Counters(); -// Assert.assertTrue(counters.isEmpty()); -// } -// -// /** -// * Test add and get CountersGroup -// */ -// @Test -// public void testAddGetCounters() { -// Counters counters = new Counters(); -// CounterGroup cg = new CounterGroup("sqoop"); -// counters.addCounterGroup(cg); -// Assert.assertFalse(counters.isEmpty()); -// Assert.assertNotNull(counters.getCounterGroup("sqoop")); -// Assert.assertEquals("sqoop", counters.getCounterGroup("sqoop").getName()); -// } -// -// /** -// * Test for iterator -// */ -// @Test -// public void testIterator() { -// Counters counters = new Counters(); -// CounterGroup cg1 = new CounterGroup("sqoop1"); -// CounterGroup cg2 = new CounterGroup("sqoop2"); -// counters.addCounterGroup(cg1); -// counters.addCounterGroup(cg2); -// int count = 0; -// for (CounterGroup cg : counters) { -// count++; -// } -// Assert.assertEquals(2, count); -// } + /** + * Test initialization + */ + @Test + public void testInitialization() { + Counters counters = new Counters(); + Assert.assertTrue(counters.isEmpty()); + } + + /** + * Test add and get CountersGroup + */ + @Test + public void testAddGetCounters() { + Counters counters = new Counters(); + CounterGroup cg = new CounterGroup("sqoop"); + counters.addCounterGroup(cg); + Assert.assertFalse(counters.isEmpty()); + Assert.assertNotNull(counters.getCounterGroup("sqoop")); + Assert.assertEquals("sqoop", counters.getCounterGroup("sqoop").getName()); + } + + /** + * Test for iterator + */ + @Test + public void testIterator() { + Counters counters = new Counters(); + CounterGroup cg1 = new CounterGroup("sqoop1"); + CounterGroup cg2 = new CounterGroup("sqoop2"); + counters.addCounterGroup(cg1); + counters.addCounterGroup(cg2); + int count = 0; + for (CounterGroup cg : counters) { + count++; + } + Assert.assertEquals(2, count); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java b/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java index 88fe058..1edc404 100644 --- a/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java +++ b/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java @@ -28,14 +28,14 @@ import static org.junit.Assert.*; * */ public class TestMapResourceBundle { -// @Test -// public void testUsage() { -// Map<String, Object> map = new HashMap<String, Object>(); -// map.put("a", "1"); -// map.put("b", "2"); -// -// MapResourceBundle bundle = new MapResourceBundle(map); -// assertEquals("1", bundle.getString("a")); -// assertEquals("2", bundle.getString("b")); -// } + @Test + public void testUsage() { + Map<String, Object> map = new HashMap<String, Object>(); + map.put("a", "1"); + map.put("b", "2"); + + MapResourceBundle bundle = new MapResourceBundle(map); + assertEquals("1", bundle.getString("a")); + assertEquals("2", bundle.getString("b")); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/validation/TestStatus.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/validation/TestStatus.java b/common/src/test/java/org/apache/sqoop/validation/TestStatus.java index 654a024..5b17a4e 100644 --- a/common/src/test/java/org/apache/sqoop/validation/TestStatus.java +++ b/common/src/test/java/org/apache/sqoop/validation/TestStatus.java @@ -25,29 +25,29 @@ import static junit.framework.Assert.*; * */ public class TestStatus { -// @Test -// public void testGetWorstStatus() { -// // Comparing itself with itself -// assertEquals(Status.FINE, -// Status.getWorstStatus(Status.FINE)); -// assertEquals(Status.FINE, -// Status.getWorstStatus(Status.FINE, Status.FINE)); -// assertEquals(Status.ACCEPTABLE, -// Status.getWorstStatus(Status.ACCEPTABLE, Status.ACCEPTABLE)); -// assertEquals(Status.UNACCEPTABLE, -// Status.getWorstStatus(Status.UNACCEPTABLE, Status.UNACCEPTABLE)); -// -// // Retriving the worst option -// assertEquals(Status.UNACCEPTABLE, -// Status.getWorstStatus(Status.FINE, Status.UNACCEPTABLE)); -// assertEquals(Status.ACCEPTABLE, -// Status.getWorstStatus(Status.FINE, Status.ACCEPTABLE)); -// } -// -// @Test -// public void testCanProceed() { -// assertTrue(Status.FINE.canProceed()); -// assertTrue(Status.ACCEPTABLE.canProceed()); -// assertFalse(Status.UNACCEPTABLE.canProceed()); -// } + @Test + public void testGetWorstStatus() { + // Comparing itself with itself + assertEquals(Status.FINE, + Status.getWorstStatus(Status.FINE)); + assertEquals(Status.FINE, + Status.getWorstStatus(Status.FINE, Status.FINE)); + assertEquals(Status.ACCEPTABLE, + Status.getWorstStatus(Status.ACCEPTABLE, Status.ACCEPTABLE)); + assertEquals(Status.UNACCEPTABLE, + Status.getWorstStatus(Status.UNACCEPTABLE, Status.UNACCEPTABLE)); + + // Retriving the worst option + assertEquals(Status.UNACCEPTABLE, + Status.getWorstStatus(Status.FINE, Status.UNACCEPTABLE)); + assertEquals(Status.ACCEPTABLE, + Status.getWorstStatus(Status.FINE, Status.ACCEPTABLE)); + } + + @Test + public void testCanProceed() { + assertTrue(Status.FINE.canProceed()); + assertTrue(Status.ACCEPTABLE.canProceed()); + assertFalse(Status.UNACCEPTABLE.canProceed()); + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/3bb7ff83/common/src/test/java/org/apache/sqoop/validation/TestValidation.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/sqoop/validation/TestValidation.java b/common/src/test/java/org/apache/sqoop/validation/TestValidation.java index be6ee84..bf0ade5 100644 --- a/common/src/test/java/org/apache/sqoop/validation/TestValidation.java +++ b/common/src/test/java/org/apache/sqoop/validation/TestValidation.java @@ -31,113 +31,113 @@ import org.apache.sqoop.validation.Validation.Message; */ public class TestValidation extends TestCase { -// /** -// * Initialization test -// */ -// public void testInitialization() { -// /* Check initialization with class */ -// Validation validation = new Validation(Class.class); -// assertNotNull(validation); -// assertEquals(Status.FINE, validation.getStatus()); -// assertEquals(0, validation.getMessages().size()); -// -// /* Check initialization with status and message as null */ -// Validation validationNull = new Validation(null, null); -// assertNotNull(validationNull); -// assertNull(validationNull.getStatus()); -// assertNull(validationNull.getMessages()); -// -// /* Check initialization with status and message with values */ -// Status s1 = Status.FINE; -// Map<FormInput, Message> msg1 = new HashMap<Validation.FormInput, Validation.Message>(); -// Validation validation1 = new Validation(s1, msg1); -// assertNotNull(validation1); -// assertEquals(Status.FINE, validation1.getStatus()); -// assertEquals(0, validation1.getMessages().size()); -// -// /* Check initialization with status and message with values */ -// Status s2 = Status.ACCEPTABLE; -// Map<FormInput, Message> msg2 = new HashMap<Validation.FormInput, Validation.Message>(); -// Validation validation2 = new Validation(s2, msg2); -// assertNotNull(validation2); -// assertEquals(Status.ACCEPTABLE, validation2.getStatus()); -// assertEquals(0, validation2.getMessages().size()); -// -// /* Check initialization with status and message with values */ -// Status s3 = Status.ACCEPTABLE; -// Map<FormInput, Message> msg3 = new HashMap<Validation.FormInput, Validation.Message>(); -// Validation.FormInput fi = new Validation.FormInput("form\\.input"); -// Validation.Message message = new Validation.Message(Status.FINE, "sqoop"); -// msg3.put(fi, message); -// Validation validation3 = new Validation(s3, msg3); -// Validation.FormInput fiTest = new Validation.FormInput("form\\.input"); -// Validation.Message messageTest = new Validation.Message(Status.FINE, -// "sqoop"); -// assertEquals(messageTest, validation3.getMessages().get(fiTest)); -// assertEquals(Status.ACCEPTABLE, validation3.getStatus()); -// } -// -// /** -// * Test for Validation.ForInput -// */ -// public void testFormInput() { -// Validation.FormInput fi = new Validation.FormInput("test\\.test"); -// assertNotNull(fi); -// -// /* Passing null */ -// try { -// new Validation.FormInput(null); -// fail("Assert error is expected"); -// } catch (AssertionError e) { -// assertTrue(true); -// } -// -// /* Passing empty and check exception messages */ -// try { -// new Validation.FormInput(""); -// fail("SqoopException is expected"); -// } catch (SqoopException e) { -// assertEquals(ValidationError.VALIDATION_0003.getMessage(), e -// .getErrorCode().getMessage()); -// } -// -// /* Passing value and check */ -// Validation.FormInput fi2 = new Validation.FormInput("form\\.input"); -// assertEquals("form\\", fi2.getForm()); -// assertEquals("input", fi2.getInput()); -// -// /* Check equals */ -// Validation.FormInput fiOne = new Validation.FormInput("form\\.input"); -// Validation.FormInput fiTwo = new Validation.FormInput("form\\.input"); -// assertEquals(fiOne, fiTwo); -// -// /* toString() method check */ -// assertEquals("form\\.input", fiOne.toString()); -// -// // Checking null as input field (form validation) -// Validation.FormInput fi3 = new FormInput("form"); -// assertEquals("form", fi3.getForm()); -// assertNull(fi3.getInput()); -// assertEquals("form", fi3.toString()); -// -// } -// -// /** -// * Test for Validation.Message -// */ -// public void testMessage() { -// /* Passing null */ -// Validation.Message msg1 = new Validation.Message(null, null); -// assertNull(msg1.getStatus()); -// assertNull(msg1.getMessage()); -// -// /* Passing values */ -// Validation.Message msg2 = new Validation.Message(Status.FINE, "sqoop"); -// assertEquals(Status.FINE, msg2.getStatus()); -// assertEquals("sqoop", msg2.getMessage()); -// -// /* Check for equal */ -// Validation.Message msg3 = new Validation.Message(Status.FINE, "sqoop"); -// assertEquals(msg2, msg3); -// } + /** + * Initialization test + */ + public void testInitialization() { + /* Check initialization with class */ + Validation validation = new Validation(Class.class); + assertNotNull(validation); + assertEquals(Status.FINE, validation.getStatus()); + assertEquals(0, validation.getMessages().size()); + + /* Check initialization with status and message as null */ + Validation validationNull = new Validation(null, null); + assertNotNull(validationNull); + assertNull(validationNull.getStatus()); + assertNull(validationNull.getMessages()); + + /* Check initialization with status and message with values */ + Status s1 = Status.FINE; + Map<FormInput, Message> msg1 = new HashMap<Validation.FormInput, Validation.Message>(); + Validation validation1 = new Validation(s1, msg1); + assertNotNull(validation1); + assertEquals(Status.FINE, validation1.getStatus()); + assertEquals(0, validation1.getMessages().size()); + + /* Check initialization with status and message with values */ + Status s2 = Status.ACCEPTABLE; + Map<FormInput, Message> msg2 = new HashMap<Validation.FormInput, Validation.Message>(); + Validation validation2 = new Validation(s2, msg2); + assertNotNull(validation2); + assertEquals(Status.ACCEPTABLE, validation2.getStatus()); + assertEquals(0, validation2.getMessages().size()); + + /* Check initialization with status and message with values */ + Status s3 = Status.ACCEPTABLE; + Map<FormInput, Message> msg3 = new HashMap<Validation.FormInput, Validation.Message>(); + Validation.FormInput fi = new Validation.FormInput("form\\.input"); + Validation.Message message = new Validation.Message(Status.FINE, "sqoop"); + msg3.put(fi, message); + Validation validation3 = new Validation(s3, msg3); + Validation.FormInput fiTest = new Validation.FormInput("form\\.input"); + Validation.Message messageTest = new Validation.Message(Status.FINE, + "sqoop"); + assertEquals(messageTest, validation3.getMessages().get(fiTest)); + assertEquals(Status.ACCEPTABLE, validation3.getStatus()); + } + + /** + * Test for Validation.ForInput + */ + public void testFormInput() { + Validation.FormInput fi = new Validation.FormInput("test\\.test"); + assertNotNull(fi); + + /* Passing null */ + try { + new Validation.FormInput(null); + fail("Assert error is expected"); + } catch (AssertionError e) { + assertTrue(true); + } + + /* Passing empty and check exception messages */ + try { + new Validation.FormInput(""); + fail("SqoopException is expected"); + } catch (SqoopException e) { + assertEquals(ValidationError.VALIDATION_0003.getMessage(), e + .getErrorCode().getMessage()); + } + + /* Passing value and check */ + Validation.FormInput fi2 = new Validation.FormInput("form\\.input"); + assertEquals("form\\", fi2.getForm()); + assertEquals("input", fi2.getInput()); + + /* Check equals */ + Validation.FormInput fiOne = new Validation.FormInput("form\\.input"); + Validation.FormInput fiTwo = new Validation.FormInput("form\\.input"); + assertEquals(fiOne, fiTwo); + + /* toString() method check */ + assertEquals("form\\.input", fiOne.toString()); + + // Checking null as input field (form validation) + Validation.FormInput fi3 = new FormInput("form"); + assertEquals("form", fi3.getForm()); + assertNull(fi3.getInput()); + assertEquals("form", fi3.toString()); + + } + + /** + * Test for Validation.Message + */ + public void testMessage() { + /* Passing null */ + Validation.Message msg1 = new Validation.Message(null, null); + assertNull(msg1.getStatus()); + assertNull(msg1.getMessage()); + + /* Passing values */ + Validation.Message msg2 = new Validation.Message(Status.FINE, "sqoop"); + assertEquals(Status.FINE, msg2.getStatus()); + assertEquals("sqoop", msg2.getMessage()); + + /* Check for equal */ + Validation.Message msg3 = new Validation.Message(Status.FINE, "sqoop"); + assertEquals(msg2, msg3); + } }
