< prev index next >

test/native/runtime/test_semaphore.cpp

Print this page
rev 12338 : 8166156: Convert test_semaphore to GTest
Reviewed-by: duke

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -17,20 +17,15 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
- *
  */
 
 #include "precompiled.hpp"
-#include "utilities/debug.hpp"
 #include "runtime/semaphore.hpp"
-
-/////////////// Unit tests ///////////////
-
-#ifndef PRODUCT
+#include "unittest.hpp"
 
 static void test_semaphore_single_separate(uint count) {
   Semaphore sem(0);
 
   for (uint i = 0; i < count; i++) {

@@ -65,29 +60,26 @@
   for (uint i = 0; i < total; i++) {
     sem.wait();
   }
 }
 
-static void test_semaphore_many() {
-  for (uint max = 0; max < 10; max++) {
-    for (uint value = 0; value < max; value++) {
-      for (uint inc = 1; inc <= max - value; inc++) {
-        test_semaphore_many(value, max, inc);
-      }
-    }
-  }
-}
-
-void test_semaphore() {
+TEST_VM(Semaphore, single_separate) {
   for (uint i = 1; i < 10; i++) {
     test_semaphore_single_separate(i);
   }
+}
 
-  for (uint i = 0; i < 10; i++) {
+TEST_VM(Semaphore, single_combined) {
+  for (uint i = 1; i < 10; i++) {
     test_semaphore_single_combined(i);
   }
-
-  test_semaphore_many();
 }
 
-#endif // PRODUCT
-
+TEST_VM(Semaphore, many) {
+  for (uint max = 0; max < 10; max++) {
+    for (uint value = 0; value < max; value++) {
+      for (uint inc = 1; inc <= max - value; inc++) {
+        test_semaphore_many(value, max, inc);
+      }
+    }
+  }
+}
< prev index next >