GP-0: Fix some tests (mock.slaspec, register count)

This commit is contained in:
Dan
2025-01-06 11:41:55 -05:00
parent acf5ac688a
commit ea95c146b5
4 changed files with 37 additions and 18 deletions

View File

@@ -4,9 +4,9 @@
* 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.
@@ -30,9 +30,10 @@ import utilities.util.FileUtilities;
*/
public class ResourceFile implements Comparable<ResourceFile> {
private static final String JAR_FILE_PREFIX = "jar:file:";
private Resource resource;
private static Map<String, JarResource> jarRootsMap = new HashMap<>();
private static final String FILE_PREFIX = "file:";
private static final String JAR_FILE_PREFIX = "jar:" + FILE_PREFIX;
private final Resource resource;
private static final Map<String, JarResource> jarRootsMap = new HashMap<>();
/**
* Construct a ResourceFile that represents a normal file in the file system.
@@ -93,7 +94,13 @@ public class ResourceFile implements Comparable<ResourceFile> {
throw new IllegalArgumentException("Failed to open jar: " + filePath, e);
}
}
resource = new FileResource(new File(absolutePath));
else if (absolutePath.startsWith(FILE_PREFIX)) {
String filePath = absolutePath.substring(FILE_PREFIX.length());
resource = new FileResource(new File(filePath));
}
else {
resource = new FileResource(new File(absolutePath));
}
}
/**