From ff544169318af1ade478602fccf977c34354f495 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Sat, 24 Feb 2018 12:51:24 +0800
Subject: [PATCH] Add unittest of unique_name

* Also follow comments, change prefix to key
---
 .../fluid/tests/unittests/test_unique_name.py | 43 +++++++++++++++++++
 python/paddle/v2/fluid/unique_name.py         |  4 +-
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 python/paddle/v2/fluid/tests/unittests/test_unique_name.py

diff --git a/python/paddle/v2/fluid/tests/unittests/test_unique_name.py b/python/paddle/v2/fluid/tests/unittests/test_unique_name.py
new file mode 100644
index 0000000000..e28810c96b
--- /dev/null
+++ b/python/paddle/v2/fluid/tests/unittests/test_unique_name.py
@@ -0,0 +1,43 @@
+#   Copyright (c) 2018 PaddlePaddle Authors. 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.
+
+import unittest
+import paddle.v2.fluid as fluid
+
+
+class TestUniqueName(unittest.TestCase):
+    def test_guard(self):
+        with fluid.unique_name.guard():
+            name_1 = fluid.unique_name.generate('')
+
+        with fluid.unique_name.guard():
+            name_2 = fluid.unique_name.generate('')
+
+        self.assertEqual(name_1, name_2)
+
+        with fluid.unique_name.guard("A"):
+            name_1 = fluid.unique_name.generate('')
+
+        with fluid.unique_name.guard('B'):
+            name_2 = fluid.unique_name.generate('')
+
+        self.assertNotEqual(name_1, name_2)
+
+    def test_generate(self):
+        with fluid.unique_name.guard():
+            name1 = fluid.unique_name.generate('fc')
+            name2 = fluid.unique_name.generate('fc')
+            name3 = fluid.unique_name.generate('tmp')
+            self.assertNotEqual(name1, name2)
+            self.assertEqual(name1[-2:], name3[-2:])
diff --git a/python/paddle/v2/fluid/unique_name.py b/python/paddle/v2/fluid/unique_name.py
index 034caac962..33c53113ae 100644
--- a/python/paddle/v2/fluid/unique_name.py
+++ b/python/paddle/v2/fluid/unique_name.py
@@ -51,8 +51,8 @@ class UniqueNameGenerator(object):
 generator = UniqueNameGenerator()
 
 
-def generate(prefix):
-    return generator(prefix)
+def generate(key):
+    return generator(key)
 
 
 def switch(new_generator=None):
-- 
GitLab