[coco] Remove deprecated methods from Window2D class (#1771)

This commit removes deprecated methods from Window2D and updates related
tests accordingly.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/coco/core/include/coco/IR/Window2D.h b/contrib/coco/core/include/coco/IR/Window2D.h
index 84a5ba7..a434538 100644 (file)
--- a/contrib/coco/core/include/coco/IR/Window2D.h
+++ b/contrib/coco/core/include/coco/IR/Window2D.h
@@ -37,16 +37,6 @@ public:
   }
 
 public:
-  // NOTE These methods are deprecated. Use height instead
-  uint32_t vertical(void) const { return _vertical; }
-  Window2D &vertical(uint32_t value);
-
-public:
-  // NOTE These methods are deprecated. Use width instead
-  uint32_t horizontal(void) const { return _horizontal; }
-  Window2D &horizontal(uint32_t value);
-
-public:
   uint32_t height(void) const { return _vertical; }
   void height(uint32_t value) { _vertical = value; }
 

diff --git a/contrib/coco/core/src/IR/Window2D.cpp b/contrib/coco/core/src/IR/Window2D.cpp
deleted file mode 100644 (file)
index 7f8bc5e..0000000
--- a/contrib/coco/core/src/IR/Window2D.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
- *
- * 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.
- */
-
-#include "coco/IR/Window2D.h"
-
-namespace coco
-{
-
-Window2D &Window2D::vertical(uint32_t value)
-{
-  _vertical = value;
-  return (*this);
-}
-
-Window2D &Window2D::horizontal(uint32_t value)
-{
-  _horizontal = value;
-  return (*this);
-}
-
-} // namespace coco

diff --git a/contrib/coco/core/src/IR/Window2D.test.cpp b/contrib/coco/core/src/IR/Window2D.test.cpp
index 087581f..c0e9192 100644 (file)
--- a/contrib/coco/core/src/IR/Window2D.test.cpp
+++ b/contrib/coco/core/src/IR/Window2D.test.cpp
@@ -22,24 +22,25 @@ TEST(IR_WINDOW_2D, default_constructor)
 {
   coco::Window2D window;
 
-  ASSERT_EQ(window.vertical(), 1);
-  ASSERT_EQ(window.horizontal(), 1);
+  ASSERT_EQ(window.height(), 1);
+  ASSERT_EQ(window.width(), 1);
 }
 
 TEST(IR_WINDOW_2D, explicit_constructor_4)
 {
   coco::Window2D window{2, 3};
 
-  ASSERT_EQ(window.vertical(), 2);
-  ASSERT_EQ(window.horizontal(), 3);
+  ASSERT_EQ(window.height(), 2);
+  ASSERT_EQ(window.width(), 3);
 }
 
 TEST(IR_WINDOW_2D, update)
 {
   coco::Window2D window;
 
-  window.vertical(2).horizontal(3);
+  window.height(2);
+  window.width(3);
 
-  ASSERT_EQ(window.vertical(), 2);
-  ASSERT_EQ(window.horizontal(), 3);
+  ASSERT_EQ(window.height(), 2);
+  ASSERT_EQ(window.width(), 3);
 }