Browse Source

tests dao: marked base classes as abstract, exclude subfolders for sql test on in pom

pull/5364/head
Sergey Matvienko 5 years ago
parent
commit
f4cfd92aaa
  1. 1
      dao/pom.xml
  2. 2
      dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java
  3. 2
      dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
  4. 2
      dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
  5. 2
      dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java

1
dao/pom.xml

@ -256,6 +256,7 @@
<configuration> <configuration>
<excludes> <excludes>
<exclude>**/sql/*Test.java</exclude> <exclude>**/sql/*Test.java</exclude>
<exclude>**/sql/*/*Test.java</exclude>
<exclude>**/psql/*Test.java</exclude> <exclude>**/psql/*Test.java</exclude>
<exclude>**/nosql/*Test.java</exclude> <exclude>**/nosql/*Test.java</exclude>
</excludes> </excludes>

2
dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java

@ -47,7 +47,7 @@ import java.util.stream.Collectors;
import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
public class BaseDeviceProfileServiceTest extends AbstractServiceTest { public abstract class BaseDeviceProfileServiceTest extends AbstractServiceTest {
private IdComparator<DeviceProfile> idComparator = new IdComparator<>(); private IdComparator<DeviceProfile> idComparator = new IdComparator<>();
private IdComparator<DeviceProfileInfo> deviceProfileInfoIdComparator = new IdComparator<>(); private IdComparator<DeviceProfileInfo> deviceProfileInfoIdComparator = new IdComparator<>();

2
dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java

@ -31,7 +31,7 @@ import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService;
import java.util.Arrays; import java.util.Arrays;
import java.util.UUID; import java.util.UUID;
public class BaseOAuth2ConfigTemplateServiceTest extends AbstractServiceTest { public abstract class BaseOAuth2ConfigTemplateServiceTest extends AbstractServiceTest {
@Autowired @Autowired
protected OAuth2ConfigTemplateService oAuth2ConfigTemplateService; protected OAuth2ConfigTemplateService oAuth2ConfigTemplateService;

2
dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java

@ -43,7 +43,7 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class BaseOAuth2ServiceTest extends AbstractServiceTest { public abstract class BaseOAuth2ServiceTest extends AbstractServiceTest {
private static final OAuth2Info EMPTY_PARAMS = new OAuth2Info(false, Collections.emptyList()); private static final OAuth2Info EMPTY_PARAMS = new OAuth2Info(false, Collections.emptyList());
@Autowired @Autowired

2
dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java

@ -34,7 +34,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class BaseTenantProfileServiceTest extends AbstractServiceTest { public abstract class BaseTenantProfileServiceTest extends AbstractServiceTest {
private IdComparator<TenantProfile> idComparator = new IdComparator<>(); private IdComparator<TenantProfile> idComparator = new IdComparator<>();
private IdComparator<EntityInfo> tenantProfileInfoIdComparator = new IdComparator<>(); private IdComparator<EntityInfo> tenantProfileInfoIdComparator = new IdComparator<>();

Loading…
Cancel
Save