community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed print stacktrace and changed the check for exceptions.

Browse Source
This commit is contained in:
Menaka Jayawardena 2017-10-12 12:21:05 +05:30
parent aee8995ff6
commit ae9c1a2c8b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/ProcessorImplTest.java
View File

@ -34,6 +34,7 @@ import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
import org.wso2.carbon.device.mgt.core.search.mgt.InvalidOperatorException;
import org.wso2.carbon.device.mgt.core.search.mgt.SearchMgtException; import org.wso2.carbon.device.mgt.core.search.mgt.SearchMgtException;
import org.wso2.carbon.device.mgt.core.search.mgt.impl.ProcessorImpl; import org.wso2.carbon.device.mgt.core.search.mgt.impl.ProcessorImpl;
import org.wso2.carbon.device.mgt.core.search.util.ChangeEnumValues; import org.wso2.carbon.device.mgt.core.search.util.ChangeEnumValues;
@ -116,7 +117,7 @@ public class ProcessorImplTest extends BaseDeviceManagementTest{
@Test(description = "Test for invalid state") @Test(description = "Test for invalid state")
public void testInvalidState() { public void testInvalidState() throws SearchMgtException {
SearchContext context = new SearchContext(); SearchContext context = new SearchContext();
List<Condition> conditions = new ArrayList<>(); List<Condition> conditions = new ArrayList<>();
@ -151,9 +152,9 @@ public class ProcessorImplTest extends BaseDeviceManagementTest{
try { try {
processor.execute(context); processor.execute(context);
} catch (SearchMgtException e) { } catch (SearchMgtException e) {
Boolean isInvalidOperation = e.getCause().getClass().getCanonicalName().contains if (!(e.getCause() instanceof InvalidOperatorException)) {
("InvalidOperatorException"); throw e;
Assert.assertTrue(isInvalidOperation); }
} }
} }

8
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/SearchManagementServiceTest.java
View File

@ -31,6 +31,7 @@ import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
import org.wso2.carbon.device.mgt.core.common.TestDataHolder; import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
import org.wso2.carbon.device.mgt.core.search.mgt.InvalidOperatorException;
import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService; import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
import org.wso2.carbon.device.mgt.core.search.mgt.SearchMgtException; import org.wso2.carbon.device.mgt.core.search.mgt.SearchMgtException;
import org.wso2.carbon.device.mgt.core.search.mgt.impl.SearchManagerServiceImpl; import org.wso2.carbon.device.mgt.core.search.mgt.impl.SearchManagerServiceImpl;
@ -204,7 +205,7 @@ public class SearchManagementServiceTest extends BaseDeviceManagementTest {
} }
@Test(description = "Test for invalid number") @Test(description = "Test for invalid number")
public void testInvalidNumber() { public void testInvalidNumber() throws SearchMgtException {
SearchContext context = new SearchContext(); SearchContext context = new SearchContext();
List<Condition> conditions = new ArrayList<>(); List<Condition> conditions = new ArrayList<>();
@ -221,8 +222,9 @@ public class SearchManagementServiceTest extends BaseDeviceManagementTest {
try { try {
service.search(context); service.search(context);
} catch (SearchMgtException e) { } catch (SearchMgtException e) {
String expectedException = e.getCause().getClass().getName(); if (!(e.getCause() instanceof InvalidOperatorException)) {
Assert.assertTrue(expectedException.contains("InvalidOperatorException")); throw e;
}
} }
} }

1
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/ChangeEnumValues.java
View File

@ -125,7 +125,6 @@ public class ChangeEnumValues {
cleanEnumCache(enumType); cleanEnumCache(enumType);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e.getMessage(), e); throw new RuntimeException(e.getMessage(), e);
} }
} }