Skip to content

Commit 61457c4

Browse files
committed
Legger inn håndtering av modul annotasjoner.
1 parent a60da0b commit 61457c4

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

‎byte-buddy-dep/src/test/java/net/bytebuddy/description/module/AbstractModuleDescriptionTest.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,14 @@ public abstract class AbstractModuleDescriptionTest {
2828

2929
protected static final String FOO = "foo", BAR = "bar", QUX = "qux", BAZ = "baz";
3030

31+
private final boolean readAnnotations;
32+
3133
protected File jar;
3234

35+
protected AbstractModuleDescriptionTest(boolean readAnnotations) {
36+
this.readAnnotations = readAnnotations;
37+
}
38+
3339
@Before
3440
public void setUp() throws Exception {
3541
jar = File.createTempFile("sample", ".jar");
@@ -107,6 +113,8 @@ public void testModuleDescription() throws Exception {
107113
assertThat(moduleDescription.getRequires(), is(toModuleDescription().getRequires()));
108114
assertThat(moduleDescription, is(toModuleDescription()));
109115
assertThat(moduleDescription.toString(), is("module " + moduleDescription.getActualName()));
110-
assertThat(moduleDescription.getDeclaredAnnotations().size(), is(0));
116+
if (readAnnotations) {
117+
assertThat(moduleDescription.getDeclaredAnnotations().size(), is(0));
118+
}
111119
}
112120
}

‎byte-buddy-dep/src/test/java/net/bytebuddy/description/module/ModuleDescriptionForLoadedModuleTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.bytebuddy.description.module;
22

3+
import net.bytebuddy.ClassFileVersion;
34
import net.bytebuddy.test.utility.JavaVersionRule;
45
import org.junit.After;
56
import org.junit.Before;
@@ -24,6 +25,10 @@ public class ModuleDescriptionForLoadedModuleTest extends AbstractModuleDescript
2425
private ClassLoader classLoader;
2526
private Object module;
2627

28+
public ModuleDescriptionForLoadedModuleTest() {
29+
super(ClassFileVersion.ofThisVm().isAtLeast(ClassFileVersion.JAVA_V15)); // bug on previous VMs.
30+
}
31+
2732
@Before
2833
public void setUp() throws Exception {
2934
super.setUp();

‎byte-buddy-dep/src/test/java/net/bytebuddy/pool/TypePoolModuleDescriptionTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ public class TypePoolModuleDescriptionTest extends AbstractModuleDescriptionTest
1111
private ClassFileLocator classFileLocator;
1212
private TypePool typePool;
1313

14+
public TypePoolModuleDescriptionTest() {
15+
super(true);
16+
}
17+
1418
@Before
1519
public void setUp() throws Exception {
1620
super.setUp();

0 commit comments

Comments
 (0)