Skip to content

Commit 3d6a2bf

Browse files
gab1onectrueden
authored andcommitted
Update tests for changes in ByteCodeAnalyzer
The tests now require java 8.
1 parent 9730651 commit 3d6a2bf

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>9.1.0</version>
8+
<version>9.3.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -114,6 +114,10 @@
114114
<url>http://jenkins.imagej.net/job/SciJava-common/</url>
115115
</ciManagement>
116116

117+
<properties>
118+
<scijava.jvm.test.version>1.8</scijava.jvm.test.version>
119+
</properties>
120+
117121
<dependencies>
118122
<!-- Third-party dependencies -->
119123
<dependency>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.scijava.annotations;
2+
3+
import java.util.ArrayList;
4+
import java.util.List;
5+
6+
@Simple(string1 = "adfd")
7+
public class AnnotatedD {
8+
9+
public AnnotatedD() {
10+
List<String> list = new ArrayList<>();
11+
list.stream().reduce(String::concat).get();
12+
}
13+
}

src/test/java/org/scijava/annotations/DirectoryIndexerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void testRepeatedClassPathElements() throws Exception {
122122
assertFalse(seen.contains(name));
123123
seen.add(name);
124124
}
125-
assertEquals(2, seen.size());
125+
assertEquals(3, seen.size());
126126
}
127127

128128
public static void

src/test/java/org/scijava/annotations/EclipseHelperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void testSkipIndexGeneration() throws Exception {
7171
public void testIndexing() throws Exception {
7272
final File dir = createTemporaryDirectory("eclipse-test-");
7373
copyClasses(dir, Complex.class, Simple.class, Fruit.class,
74-
AnnotatedA.class, AnnotatedB.class, AnnotatedC.class);
74+
AnnotatedA.class, AnnotatedB.class, AnnotatedC.class, AnnotatedD.class);
7575
final File jsonDir = new File(dir, Index.INDEX_PREFIX);
7676
for (final Class<?> clazz : new Class<?>[] { Complex.class, Simple.class })
7777
{
@@ -104,7 +104,7 @@ public Class<?> loadClass(final String className)
104104
// deleted
105105
jsonDir.setLastModified(123456789);
106106
for (final Class<?> clazz : new Class<?>[] { AnnotatedA.class,
107-
AnnotatedB.class, AnnotatedC.class })
107+
AnnotatedB.class, AnnotatedC.class, AnnotatedD.class })
108108
{
109109
assertTrue(new File(dir, DirectoryIndexerTest.getResourcePath(clazz))
110110
.delete());

0 commit comments

Comments
 (0)