tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix TenantIdLoaderTest

pull/14074/head
Andrii Landiak 10 months ago
parent
b8790e9e56
commit
74cd211a4e
2 changed files with 6 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java
  2. 48
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java

1
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java
View File

@ -148,6 +148,7 @@ public class TenantIdLoader {
break;
case NOTIFICATION:
case ADMIN_SETTINGS:
case API_KEY:
return ctxTenantId;
case NOTIFICATION_RULE:
tenantEntity = ctx.getNotificationRuleService().findNotificationRuleById(ctxTenantId, new NotificationRuleId(id));

48
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
View File

@ -29,7 +29,6 @@ import org.thingsboard.rule.engine.api.RuleEngineAssetProfileCache;
import org.thingsboard.rule.engine.api.RuleEngineDeviceProfileCache;
import org.thingsboard.rule.engine.api.RuleEngineRpcService;
import org.thingsboard.rule.engine.api.TbContext;
import org.thingsboard.server.common.data.AdminSettings;
import org.thingsboard.server.common.data.ApiUsageState;
import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.Dashboard;
@ -53,7 +52,6 @@ import org.thingsboard.server.common.data.id.AssetProfileId;
import org.thingsboard.server.common.data.id.DeviceProfileId;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.EntityIdFactory;
import org.thingsboard.server.common.data.id.NotificationId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.id.TenantProfileId;
import org.thingsboard.server.common.data.job.Job;
@ -80,6 +78,7 @@ import org.thingsboard.server.dao.device.DeviceService;
import org.thingsboard.server.dao.domain.DomainService;
import org.thingsboard.server.dao.edge.EdgeService;
import org.thingsboard.server.dao.entityview.EntityViewService;
import org.thingsboard.server.dao.job.JobService;
import org.thingsboard.server.dao.mobile.MobileAppBundleService;
import org.thingsboard.server.dao.mobile.MobileAppService;
import org.thingsboard.server.dao.notification.NotificationRequestService;
@ -88,11 +87,11 @@ import org.thingsboard.server.dao.notification.NotificationTargetService;
import org.thingsboard.server.dao.notification.NotificationTemplateService;
import org.thingsboard.server.dao.oauth2.OAuth2ClientService;
import org.thingsboard.server.dao.ota.OtaPackageService;
import org.thingsboard.server.dao.pat.ApiKeyService;
import org.thingsboard.server.dao.queue.QueueService;
import org.thingsboard.server.dao.queue.QueueStatsService;
import org.thingsboard.server.dao.resource.ResourceService;
import org.thingsboard.server.dao.rule.RuleChainService;
import org.thingsboard.server.dao.job.JobService;
import org.thingsboard.server.dao.user.UserService;
import org.thingsboard.server.dao.widget.WidgetTypeService;
import org.thingsboard.server.dao.widget.WidgetsBundleService;
@ -170,6 +169,8 @@ public class TenantIdLoaderTest {
private JobService jobService;
@Mock
private AiModelService aiModelService;
@Mock
private ApiKeyService apiKeyService;
private TenantId tenantId;
private TenantProfileId tenantProfileId;
@ -204,163 +205,124 @@ public class TenantIdLoaderTest {
case TENANT:
case NOTIFICATION:
case ADMIN_SETTINGS:
case API_KEY:
break;
case CUSTOMER:
Customer customer = new Customer();
customer.setTenantId(tenantId);
when(ctx.getCustomerService()).thenReturn(customerService);
doReturn(customer).when(customerService).findCustomerById(eq(tenantId), any());
break;
case USER:
User user = new User();
user.setTenantId(tenantId);
when(ctx.getUserService()).thenReturn(userService);
doReturn(user).when(userService).findUserById(eq(tenantId), any());
break;
case ASSET:
Asset asset = new Asset();
asset.setTenantId(tenantId);
when(ctx.getAssetService()).thenReturn(assetService);
doReturn(asset).when(assetService).findAssetById(eq(tenantId), any());
break;
case DEVICE:
Device device = new Device();
device.setTenantId(tenantId);
when(ctx.getDeviceService()).thenReturn(deviceService);
doReturn(device).when(deviceService).findDeviceById(eq(tenantId), any());
break;
case ALARM:
Alarm alarm = new Alarm();
alarm.setTenantId(tenantId);
when(ctx.getAlarmService()).thenReturn(alarmService);
doReturn(alarm).when(alarmService).findAlarmById(eq(tenantId), any());
break;
case RULE_CHAIN:
RuleChain ruleChain = new RuleChain();
ruleChain.setTenantId(tenantId);
when(ctx.getRuleChainService()).thenReturn(ruleChainService);
doReturn(ruleChain).when(ruleChainService).findRuleChainById(eq(tenantId), any());
break;
case ENTITY_VIEW:
EntityView entityView = new EntityView();
entityView.setTenantId(tenantId);
when(ctx.getEntityViewService()).thenReturn(entityViewService);
doReturn(entityView).when(entityViewService).findEntityViewById(eq(tenantId), any());
break;
case DASHBOARD:
Dashboard dashboard = new Dashboard();
dashboard.setTenantId(tenantId);
when(ctx.getDashboardService()).thenReturn(dashboardService);
doReturn(dashboard).when(dashboardService).findDashboardById(eq(tenantId), any());
break;
case EDGE:
Edge edge = new Edge();
edge.setTenantId(tenantId);
when(ctx.getEdgeService()).thenReturn(edgeService);
doReturn(edge).when(edgeService).findEdgeById(eq(tenantId), any());
break;
case OTA_PACKAGE:
OtaPackage otaPackage = new OtaPackage();
otaPackage.setTenantId(tenantId);
when(ctx.getOtaPackageService()).thenReturn(otaPackageService);
doReturn(otaPackage).when(otaPackageService).findOtaPackageInfoById(eq(tenantId), any());
break;
case ASSET_PROFILE:
AssetProfile assetProfile = new AssetProfile();
assetProfile.setTenantId(tenantId);
when(ctx.getAssetProfileCache()).thenReturn(assetProfileCache);
doReturn(assetProfile).when(assetProfileCache).get(eq(tenantId), any(AssetProfileId.class));
break;
case DEVICE_PROFILE:
DeviceProfile deviceProfile = new DeviceProfile();
deviceProfile.setTenantId(tenantId);
when(ctx.getDeviceProfileCache()).thenReturn(deviceProfileCache);
doReturn(deviceProfile).when(deviceProfileCache).get(eq(tenantId), any(DeviceProfileId.class));
break;
case WIDGET_TYPE:
WidgetType widgetType = new WidgetType();
widgetType.setTenantId(tenantId);
when(ctx.getWidgetTypeService()).thenReturn(widgetTypeService);
doReturn(widgetType).when(widgetTypeService).findWidgetTypeById(eq(tenantId), any());
break;
case WIDGETS_BUNDLE:
WidgetsBundle widgetsBundle = new WidgetsBundle();
widgetsBundle.setTenantId(tenantId);
when(ctx.getWidgetBundleService()).thenReturn(widgetsBundleService);
doReturn(widgetsBundle).when(widgetsBundleService).findWidgetsBundleById(eq(tenantId), any());
break;
case RPC:
Rpc rpc = new Rpc();
rpc.setTenantId(tenantId);
when(ctx.getRpcService()).thenReturn(rpcService);
doReturn(rpc).when(rpcService).findRpcById(eq(tenantId), any());
break;
case QUEUE:
Queue queue = new Queue();
queue.setTenantId(tenantId);
when(ctx.getQueueService()).thenReturn(queueService);
doReturn(queue).when(queueService).findQueueById(eq(tenantId), any());
break;
case API_USAGE_STATE:
ApiUsageState apiUsageState = new ApiUsageState();
apiUsageState.setTenantId(tenantId);
when(ctx.getRuleEngineApiUsageStateService()).thenReturn(ruleEngineApiUsageStateService);
doReturn(apiUsageState).when(ruleEngineApiUsageStateService).findApiUsageStateById(eq(tenantId), any());
break;
case TB_RESOURCE:
TbResource tbResource = new TbResource();
tbResource.setTenantId(tenantId);
when(ctx.getResourceService()).thenReturn(resourceService);
doReturn(tbResource).when(resourceService).findResourceInfoById(eq(tenantId), any());
break;
case RULE_NODE:
RuleNode ruleNode = new RuleNode();
when(ctx.getRuleChainService()).thenReturn(ruleChainService);
doReturn(ruleNode).when(ruleChainService).findRuleNodeById(eq(tenantId), any());
break;
case TENANT_PROFILE:
TenantProfile tenantProfile = new TenantProfile(tenantProfileId);
when(ctx.getTenantProfile()).thenReturn(tenantProfile);
break;
case NOTIFICATION_TARGET:
NotificationTarget notificationTarget = new NotificationTarget();

Write Preview
Loading…
Cancel
Save