Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
<wiremock.version>3.13.2</wiremock.version>
<mockito.version>5.24.0</mockito.version>
<system.stubs.version>2.1.8</system.stubs.version>
<classgraph.version>4.8.199</classgraph.version>
<awaitability.version>4.3.0</awaitability.version>

<!-- Plugin version -->
Expand Down Expand Up @@ -144,11 +143,6 @@
<artifactId>zstd-jni</artifactId>
<version>${zstd-jni.version}</version>
</dependency>
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>${classgraph.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
Expand Down Expand Up @@ -265,11 +259,6 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand Down
129 changes: 69 additions & 60 deletions src/test/java/land/oras/ClassAnnotationsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import io.github.classgraph.ClassGraph;
import io.github.classgraph.ScanResult;
import java.util.HashSet;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import land.oras.auth.HttpClient;
import land.oras.exception.Error;
import org.junit.jupiter.api.Test;
Expand All @@ -37,73 +40,79 @@
class ClassAnnotationsTest {

@Test
void shouldHaveAnnotationOnModel() {
try (ScanResult scanResult = new ClassGraph()
.enableClassInfo()
.enableAllInfo()
.enableAnnotationInfo()
.acceptPackages("land.oras")
.scan()) {
Set<Class<?>> modelClasses = new HashSet<>(scanResult
.getClassesWithAnnotation(OrasModel.class.getName())
.loadClasses());
void shouldHaveAnnotationOnModel() throws Exception {
Set<Class<?>> modelClasses = findAnnotatedClasses("land.oras");

// Check number of classes
assertEquals(43, modelClasses.size());
// Check number of classes
assertEquals(43, modelClasses.size());

// Check classes
assertTrue(modelClasses.contains(Annotations.class));
assertTrue(modelClasses.contains(ArtifactType.class));
assertTrue(modelClasses.contains(Config.class));
assertTrue(modelClasses.contains(CopyUtils.CopyOptions.class));
assertTrue(modelClasses.contains(Descriptor.class));
assertTrue(modelClasses.contains(Describable.class));
assertTrue(modelClasses.contains(Error.class));
assertTrue(modelClasses.contains(HttpClient.TokenResponse.class));
assertTrue(modelClasses.contains(Index.class));
assertTrue(modelClasses.contains(Layer.class));
assertTrue(modelClasses.contains(Manifest.class));
assertTrue(modelClasses.contains(ManifestDescriptor.class));
assertTrue(modelClasses.contains(OCILayout.class));
assertTrue(modelClasses.contains(OCI.PullOptions.class));
assertTrue(modelClasses.contains(OCI.PushOptions.class));
assertTrue(modelClasses.contains(Repositories.class));
assertTrue(modelClasses.contains(Subject.class));
assertTrue(modelClasses.contains(Tags.class));
}
// Check classes
assertTrue(modelClasses.contains(Annotations.class));
assertTrue(modelClasses.contains(ArtifactType.class));
assertTrue(modelClasses.contains(Config.class));
assertTrue(modelClasses.contains(CopyUtils.CopyOptions.class));
assertTrue(modelClasses.contains(Descriptor.class));
assertTrue(modelClasses.contains(Describable.class));
assertTrue(modelClasses.contains(Error.class));
assertTrue(modelClasses.contains(HttpClient.TokenResponse.class));
assertTrue(modelClasses.contains(Index.class));
assertTrue(modelClasses.contains(Layer.class));
assertTrue(modelClasses.contains(Manifest.class));
assertTrue(modelClasses.contains(ManifestDescriptor.class));
assertTrue(modelClasses.contains(OCILayout.class));
assertTrue(modelClasses.contains(OCI.PullOptions.class));
assertTrue(modelClasses.contains(OCI.PushOptions.class));
assertTrue(modelClasses.contains(Repositories.class));
assertTrue(modelClasses.contains(Subject.class));
assertTrue(modelClasses.contains(Tags.class));
}

@Test
void shouldHaveAnnotationOnAuthPackage() {
try (ScanResult scanResult = new ClassGraph()
.enableClassInfo()
.enableAllInfo()
.enableAnnotationInfo()
.acceptPackages("land.oras.auth")
.scan()) {
Set<Class<?>> modelClasses = new HashSet<>(scanResult
.getClassesWithAnnotation(OrasModel.class.getName())
.loadClasses());
void shouldHaveAnnotationOnAuthPackage() throws Exception {
Set<Class<?>> modelClasses = findAnnotatedClasses("land.oras.auth");

// Check number of classes
assertEquals(10, modelClasses.size());
}
// Check number of classes
assertEquals(10, modelClasses.size());
}

@Test
void shouldHaveAnnotationOnPolicyPackage() {
try (ScanResult scanResult = new ClassGraph()
.enableClassInfo()
.enableAllInfo()
.enableAnnotationInfo()
.acceptPackages("land.oras.policy")
.scan()) {
Set<Class<?>> modelClasses = new HashSet<>(scanResult
.getClassesWithAnnotation(OrasModel.class.getName())
.loadClasses());
void shouldHaveAnnotationOnPolicyPackage() throws Exception {
Set<Class<?>> modelClasses = findAnnotatedClasses("land.oras.policy");

// Check number of classes
assertEquals(11, modelClasses.size());
}

/**
* Find all classes annotated with {@link OrasModel} in the given package and its sub-packages
* @param packageName The package name
* @return The annotated classes
*/
private static Set<Class<?>> findAnnotatedClasses(String packageName) throws IOException, URISyntaxException {
Path root = Path.of(OrasModel.class
.getProtectionDomain()
.getCodeSource()
.getLocation()
.toURI());
Path packageDir = root.resolve(packageName.replace('.', '/'));
ClassLoader classLoader = ClassAnnotationsTest.class.getClassLoader();
try (Stream<Path> paths = Files.walk(packageDir)) {
return paths.filter(path -> path.toString().endsWith(".class"))
.map(path -> root.relativize(path).toString())
.map(name -> name.substring(0, name.length() - ".class".length())
.replace('/', '.')
.replace('\\', '.'))
.map(name -> loadClass(name, classLoader))
.filter(clazz -> clazz.isAnnotationPresent(OrasModel.class))
.collect(Collectors.toSet());
}
}

// Check number of classes
assertEquals(11, modelClasses.size());
private static Class<?> loadClass(String name, ClassLoader classLoader) {
try {
return Class.forName(name, false, classLoader);
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e);
}
}
}
Loading