Made tests more specific.

revert-70aa11f8
Menaka Jayawardena 7 years ago
parent f35bab0133
commit c850962783

@ -156,6 +156,26 @@ public class SearchManagementServiceTest extends BaseDeviceManagementTest {
Assert.assertTrue(devices != null); Assert.assertTrue(devices != null);
} }
@Test(description = "Search devices by Double parameter.")
public void testDoubleSearch() throws Exception {
SearchContext context = new SearchContext();
List<Condition> conditions = new ArrayList<>();
Condition cond = new Condition();
cond.setKey("internalAvailableMemory");
cond.setOperator("=");
cond.setValue("3.56");
cond.setState(Condition.State.AND);
conditions.add(cond);
context.setConditions(conditions);
SearchManagerService service = new SearchManagerServiceImpl();
List<Device> devices = service.search(context);
Assert.assertTrue(devices != null);
}
@Test(expectedExceptions = {SearchMgtException.class}) @Test(expectedExceptions = {SearchMgtException.class})
public void testInvalidOperator() throws SearchMgtException { public void testInvalidOperator() throws SearchMgtException {
SearchContext context = new SearchContext(); SearchContext context = new SearchContext();
@ -183,8 +203,8 @@ public class SearchManagementServiceTest extends BaseDeviceManagementTest {
Assert.assertEquals(updatedDevices.size(), 0); Assert.assertEquals(updatedDevices.size(), 0);
} }
@Test(expectedExceptions = {NumberFormatException.class}, description = "Test for invalid number") @Test(description = "Test for invalid number")
public void testInvalidNumber() throws SearchMgtException { public void testInvalidNumber() {
SearchContext context = new SearchContext(); SearchContext context = new SearchContext();
List<Condition> conditions = new ArrayList<>(); List<Condition> conditions = new ArrayList<>();
@ -198,7 +218,12 @@ public class SearchManagementServiceTest extends BaseDeviceManagementTest {
context.setConditions(conditions); context.setConditions(conditions);
SearchManagerService service = new SearchManagerServiceImpl(); SearchManagerService service = new SearchManagerServiceImpl();
service.search(context); try {
service.search(context);
} catch (SearchMgtException e) {
String expectedException = e.getCause().getClass().getName();
Assert.assertTrue(expectedException.contains("InvalidOperatorException"));
}
} }
@Test(description = "Test multiple search conditions") @Test(description = "Test multiple search conditions")
@ -229,21 +254,21 @@ public class SearchManagementServiceTest extends BaseDeviceManagementTest {
Condition cond4 = new Condition(); Condition cond4 = new Condition();
cond4.setKey("deviceModel"); cond4.setKey("deviceModel");
cond4.setOperator("%"); cond4.setOperator("=");
cond4.setValue("SM-T520"); cond4.setValue("SM-T520");
cond4.setState(Condition.State.AND); cond4.setState(Condition.State.AND);
conditions.add(cond4); conditions.add(cond4);
Condition cond5 = new Condition(); Condition cond5 = new Condition();
cond5.setKey("vendor"); cond5.setKey("vendor");
cond5.setOperator("%"); cond5.setOperator("=");
cond5.setValue("Samsung"); cond5.setValue("Samsung");
cond5.setState(Condition.State.AND); cond5.setState(Condition.State.AND);
conditions.add(cond5); conditions.add(cond5);
Condition cond6 = new Condition(); Condition cond6 = new Condition();
cond6.setKey("osVersion"); cond6.setKey("osVersion");
cond6.setOperator("%"); cond6.setOperator("=");
cond6.setValue("Marshmellow"); cond6.setValue("Marshmellow");
cond6.setState(Condition.State.OR); cond6.setState(Condition.State.OR);
conditions.add(cond6); conditions.add(cond6);
@ -260,32 +285,33 @@ public class SearchManagementServiceTest extends BaseDeviceManagementTest {
SearchContext context = new SearchContext(); SearchContext context = new SearchContext();
List<Condition> conditions = new ArrayList<>(); List<Condition> conditions = new ArrayList<>();
Condition cond = new Condition(); Condition condition = new Condition();
cond.setKey("batteryLevel"); condition.setKey("batteryLevel");
cond.setOperator("="); condition.setOperator("=");
cond.setValue("40"); condition.setValue("40");
cond.setState(Condition.State.AND); condition.setState(Condition.State.AND);
conditions.add(cond); conditions.add(condition);
Condition condition2 = new Condition(); Condition condition2 = new Condition();
condition2.setKey("LOCATION"); condition2.setKey("LOCATION");
condition2.setOperator("%"); condition2.setOperator("%");
condition2.setValue("Karandeniya"); condition2.setValue("Karandeniya");
condition2.setState(Condition.State.OR); condition2.setState(Condition.State.OR);
conditions.add(condition2);
Condition condition3 = new Condition(); Condition condition3 = new Condition();
condition3.setKey("internalAvailableMemory"); condition3.setKey("internalTotalMemory");
condition3.setOperator("!="); condition3.setOperator("%");
condition3.setValue("23.2"); condition3.setValue("23.2");
condition2.setState(Condition.State.AND); condition3.setState(Condition.State.OR);
conditions.add(condition3);
Condition condition4 = new Condition(); Condition condition4 = new Condition();
condition4.setKey("connectionType"); condition4.setKey("connectionType");
condition4.setOperator("%"); condition4.setOperator("%");
condition4.setValue("DIALOG"); condition4.setValue("DIALOG");
condition4.setState(Condition.State.AND); condition4.setState(Condition.State.AND);
conditions.add(condition4);
conditions.add(condition2);
context.setConditions(conditions); context.setConditions(conditions);

Loading…
Cancel
Save