Drop LockBasedStorageManager.defaultDebugName, use meaningful name everywhere

Also, drop `createDelegatingWithSameLock` as it was unused
This commit is contained in:
Dmitry Savvinov
2018-05-30 14:03:35 +03:00
committed by Dmitry Savvinov
parent 893479bd5e
commit 69fff12384
15 changed files with 24 additions and 37 deletions
@@ -41,7 +41,7 @@ class BuiltInsSerializerTest : TestCaseWithTmpdir() {
val module = KotlinTestUtils.createEmptyModule("<module>", DefaultBuiltIns.Instance)
val packageFragmentProvider = BuiltInsLoaderImpl().createBuiltInPackageFragmentProvider(
LockBasedStorageManager(), module, setOf(TEST_PACKAGE_FQNAME), emptyList(), PlatformDependentDeclarationFilter.All
LockBasedStorageManager("BuiltInsSerializerTest"), module, setOf(TEST_PACKAGE_FQNAME), emptyList(), PlatformDependentDeclarationFilter.All
) {
val file = File(tmpdir, it)
if (file.exists()) FileInputStream(file) else null
@@ -83,7 +83,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment {
@NotNull
private static PackageFragmentProvider createBuiltInsPackageFragmentProvider() {
LockBasedStorageManager storageManager = new LockBasedStorageManager();
LockBasedStorageManager storageManager = new LockBasedStorageManager("LoadBuiltinsTest");
ModuleDescriptorImpl builtInsModule =
new ModuleDescriptorImpl(KotlinBuiltIns.BUILTINS_MODULE_NAME, storageManager, DefaultBuiltIns.getInstance());
@@ -99,7 +99,7 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
val (header, packageFragmentProtos) = readModuleAsProto(metadata.body, metadata.version)
val provider = createKotlinJavascriptPackageFragmentProvider(
LockBasedStorageManager(), module, header, packageFragmentProtos, metadata.version,
LockBasedStorageManager("KotlinJavascriptrSerializerTest"), module, header, packageFragmentProtos, metadata.version,
DeserializationConfiguration.Default, LookupTracker.DO_NOTHING
).sure { "No package fragment provider was created" }
@@ -34,7 +34,7 @@ public class StorageManagerTest extends TestCase {
@Override
public void setUp() throws Exception {
super.setUp();
m = new LockBasedStorageManager();
m = new LockBasedStorageManager("StorageManagerTest");
}
public static <T> void doTestComputesOnce(Function0<T> v, T expected, Counter counter) throws Exception {
@@ -416,7 +416,7 @@ public class StorageManagerTest extends TestCase {
public void testExceptionHandlingStrategyForLazyValues() throws Exception {
class RethrownException extends RuntimeException {}
LockBasedStorageManager m = LockBasedStorageManager.createWithExceptionHandling(throwable -> {
LockBasedStorageManager m = LockBasedStorageManager.createWithExceptionHandling("StorageManagerTest", throwable -> {
throw new RethrownException();
});
try {
@@ -432,7 +432,7 @@ public class StorageManagerTest extends TestCase {
public void testExceptionHandlingStrategyForMemoizedFunctions() throws Exception {
class RethrownException extends RuntimeException {}
LockBasedStorageManager m = LockBasedStorageManager.createWithExceptionHandling(throwable -> {
LockBasedStorageManager m = LockBasedStorageManager.createWithExceptionHandling("StorageManagerTest", throwable -> {
throw new RethrownException();
});
try {