From 132ace407c16fe1b51223b79148c35be72c38fa9 Mon Sep 17 00:00:00 2001 From: van-vanich Date: Thu, 25 Nov 2021 15:23:54 +0200 Subject: [PATCH] fix issue with forgotten license and fix the old test, which doesn't work because of a new feature --- .../server/dao/service/BaseEntityServiceTest.java | 8 ++++++++ .../dao/sql/query/EntityKeyMappingTest.java | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java index e58191b60d..9140c457e6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java @@ -1307,6 +1307,14 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { notEqualStrings.add(operationName); containsStrings.add(operationName); break; + case IN: + notEqualStrings.add(operationName); + notContainsStrings.add(operationName); + break; + case NOT_IN: + notEqualStrings.add(operationName); + notContainsStrings.add(operationName); + break; } } diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityKeyMappingTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityKeyMappingTest.java index c914bce1c1..01b41121e4 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityKeyMappingTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/EntityKeyMappingTest.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2016-2021 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.thingsboard.server.dao.sql.query; import org.junit.Assert;