Browse Source
Merge pull request #8068 from dashevchenko/ignoredUnstableTests
Ignored unstable integration tests
pull/8086/head
Andrew Shvayka
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with
18 additions and
2 deletions
-
application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java
-
application/src/test/java/org/thingsboard/server/controller/BaseAssetControllerTest.java
-
application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java
-
application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java
-
application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
-
application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java
-
application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java
-
application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java
-
application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java
|
|
|
@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -441,7 +442,6 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest { |
|
|
|
Assert.assertTrue("Created alarm doesn't match the found one!", equals); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
public void testDeleteAlarmWithDeleteRelationsOk() throws Exception { |
|
|
|
loginCustomerUser(); |
|
|
|
@ -449,6 +449,7 @@ public abstract class BaseAlarmControllerTest extends AbstractControllerTest { |
|
|
|
testEntityDaoWithRelationsOk(customerDevice.getId(), alarmId, "/api/alarm/" + alarmId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteAlarmExceptionWithRelationsTransactional() throws Exception { |
|
|
|
loginCustomerUser(); |
|
|
|
|
|
|
|
@ -20,6 +20,7 @@ import com.fasterxml.jackson.core.type.TypeReference; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -980,6 +981,7 @@ public abstract class BaseAssetControllerTest extends AbstractControllerTest { |
|
|
|
testEntityDaoWithRelationsOk(savedTenant.getId(), assetId, "/api/asset/" + assetId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteAssetExceptionWithRelationsTransactional() throws Exception { |
|
|
|
AssetId assetId = createAsset("Asset for Test WithRelations Transactional Exception").getId(); |
|
|
|
|
|
|
|
@ -23,6 +23,7 @@ import com.google.common.util.concurrent.MoreExecutors; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -428,6 +429,7 @@ public abstract class BaseCustomerControllerTest extends AbstractControllerTest |
|
|
|
testEntityDaoWithRelationsOk(savedTenant.getId(), customerId, "/api/customer/" + customerId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteCustomerExceptionWithRelationsTransactional() throws Exception { |
|
|
|
CustomerId customerId = createCustomer("Customer for Test WithRelations Transactional Exception").getId(); |
|
|
|
|
|
|
|
@ -24,6 +24,7 @@ import com.google.common.util.concurrent.MoreExecutors; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -1324,6 +1325,7 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest { |
|
|
|
testEntityDaoWithRelationsOk(savedTenant.getId(), deviceId, "/api/device/" + deviceId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteDeviceExceptionWithRelationsTransactional() throws Exception { |
|
|
|
DeviceId deviceId = createDevice("Device for Test WithRelations Transactional Exception").getId(); |
|
|
|
|
|
|
|
@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -990,6 +991,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController |
|
|
|
testEntityDaoWithRelationsOk(savedTenant.getId(), deviceProfileId, "/api/deviceProfile/" + deviceProfileId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteDeviceProfileExceptionWithRelationsTransactional() throws Exception { |
|
|
|
DeviceProfileId deviceProfileId = savedDeviceProfile("DeviceProfile for Test WithRelations Transactional Exception").getId(); |
|
|
|
|
|
|
|
@ -24,6 +24,7 @@ import com.google.common.util.concurrent.MoreExecutors; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -931,6 +932,7 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest { |
|
|
|
testEntityDaoWithRelationsOk(savedTenant.getId(), edgeId, "/api/edge/" + edgeId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteEdgeExceptionWithRelationsTransactional() throws Exception { |
|
|
|
EdgeId edgeId = savedEdge("Edge for Test WithRelations Transactional Exception").getId(); |
|
|
|
|
|
|
|
@ -30,6 +30,7 @@ import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -845,6 +846,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes |
|
|
|
testEntityDaoWithRelationsOk(tenantId, entityViewId, "/api/entityView/" + entityViewId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteEntityViewExceptionWithRelationsTransactional() throws Exception { |
|
|
|
EntityViewId entityViewId = getNewSavedEntityView("EntityView for Test WithRelations Transactional Exception").getId(); |
|
|
|
|
|
|
|
@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -253,6 +254,7 @@ public abstract class BaseRuleChainControllerTest extends AbstractControllerTest |
|
|
|
testEntityDaoWithRelationsOk(savedTenant.getId(), ruleChainId, "/api/ruleChain/" + ruleChainId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteRuleChainExceptionWithRelationsTransactional() throws Exception { |
|
|
|
RuleChainId ruleChainId = createRuleChain("RuleChain for Test WithRelations Transactional Exception").getId(); |
|
|
|
|
|
|
|
@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode; |
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper; |
|
|
|
import org.junit.After; |
|
|
|
import org.junit.Assert; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.mockito.AdditionalAnswers; |
|
|
|
import org.mockito.Mockito; |
|
|
|
@ -717,13 +718,13 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest { |
|
|
|
.andExpect(status().isOk()); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
public void testDeleteUserWithDeleteRelationsOk() throws Exception { |
|
|
|
UserId userId = createUser().getId(); |
|
|
|
testEntityDaoWithRelationsOk(tenantId, userId, "/api/user/" + userId); |
|
|
|
} |
|
|
|
|
|
|
|
@Ignore |
|
|
|
@Test |
|
|
|
public void testDeleteUserExceptionWithRelationsTransactional() throws Exception { |
|
|
|
UserId userId = createUser().getId(); |
|
|
|
|