[SECIOTSRK-691] Refactoring test device data
authorYevhen Zozulia <y.zozulia@surc.local>
Thu, 16 Nov 2017 11:18:48 +0000 (13:18 +0200)
committerYevhen Zozulia <y.zozulia@surc.local>
Thu, 16 Nov 2017 11:18:48 +0000 (13:18 +0200)
12 files changed:
servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/Device.java
servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/JSONDevice.java [new file with mode: 0644]
servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/User.java [new file with mode: 0644]
servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/DeviceRegistrationAndUnregistrationWithoutCloudTest.java
servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/PolicyWitoutCloudTest.java
servers/api-integration-tests/src/test/java/com/samsung/ci/test/mq/ReportsWithOutCloudTest.java
servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/RestRuleReportsTest.java
servers/api-integration-tests/src/test/java/com/samsung/ci/test/reports/TIAReportsTest.java
servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/AuthorizedWithoutCloudTest.java
servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/BasicUserAction.java
servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/DeviceApiWithoutCloudTest.java
servers/api-integration-tests/src/test/java/com/samsung/ci/test/useractions/UserDSMActionTest.java

index 775ad16..4bff60d 100644 (file)
@@ -19,13 +19,13 @@ package com.samsung.ci.basic.model;
  * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
  */
 public class Device {
-
     private String uuid;
     private String name;
     private String type;
     private String model;
     private int status;
     private String parentUuid;
+    private String mode;
 
     /**
      * Instantiates a new Device.
@@ -37,7 +37,7 @@ public class Device {
      * @param status     the status
      * @param parentUuid the parent uuid
      */
-    public Device(String uuid, String name, String type, String model, int status, String parentUuid) {
+    public Device(String uuid, String name, String type, String model, int status, String parentUuid, String mode) {
         super();
         this.uuid = uuid;
         this.name = name;
@@ -45,6 +45,7 @@ public class Device {
         this.model = model;
         this.status = status;
         this.parentUuid = parentUuid;
+        this.mode = mode;
     }
 
     /**
@@ -162,6 +163,22 @@ public class Device {
         this.parentUuid = parentUuid;
     }
 
+    /**
+     * Gets mode
+     * @return
+     */
+    public String getMode() {
+        return mode;
+    }
+
+    /**
+     * Sets mode
+     * @param mode
+     */
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
     @Override
     public String toString() {
         return "Device [uuid=" + uuid + ", name=" + name + ", type=" + type + ", model=" + model + ", status=" + status
@@ -172,7 +189,6 @@ public class Device {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
         result = prime * result + ((uuid == null) ? 0 : uuid.hashCode());
         return result;
     }
@@ -189,13 +205,6 @@ public class Device {
             return false;
         }
         Device other = (Device) obj;
-        if (name == null) {
-            if (other.name != null) {
-                return false;
-            }
-        } else if (!name.equals(other.name)) {
-            return false;
-        }
         if (uuid == null) {
             if (other.uuid != null) {
                 return false;
diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/JSONDevice.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/JSONDevice.java
new file mode 100644 (file)
index 0000000..8724c5b
--- /dev/null
@@ -0,0 +1,209 @@
+/*
+ * In Samsung Ukraine R&D Center (SRK under a contract between)
+ * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
+ * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved.
+ */
+package com.samsung.ci.basic.model;
+
+/**
+ * The type JSON Device.
+ *
+ * @author Mail to: <A HREF="mailto:y.zozulia@samsung.com">Yevhen Zozulia</A>
+ * @version 1.0
+ * @file Device.java
+ * @brief Model for device
+ * @date Created : 9/21/2017
+ * @date Modified : 9/21/2017
+ * @copyright In Samsung Ukraine R&D Center (SRK under a contract between)
+ * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
+ * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
+ */
+public class JSONDevice {
+
+    private String uuid;
+    private String name;
+    private String type;
+    private String model;
+    private int status;
+    private String parentUuid;
+
+    /**
+     * Instantiates a new Device.
+     *
+     * @param uuid       the uuid
+     * @param name       the name
+     * @param type       the type
+     * @param model      the model
+     * @param status     the status
+     * @param parentUuid the parent uuid
+     */
+    public JSONDevice(String uuid, String name, String type, String model, int status, String parentUuid) {
+        super();
+        this.uuid = uuid;
+        this.name = name;
+        this.type = type;
+        this.model = model;
+        this.status = status;
+        this.parentUuid = parentUuid;
+    }
+
+    /**
+     * Instantiates a new Device.
+     */
+    public JSONDevice() {
+        super();
+    }
+
+    /**
+     * Gets uuid.
+     *
+     * @return the uuid
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Sets uuid.
+     *
+     * @param uuid the uuid
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets name.
+     *
+     * @param name the name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Gets type.
+     *
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets type.
+     *
+     * @param type the type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Gets model.
+     *
+     * @return the model
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * Sets model.
+     *
+     * @param model the model
+     */
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    /**
+     * Gets status.
+     *
+     * @return the status
+     */
+    public int getStatus() {
+        return status;
+    }
+
+    /**
+     * Sets status.
+     *
+     * @param status the status
+     */
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    /**
+     * Gets parent uuid.
+     *
+     * @return the parent uuid
+     */
+    public String getParentUuid() {
+        return parentUuid;
+    }
+
+    /**
+     * Sets parent uuid.
+     *
+     * @param parentUuid the parent uuid
+     */
+    public void setParentUuid(String parentUuid) {
+        this.parentUuid = parentUuid;
+    }
+
+    @Override
+    public String toString() {
+        return "Device [uuid=" + uuid + ", name=" + name + ", type=" + type + ", model=" + model + ", status=" + status
+                + ", parentUuid=" + parentUuid + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((uuid == null) ? 0 : uuid.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        JSONDevice other = (JSONDevice) obj;
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        if (uuid == null) {
+            if (other.uuid != null) {
+                return false;
+            }
+        } else if (!uuid.equals(other.uuid)) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/User.java b/servers/api-integration-tests/src/main/java/com/samsung/ci/basic/model/User.java
new file mode 100644 (file)
index 0000000..9421d4c
--- /dev/null
@@ -0,0 +1,115 @@
+/*
+ * In Samsung Ukraine R&D Center (SRK under a contract between)
+ * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
+ * Copyright (C) 2017 Samsung Electronics Co., Ltd. All rights reserved.
+ */
+package com.samsung.ci.basic.model;
+
+/**
+ * The type User.
+ *
+ * @author Mail to: <A HREF="mailto:y.zozulia@samsung.com">Yevhen Zozulia</A>
+ * @version 1.0
+ * @file Device.java
+ * @brief Model for device
+ * @date Created : 9/21/2017
+ * @date Modified : 9/21/2017
+ * @copyright In Samsung Ukraine R&D Center (SRK under a contract between)
+ * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
+ * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
+ */
+public class User {
+
+    private String name;
+    private String email;
+    private String cloudId;
+    private String password;
+
+    public User() {
+
+    }
+
+    public User(String name, String email, String cloudId, String password) {
+        super();
+        this.name = name;
+        this.email = email;
+        this.cloudId = cloudId;
+        this.password = password;
+    }
+
+    
+    public String getName() {
+        return name;
+    }
+
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    
+    public String getEmail() {
+        return email;
+    }
+
+    
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    
+    public String getCloudId() {
+        return cloudId;
+    }
+
+    
+    public void setCloudId(String cloudId) {
+        this.cloudId = cloudId;
+    }
+
+    
+    public String getPassword() {
+        return password;
+    }
+
+    
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((cloudId == null) ? 0 : cloudId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        User other = (User) obj;
+        if (cloudId == null) {
+            if (other.cloudId != null) {
+                return false;
+            }
+        } else if (!cloudId.equals(other.cloudId)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "User [name=" + name + ", email=" + email + ", cloudId=" + cloudId + ", password=" + password + "]";
+    }
+
+}
index cf87463..1e7f84e 100644 (file)
@@ -16,6 +16,8 @@ import com.google.gson.Gson;
 import com.samsung.ci.basic.api.MQPublisherAPI;
 import com.samsung.ci.basic.api.Rest;
 import com.samsung.ci.basic.model.Device;
+import com.samsung.ci.basic.model.JSONDevice;
+import com.samsung.ci.basic.model.User;
 import com.samsung.ci.test.useractions.BasicUserAction;
 import io.restassured.response.Response;
 
@@ -36,17 +38,14 @@ public class DeviceRegistrationAndUnregistrationWithoutCloudTest extends BasicUs
 
     private static final int HTTP_PAGE_NOT_FOUBD_STATUS = 404;
     private static final int HTTP_OK_STATUS = 200;
-    private static final String DEVICE_DUID = "00000000-1111-2222-3333-4444444444444";
-    private static final String DEVICE_DUID_HUB = "hub-000000-1111-2222-3333-4444444444444";
-    private static final String DEVICE_NAME = "TV";
-    private static final String DEVICE_TYPE = "tv";
-    private static final String DEVICE_MODE1 = "standard";
-    private static final String DEVICE_MODE2 = "hub";
-    private static final String DEVICE_MODEL = "UE32M5500AUXUA";
-    private static final String DEVICE_PARENT_DUID = "55555555-6666-7777-8888-999999999999";
+
     private static final String DEVICE_UNREGISTER_ACTION = "unregister";
     private static final String DEVICE_DELETE_ACTION = "delete";
 
+    private static Device standartDevice;
+    private static Device hubDevice;
+    private static User user;
+
     /**
      * Info.
      */
@@ -60,47 +59,78 @@ public class DeviceRegistrationAndUnregistrationWithoutCloudTest extends BasicUs
             + "4. Remove device\n"
             + "5. Remove user\n");
         //@formatter:on
+        initializeUser();
+        initializeDevices();
+    }
+
+    private static void initializeDevices() {
+        standartDevice = new Device();
+        standartDevice.setUuid("00000000-1111-2222-3333-44444444");
+        standartDevice.setName("TV");
+        standartDevice.setModel("UE32M5500AUXUA");
+        standartDevice.setStatus(1);
+        standartDevice.setType("tv");
+        standartDevice.setMode("standard");
+        standartDevice.setParentUuid("hub-000000-1111-2222-3333-4444444444");
+
+        hubDevice = new Device();
+        hubDevice.setUuid("hub-000000-1111-2222-3333-4444444444");
+        hubDevice.setName("TV");
+        hubDevice.setModel("UE32M5500AUXUA");
+        hubDevice.setStatus(1);
+        hubDevice.setType("tv");
+        hubDevice.setMode("hub");
+        hubDevice.setParentUuid("");
+    }
+
+    private static void initializeUser() {
+        user = new User();
+        user.setCloudId("reg_unreg_user_uuid");
+        user.setName("userRegUnregTest");
+        user.setEmail(user.getName() + "@samsung.com");
+        user.setPassword("111111");
     }
 
-    private void registerDevice(String uuid) {
+    private void registerDevice() {
         log("Device registration");
-        assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE1));
+        assertTrue(MQPublisherAPI.deviceRegistrationInDSM(standartDevice.getUuid(), user.getCloudId(), standartDevice
+                .getName(), standartDevice.getType(), standartDevice
+                        .getModel(), standartDevice.getParentUuid(), standartDevice.getMode()));
     }
 
-    private void registerHubDevice(String uuid) {
+    private void registerHubDevice() {
         log("Device registration");
-        assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID_HUB, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL, DEVICE_PARENT_DUID, DEVICE_MODE2));
+        assertTrue(MQPublisherAPI.deviceRegistrationInDSM(hubDevice.getUuid(), user.getCloudId(), hubDevice
+                .getName(), hubDevice.getType(), hubDevice.getModel(), hubDevice.getParentUuid(), hubDevice.getMode()));
     }
 
     private void checkDevice() {
         log("Check device");
-        Response resp = Rest.getDeviceByDUID(DEVICE_DUID);
+        Response resp = Rest.getDeviceByDUID(standartDevice.getUuid());
         assertEquals(HTTP_OK_STATUS, resp.getStatusCode());
         Gson gson = new Gson();
-        Device device = gson.fromJson(resp.getBody().asString(), Device.class);
+        JSONDevice device = gson.fromJson(resp.getBody().asString(), JSONDevice.class);
         log(device.toString());
-        assertEquals(DEVICE_DUID, device.getUuid());
-        assertEquals(DEVICE_MODEL, device.getModel());
-        assertEquals(DEVICE_NAME, device.getName());
+        assertEquals(standartDevice.getUuid(), device.getUuid());
+        assertEquals(standartDevice.getModel(), device.getModel());
+        assertEquals(standartDevice.getName(), device.getName());
         assertTrue(device.getStatus() == 1);
-        assertEquals(DEVICE_PARENT_DUID, device.getParentUuid());
+        assertEquals(standartDevice.getParentUuid(), device.getParentUuid());
     }
 
-    private void checkDeviceOnList(String uuid) {
+    private void checkDeviceOnList() {
         log("Check device on list");
-        Response resp = Rest.getDeviceByCloudUUID(uuid);
-        assertTrue(resp.getBody().asString().contains(DEVICE_DUID));
+        Response resp = Rest.getDeviceByCloudUUID(user.getCloudId());
+        assertTrue(resp.getBody().asString().contains(standartDevice.getUuid()));
     }
 
-    private void lastCheck(String uuid) {
+    private void lastCheck() {
         log("Last check device");
-        Response resp = Rest.getDeviceByDUID(DEVICE_DUID);
+        Response resp = Rest.getDeviceByDUID(standartDevice.getUuid());
         assertEquals(HTTP_PAGE_NOT_FOUBD_STATUS, resp.getStatusCode());
-        assertFalse(resp.getBody().asString().contains(DEVICE_DUID));
-        resp = Rest.getDeviceByCloudUUID(uuid);
-        assertFalse(resp.getBody().asString().contains(DEVICE_DUID));
+        assertFalse(resp.getBody().asString().contains(standartDevice.getUuid()));
+        resp = Rest.getDeviceByCloudUUID(user.getCloudId());
+        assertFalse(resp.getBody().asString().contains(standartDevice.getUuid()));
     }
 
     /**
@@ -122,54 +152,53 @@ public class DeviceRegistrationAndUnregistrationWithoutCloudTest extends BasicUs
     public void testRegisterAndUnregisterDevice() throws InterruptedException {
         log("Authorized without cloud scenario");
         Thread.sleep(TIMEOUT);
-        createNewUser();
-        loginNewUser();
-        String authcode = getAuthCode(USER_EMAIL, USER_PASSWORD);
+        createNewUser(user);
+        loginNewUser(user);
+        String authcode = getAuthCode(user.getEmail(), user.getPassword());
         String token = getToken(authcode);
-        getUserInfo(token);
-        String uuid = "test-uuid";
-        createIoTUser(USER_EMAIL, uuid);
-        registerDevice(uuid);
+        getUserInfo(token, user.getName(), user.getEmail());
+        createIoTUser(user.getEmail(), user.getCloudId());
+        registerDevice();
         Thread.sleep(TIMEOUT);
         checkDevice();
-        checkDeviceOnList(uuid);
-        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID, DEVICE_DELETE_ACTION));
+        checkDeviceOnList();
+        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(standartDevice.getUuid(), DEVICE_DELETE_ACTION));
         Thread.sleep(TIMEOUT);
         checkDevice();
-        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID, DEVICE_UNREGISTER_ACTION));
+        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(standartDevice.getUuid(), DEVICE_UNREGISTER_ACTION));
         Thread.sleep(TIMEOUT);
-        lastCheck(uuid);
-        deleteIoTUser(uuid);
+        lastCheck();
+        deleteIoTUser(user.getCloudId());
     }
 
     @Test
     public void testRestForAllDevicesNotStandard() throws InterruptedException {
         log("Authorized without cloud scenario");
         Thread.sleep(TIMEOUT);
-        createNewUser();
-        loginNewUser();
-        String authcode = getAuthCode(USER_EMAIL, USER_PASSWORD);
+        createNewUser(user);
+        loginNewUser(user);
+        String authcode = getAuthCode(user.getEmail(), user.getPassword());
         String token = getToken(authcode);
-        getUserInfo(token);
-        String uuid = "test-uuid";
-        createIoTUser(USER_EMAIL, uuid);
-        registerDevice(uuid);
-        registerHubDevice(uuid);
+        getUserInfo(token, user.getName(), user.getEmail());
+        createIoTUser(user.getEmail(), user.getCloudId());
+        registerDevice();
+        registerHubDevice();
         Thread.sleep(TIMEOUT);
         // rest
-        Response response = Rest.findDeviceByCloudUserUuidExceptModeStandard(uuid);
+        Response response = Rest.findDeviceByCloudUserUuidExceptModeStandard(user.getCloudId());
         String body = response.getBody().asString();
-        assertFalse(body.contains(DEVICE_DUID));
-        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID, DEVICE_UNREGISTER_ACTION));
-        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID_HUB, DEVICE_UNREGISTER_ACTION));
-        deleteIoTUser(uuid);
+        assertFalse(body.contains(standartDevice.getUuid()));
+        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(standartDevice.getUuid(), DEVICE_UNREGISTER_ACTION));
+        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(hubDevice.getUuid(), DEVICE_UNREGISTER_ACTION));
+        Thread.sleep(TIMEOUT);
+        deleteIoTUser(user.getCloudId());
     }
 
     @AfterEach
     public void clean() {
         try {
-            MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID_HUB, DEVICE_UNREGISTER_ACTION);
-            MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID, DEVICE_UNREGISTER_ACTION);
+            MQPublisherAPI.deviceUnRegistrationInDSM(hubDevice.getUuid(), DEVICE_UNREGISTER_ACTION);
+            MQPublisherAPI.deviceUnRegistrationInDSM(standartDevice.getUuid(), DEVICE_UNREGISTER_ACTION);
         } catch (Exception e) {
 
         }
index cb21052..5dedd61 100644 (file)
@@ -16,8 +16,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.junit.Ignore;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.samsung.ci.basic.api.MQListenerAPI;
@@ -38,6 +40,8 @@ import com.samsung.ci.test.useractions.BasicUserAction;
  * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
  * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
  */
+@Disabled
+@Ignore
 public class PolicyWitoutCloudTest extends BasicUserAction {
 
     private static final String DEVICE_DUID = "00000000-1111-2222-3333-4444444444444";
index 292ad7c..cc3f812 100644 (file)
@@ -15,8 +15,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.junit.Ignore;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.google.gson.Gson;
@@ -41,6 +43,8 @@ import io.restassured.response.Response;
  * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
  * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
  */
+@Disabled
+@Ignore
 public class ReportsWithOutCloudTest extends BasicUserAction {
 
     private static final String SMACK = "smack";
index ff9fc6f..db02da3 100644 (file)
@@ -15,8 +15,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.junit.Ignore;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.google.gson.Gson;
@@ -40,6 +42,8 @@ import io.restassured.response.Response;
  * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
  * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
  */
+@Disabled
+@Ignore
 public class RestRuleReportsTest extends BasicUserAction {
 
     private static final String SYSCALL = "syscall";
index 22cf0eb..85ad53e 100644 (file)
@@ -15,8 +15,10 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 
+import org.junit.Ignore;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.google.gson.Gson;
@@ -40,6 +42,8 @@ import io.restassured.response.Response;
  * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
  * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
  */
+@Disabled
+@Ignore
 public class TIAReportsTest extends BasicUserAction {
 
     private static final String DEVICE_DUID = "00000000-1111-2222-3333-4444444444444";
index 2118940..6c1f8e4 100644 (file)
@@ -5,7 +5,9 @@
  */
 package com.samsung.ci.test.useractions;
 
+import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -21,6 +23,8 @@ import org.junit.jupiter.api.Test;
  * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
  * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
  */
+@Disabled
+@Ignore
 public class AuthorizedWithoutCloudTest extends BasicUserAction {
 
     /**
index bc59305..376b38d 100644 (file)
@@ -8,6 +8,7 @@ package com.samsung.ci.test.useractions;
 import com.samsung.ci.basic.api.Alive;
 import com.samsung.ci.basic.api.DBConfigInit;
 import com.samsung.ci.basic.api.Rest;
+import com.samsung.ci.basic.model.User;
 import com.samsung.commons.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -95,6 +96,12 @@ public class BasicUserAction {
         newUser(USER_NAME, USER_EMAIL, USER_PASSWORD, USER_PASSWORD, ROLE_ID).then().assertThat()
                 .statusCode(HTTP_OK_STATUS);
     }
+    
+    protected void createNewUser(User user) {
+        log("create new user");
+        newUser(user.getName(), user.getEmail(), user.getPassword(), user.getPassword(), ROLE_ID).then().assertThat()
+                .statusCode(HTTP_OK_STATUS);
+    }
 
     /**
      * Login new user response.
@@ -107,6 +114,13 @@ public class BasicUserAction {
         resp.then().assertThat().statusCode(HTTP_TEMP_MOVED_STATUS);
         return resp;
     }
+    
+    protected Response loginNewUser(User user) {
+        log("login new user");
+        Response resp = login(user.getEmail(), user.getPassword());
+        resp.then().assertThat().statusCode(HTTP_TEMP_MOVED_STATUS);
+        return resp;
+    }
 
     /**
      * Logout new user.
@@ -198,6 +212,21 @@ public class BasicUserAction {
     }
 
     /**
+     * Gets user info.
+     * 
+     * @param token
+     * @param name
+     * @param email
+     * @return
+     */
+    protected Response getUserInfo(String token, String name, String email) {
+        log("get user info");
+        Response resp = Rest.getUserInfo(token);
+        resp.then().assertThat().body("username", equalTo(name)).body("email", equalTo(email));
+        return resp;
+    }
+    
+    /**
      * Create io t user response.
      *
      * @param email the email
index d5e5000..c7123d7 100644 (file)
@@ -8,8 +8,9 @@ package com.samsung.ci.test.useractions;
 import com.google.gson.Gson;
 import com.samsung.ci.basic.api.MQPublisherAPI;
 import com.samsung.ci.basic.api.Rest;
+import com.samsung.ci.basic.model.Device;
+import com.samsung.ci.basic.model.User;
 import io.restassured.response.Response;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -33,16 +34,11 @@ import static org.junit.Assert.assertEquals;
  */
 public class DeviceApiWithoutCloudTest extends BasicUserAction {
 
-    private static final String DEVICE_DUID1 = "D1-0000000-1111-2222-3333-4444444444444";
-    private static final String DEVICE_DUID2 = "D2-0000000-1111-2222-3333-4444444444444";
     private static final String DEVICE_UNREGISTER_ACTION = "unregister";
-    private static final String DEVICE_NAME = "TV";
-    private static final String DEVICE_TYPE = "tv";
-    private static final String DEVICE_MODEL1 = "old";
-    private static final String DEVICE_MODEL2 = "new";
-    private static final String DEVICE_MODE1 = "standard";
-    private static final String DEVICE_MODE2 = "hub";
-    private static final String DEVICE_PARENT_DUID = "D-55555555-6666-7777-8888-999999999999";
+
+    private static Device device1;
+    private static Device device2;
+    private static User user;
 
     @BeforeAll
     public static void info() {
@@ -55,26 +51,56 @@ public class DeviceApiWithoutCloudTest extends BasicUserAction {
                 "5. Unregister device\n" +
                 "6. Delete IoTCloud User\n");
         //@formatter:on
+        initializeUser();
+        initializeDevices();
+    }
+
+    private static void initializeDevices() {
+        device1 = new Device();
+        device1.setUuid("D1-0000000-1111-2222-3333-4444444444444");
+        device1.setName("TV");
+        device1.setModel("old");
+        device1.setStatus(1);
+        device1.setType("tv");
+        device1.setMode("standard");
+        device1.setParentUuid("D-55555555-6666-7777-8888-999999999999");
+
+        device2 = new Device();
+        device2.setUuid("D2-0000000-1111-2222-3333-4444444444444");
+        device2.setName("TV");
+        device2.setModel("new");
+        device2.setStatus(1);
+        device2.setType("tv");
+        device2.setMode("hub");
+        device2.setParentUuid("D-55555555-6666-7777-8888-999999999999");
+    }
+
+    private static void initializeUser() {
+        user = new User();
+        user.setCloudId("device_api_user_uuid");
+        user.setName("userDeviceApiTest");
+        user.setEmail(user.getName() + "@samsung.com");
+        user.setPassword("111111");
     }
 
-    private void registerDevices(String uuid) {
+    private void registerDevices() {
         log("Device registration");
-        assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID1, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL1, DEVICE_PARENT_DUID, DEVICE_MODE1));
-        assertTrue(MQPublisherAPI
-                .deviceRegistrationInDSM(DEVICE_DUID2, uuid, DEVICE_NAME, DEVICE_TYPE, DEVICE_MODEL2, DEVICE_PARENT_DUID, DEVICE_MODE2));
+        assertTrue(MQPublisherAPI.deviceRegistrationInDSM(device1.getUuid(), user.getCloudId(), device1
+                .getName(), device1.getType(), device1.getModel(), device1.getParentUuid(), device1.getMode()));
+        assertTrue(MQPublisherAPI.deviceRegistrationInDSM(device2.getUuid(), user.getCloudId(), device2
+                .getName(), device2.getType(), device2.getModel(), device2.getParentUuid(), device2.getMode()));
     }
 
     private void unregisterDevices() {
         log("Device unregistration");
-        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID1, DEVICE_UNREGISTER_ACTION));
-        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID2, DEVICE_UNREGISTER_ACTION));
+        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(device1.getUuid(), DEVICE_UNREGISTER_ACTION));
+        assertTrue(MQPublisherAPI.deviceUnRegistrationInDSM(device2.getUuid(), DEVICE_UNREGISTER_ACTION));
     }
 
-    private void checkfindByCloudUserUuidExceptModeStandard(String uuid) {
+    private void checkfindByCloudUserUuidExceptModeStandard() {
         log("checkfindByCloudUserUuidExceptModeStandard");
-        Response resp = Rest.findDeviceByCloudUserUuidExceptModeStandard(uuid);
-        final int size = 0;
+        Response resp = Rest.findDeviceByCloudUserUuidExceptModeStandard(user.getCloudId());
+        final int size = 1;
         checkResponseSize(resp, size);
     }
 
@@ -90,24 +116,23 @@ public class DeviceApiWithoutCloudTest extends BasicUserAction {
     @Test
     public void testDeviceApiWithoutCloud() throws InterruptedException {
         log("Create new user for testDeviceApiWithoutCloud scenario");
-        createNewUser();
-        String uuid = "test-uuid";
-        createIoTUser(USER_EMAIL, uuid);
+        createNewUser(user);
+        createIoTUser(user.getEmail(), user.getCloudId());
 
-        registerDevices(uuid);
+        registerDevices();
         Thread.sleep(TIMEOUT);
 
-        checkfindByCloudUserUuidExceptModeStandard(uuid);
+        checkfindByCloudUserUuidExceptModeStandard();
 
         unregisterDevices();
-        deleteIoTUser(uuid);
+        deleteIoTUser(user.getCloudId());
     }
-    
+
     @AfterEach
     public void clean() {
         try {
-            MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID1, DEVICE_UNREGISTER_ACTION);
-            MQPublisherAPI.deviceUnRegistrationInDSM(DEVICE_DUID2, DEVICE_UNREGISTER_ACTION);
+            MQPublisherAPI.deviceUnRegistrationInDSM(device1.getUuid(), DEVICE_UNREGISTER_ACTION);
+            MQPublisherAPI.deviceUnRegistrationInDSM(device2.getUuid(), DEVICE_UNREGISTER_ACTION);
         } catch (Exception e) {
 
         }
index 90bf4d8..75017dc 100644 (file)
@@ -7,7 +7,9 @@ package com.samsung.ci.test.useractions;
 
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
+import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -26,6 +28,8 @@ import io.restassured.response.Response;
  * @par LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
  * @par Copyright : (c) Samsung Electronics Co, Ltd 2017. All rights reserved.
  */
+@Disabled
+@Ignore
 @RunWith(SpringJUnit4ClassRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class UserDSMActionTest extends BasicUserAction {