diff options
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java | 2 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/concurrent/StripedKeyedLockerTest.java | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java index 1549a548ac..b87983a3d2 100644 --- a/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java +++ b/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java @@ -203,7 +203,7 @@ public abstract class KeyedLockerTest { try { Preconditions.checkNotNull(unlockerRef.get()).close(); fail(); - } catch (IllegalUnlockException expected) { + } catch (IllegalMonitorStateException expected) { runnable2Executed.set(true); } } diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/StripedKeyedLockerTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/StripedKeyedLockerTest.java new file mode 100644 index 0000000000..5ae0b28c3b --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/concurrent/StripedKeyedLockerTest.java @@ -0,0 +1,26 @@ +// Copyright 2015 Google Inc. 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. +package com.google.devtools.build.lib.concurrent; + +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Tests for {@link StripedKeyedLocker}. */ +@RunWith(JUnit4.class) +public class StripedKeyedLockerTest extends KeyedLockerTest { + @Override + protected KeyedLocker<String> makeFreshLocker() { + return new StripedKeyedLocker<>(17); + } +} |