Skip to content

Commit 039cf6b

Browse files
committed
add tests
1 parent 5f1cf84 commit 039cf6b

File tree

12 files changed

+90
-12
lines changed

12 files changed

+90
-12
lines changed

core.loaders/maven/src/main/java/net/lecousin/core/loaders/maven/MavenPOM.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,19 +694,20 @@ private Repository readRepository(XMLStreamReader xml) throws MavenPOMException,
694694
} else if (xml.event.text.equals("url")) {
695695
repo.url = xml.readInnerText().trim().asString();
696696
} else if (xml.event.text.equals("releases")) {
697-
readRepositoryType(xml, ctx, repo, true);
697+
readRepositoryType(xml, repo, true);
698698
} else if (xml.event.text.equals("snapshots")) {
699-
readRepositoryType(xml, ctx, repo, false);
699+
readRepositoryType(xml, repo, false);
700700
} else {
701701
xml.closeElement();
702702
}
703703
} while (true);
704704
return repo;
705705
}
706706

707-
private void readRepositoryType(XMLStreamReader xml, ElementContext ctx, Repository repo, boolean isReleases)
707+
private void readRepositoryType(XMLStreamReader xml, Repository repo, boolean isReleases)
708708
throws XMLException, MavenPOMException, IOException {
709709
if (xml.event.isClosed) return;
710+
ElementContext ctx = xml.event.context.getFirst();
710711
do {
711712
if (!xml.nextInnerElement(ctx)) {
712713
if (!Type.END_ELEMENT.equals(xml.event.type))

core.loaders/maven/src/test/java/net/lecousin/core/loaders/maven/tests/TestLocalRepository.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ public void testMyPOM() throws Exception {
187187
AsyncSupplier<? extends LibraryDescriptor, LibraryManagementException> load2 = pomLoader.loadProject(new File("."), Task.PRIORITY_NORMAL);
188188
LibraryDescriptor lib = load2.blockResult(30000);
189189
Assert.assertEquals(lib.getArtifactId(), "maven");
190+
lib.getDependencies();
190191
}
191192

192193
@Test
@@ -208,6 +209,7 @@ public void testPOMWithOutputDirectory() throws Exception {
208209
File classes = pom.getClasses().blockResult(30000);
209210
Assert.assertNotNull(classes);
210211
Assert.assertEquals(new File("./target/test-out").getAbsolutePath(), classes.getAbsolutePath());
212+
pom.getDependencies();
211213
} finally {
212214
outFile.delete();
213215
}
@@ -284,6 +286,7 @@ private void testError(String errorName) throws IOException, CancelException, UR
284286
public void testErrors() throws Exception {
285287
testError("invalid-root");
286288
testError("invalid-xml");
289+
testError("invalid-xml2");
287290
testError("empty");
288291
}
289292

core.loaders/maven/src/test/resources/test-maven/error/test-invalid-xml.pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
<packaging>bundle</packaging>
99

1010
<build>
11-
<outputDirectory>target/test-out</outputDirectory>
12-
</project>
11+
<outputDirectory>target/test-out</outputDirectory>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>test</groupId>
6+
<artifactId>maven</artifactId>
7+
<version>1</version>
8+
<packaging>bundle</packaging>
9+
10+
<error / error>
11+
12+
<build>
13+
<outputDirectory>target/test-out</outputDirectory>
14+
</build>
15+
</project>

core.loaders/maven/src/test/resources/test-maven/test-additional-fields.pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,21 @@
4646
<unknown/>
4747
</property>
4848
<file>
49+
<missing>hello</missing>
4950
<unknown/>
5051
</file>
52+
<activeByDefault>false</activeByDefault>
5153
</activation>
54+
<repositories>
55+
<unknown/>
56+
<repository>
57+
<unknown/>
58+
<snapshots>
59+
<enabled>false</enabled>
60+
<unknown/>
61+
</snapshots>
62+
</repository>
63+
</repositories>
5264
</profile>
5365
</profiles>
5466

core.loaders/maven/src/test/resources/test-maven/test-output-dir.pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,23 @@
66
<artifactId>maven</artifactId>
77
<version>1</version>
88
<packaging>bundle</packaging>
9+
10+
<parent/>
11+
12+
<dependencies>
13+
<dependency>
14+
<groupId>junit</groupId>
15+
<artifactId>junit</artifactId>
16+
<version>4.12</version>
17+
<scope>compile</scope>
18+
<exclusions>
19+
<exclusion>
20+
<groupId>*</groupId>
21+
<artifactId>*</artifactId>
22+
</exclusion>
23+
</exclusions>
24+
</dependency>
25+
</dependencies>
926

1027
<build>
1128
<outputDirectory>target/test-out</outputDirectory>

net.lecousin.core/src/main/java/net/lecousin/framework/util/UnprotectedStringBuffer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,8 +969,9 @@ public int readSync(char[] buf, int offset, int length) {
969969
return 1;
970970
if (strings == null) return 1;
971971
done = 1;
972-
} else if (strings == null)
972+
} else if (strings == null) {
973973
return -1;
974+
}
974975
do {
975976
while (buffer <= lastUsed && bufferIndex == strings[buffer].length()) {
976977
buffer++;

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/event/TestAsyncEvent.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,12 @@ public void test() {
3232
Assert.assertFalse(sp.isDone());
3333
}
3434

35+
@Test
36+
public void testListenerError() {
37+
AsyncEvent e = new AsyncEvent();
38+
Runnable listener = () -> { throw new RuntimeException("a test"); };
39+
e.addListener(listener);
40+
e.fire();
41+
}
42+
3543
}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/event/TestEvent.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,14 @@ public void test() {
118118
Assert.assertEquals(30, val2.get());
119119
}
120120

121+
@Test
122+
public void testListenerError() {
123+
Event<Integer> e = new Event<>();
124+
Runnable listener1 = () -> { throw new RuntimeException("a test"); };
125+
Consumer<Integer> listener2 = ev -> { throw new RuntimeException("a test"); };
126+
e.addListener(listener1);
127+
e.addListener(listener2);
128+
e.fire(Integer.valueOf(10));
129+
}
130+
121131
}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/math/TestFragmentedRangeBigInteger.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import java.util.Arrays;
55
import java.util.List;
66

7-
import org.junit.Assert;
8-
import org.junit.Test;
9-
107
import net.lecousin.framework.core.test.LCCoreAbstractTest;
118
import net.lecousin.framework.math.FragmentedRangeBigInteger;
129
import net.lecousin.framework.math.RangeBigInteger;
1310

11+
import org.junit.Assert;
12+
import org.junit.Test;
13+
1414
public class TestFragmentedRangeBigInteger extends LCCoreAbstractTest {
1515

1616
@Test
@@ -93,6 +93,10 @@ public void test() throws Exception {
9393
Assert.assertFalse(f.containsRange(BigInteger.valueOf(300), BigInteger.valueOf(400)));
9494
Assert.assertTrue(f.containsRange(BigInteger.valueOf(500), BigInteger.valueOf(120)));
9595

96+
Assert.assertTrue(f.containsOneValueIn(Arrays.asList(new RangeBigInteger(BigInteger.valueOf(101), BigInteger.valueOf(150)), new RangeBigInteger(BigInteger.valueOf(50), BigInteger.valueOf(70)))));
97+
Assert.assertTrue(f.containsOneValueIn(Arrays.asList(new RangeBigInteger(BigInteger.valueOf(50), BigInteger.valueOf(70)), new RangeBigInteger(BigInteger.valueOf(101), BigInteger.valueOf(150)))));
98+
Assert.assertFalse(f.containsOneValueIn(Arrays.asList(new RangeBigInteger(BigInteger.valueOf(50), BigInteger.valueOf(70)), new RangeBigInteger(BigInteger.valueOf(300), BigInteger.valueOf(400)))));
99+
96100
// 9-31, 100-155, 175-180, 190-250
97101
f.addRange(BigInteger.valueOf(151), BigInteger.valueOf(155));
98102
Assert.assertEquals(4, f.size());

0 commit comments

Comments
 (0)