Skip to content

Commit 008c322

Browse files
committed
Add yaml and patch files
1 parent 59ee2e2 commit 008c322

File tree

6 files changed

+345
-37
lines changed

6 files changed

+345
-37
lines changed
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
diff --git a/convex-core/pom.xml b/convex-core/pom.xml
2+
index 471f81bf..3f83db91 100644
3+
--- a/convex-core/pom.xml
4+
+++ b/convex-core/pom.xml
5+
@@ -32,6 +32,59 @@
6+
</execution>
7+
</executions>
8+
</plugin>
9+
+ <plugin>
10+
+ <groupId>org.jacoco</groupId>
11+
+ <artifactId>jacoco-maven-plugin</artifactId>
12+
+ <version>0.8.6</version>
13+
+ <executions>
14+
+ <execution>
15+
+ <id>default-prepare-agent</id>
16+
+ <goals>
17+
+ <goal>prepare-agent</goal>
18+
+ </goals>
19+
+ </execution>
20+
+ <execution>
21+
+ <id>jacoco-report</id>
22+
+ <phase>test</phase>
23+
+ <goals>
24+
+ <goal>report</goal>
25+
+ </goals>
26+
+ </execution>
27+
+ </executions>
28+
+ </plugin>
29+
+ <plugin>
30+
+ <groupId>org.apache.maven.plugins</groupId>
31+
+ <artifactId>maven-assembly-plugin</artifactId>
32+
+ <version>3.3.0</version>
33+
+
34+
+ <configuration>
35+
+ <descriptorRefs>
36+
+ <descriptorRef>jar-with-dependencies</descriptorRef>
37+
+ </descriptorRefs>
38+
+ </configuration>
39+
+
40+
+ <executions>
41+
+ <execution>
42+
+ <id>make-assembly</id>
43+
+ <phase>package</phase>
44+
+ <goals>
45+
+ <goal>single</goal>
46+
+ </goals>
47+
+ </execution>
48+
+ </executions>
49+
+ </plugin>
50+
+ <plugin>
51+
+ <groupId>org.apache.maven.plugins</groupId>
52+
+ <artifactId>maven-jar-plugin</artifactId>
53+
+ <version>3.2.0</version>
54+
+ <executions>
55+
+ <execution>
56+
+ <goals>
57+
+ <goal>test-jar</goal>
58+
+ </goals>
59+
+ </execution>
60+
+ </executions>
61+
+ </plugin>
62+
</plugins>
63+
<resources>
64+
<resource>
65+
@@ -44,6 +97,22 @@
66+
</resources>
67+
</build>
68+
69+
+ <reporting>
70+
+ <plugins>
71+
+ <plugin>
72+
+ <groupId>org.jacoco</groupId>
73+
+ <artifactId>jacoco-maven-plugin</artifactId>
74+
+ <reportSets>
75+
+ <reportSet>
76+
+ <reports>
77+
+ <report>report</report>
78+
+ </reports>
79+
+ </reportSet>
80+
+ </reportSets>
81+
+ </plugin>
82+
+ </plugins>
83+
+ </reporting>
84+
+
85+
<dependencies>
86+
<dependency>
87+
<groupId>org.bouncycastle</groupId>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: convex
2+
URL: https://github.com/Convex-Dev/convex.git
3+
checkoutID: e6db05a611cd4a1fb51f959e20d246637bb7744a
4+
patchName: artifacts/configs/convex/convex.patch
5+
subProject: convex-core
6+
#mvnOptions: -DfailIfNoTests=false -Dmaven.surefire.debug="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
7+
mvnOptions: -DfailIfNoTests=false
8+
properties:
9+
# - name: GenTestFormat#messageRoundTrip
10+
# entryPoint: "convex.comms.GenTestFormat.messageRoundTrip(Ljava/lang/String;)V"
11+
- name: GenTestFormat#primitiveRoundTrip
12+
entryPoint: "convex.comms.GenTestFormat.primitiveRoundTrip(Lconvex/core/data/ACell;)V"
13+
# - name: GenTestFormat#dataRoundTrip
14+
# entryPoint: "convex.comms.GenTestFormat.dataRoundTrip(Lconvex/core/data/ACell;)V"
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
diff --git a/jflex/pom.xml b/jflex/pom.xml
2+
index 47904b61..185a3790 100644
3+
--- a/jflex/pom.xml
4+
+++ b/jflex/pom.xml
5+
@@ -51,6 +51,21 @@
6+
<timezone>+1</timezone>
7+
</developer>
8+
</developers>
9+
+ <reporting>
10+
+ <plugins>
11+
+ <plugin>
12+
+ <groupId>org.jacoco</groupId>
13+
+ <artifactId>jacoco-maven-plugin</artifactId>
14+
+ <reportSets>
15+
+ <reportSet>
16+
+ <reports>
17+
+ <report>report</report>
18+
+ </reports>
19+
+ </reportSet>
20+
+ </reportSets>
21+
+ </plugin>
22+
+ </plugins>
23+
+ </reporting>
24+
<dependencies>
25+
<dependency>
26+
<groupId>com.github.vbmacher</groupId>
27+
@@ -156,6 +171,34 @@
28+
</manifest>
29+
</archive>
30+
</configuration>
31+
+ <executions>
32+
+ <execution>
33+
+ <goals>
34+
+ <goal>test-jar</goal>
35+
+ </goals>
36+
+ </execution>
37+
+ </executions>
38+
+ </plugin>
39+
+ <plugin>
40+
+ <groupId>org.apache.maven.plugins</groupId>
41+
+ <artifactId>maven-assembly-plugin</artifactId>
42+
+ <version>3.3.0</version>
43+
+
44+
+ <configuration>
45+
+ <descriptorRefs>
46+
+ <descriptorRef>jar-with-dependencies</descriptorRef>
47+
+ </descriptorRefs>
48+
+ </configuration>
49+
+
50+
+ <executions>
51+
+ <execution>
52+
+ <id>make-assembly</id>
53+
+ <phase>package</phase>
54+
+ <goals>
55+
+ <goal>single</goal>
56+
+ </goals>
57+
+ </execution>
58+
+ </executions>
59+
</plugin>
60+
<plugin>
61+
<groupId>org.apache.maven.plugins</groupId>
62+
@@ -231,6 +274,13 @@
63+
</excludes>
64+
</configuration>
65+
</execution>
66+
+ <execution>
67+
+ <id>jacoco-report</id>
68+
+ <phase>test</phase>
69+
+ <goals>
70+
+ <goal>report</goal>
71+
+ </goals>
72+
+ </execution>
73+
</executions>
74+
</plugin>
75+
</plugins>
76+
77+
diff --git a/jflex/src/test/java/jflex/state/StateSetQuickcheck.java b/jflex/src/test/java/jflex/state/StateSetQuickcheck.java
78+
index c3ac7e67..35c34f32 100644
79+
--- a/jflex/src/test/java/jflex/state/StateSetQuickcheck.java
80+
+++ b/jflex/src/test/java/jflex/state/StateSetQuickcheck.java
81+
@@ -165,6 +165,13 @@ public class StateSetQuickcheck {
82+
assertThat(s).isNotEqualTo(sPre);
83+
s.addState(e);
84+
assertThat(s).isEqualTo(sPre);
85+
+
86+
+ // remove with add larger to force resize
87+
+ s.remove(e);
88+
+ assertThat(sPre.contains(s)).isTrue();
89+
+ assertThat(s).isNotEqualTo(sPre);
90+
+ s.addState(e + 384);
91+
+ assertThat(s).contains(e + 384);
92+
}
93+
94+
@Property
95+

artifacts/configs/jflex/jflex.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: jflex
2+
URL: https://github.com/jflex-de/jflex.git
3+
checkoutID: e6d1752bd48a7ccb2a2b78479dc5a73ac475bbb9
4+
patchName: artifacts/configs/jflex/jflex.patch
5+
subProject: jflex
6+
#mvnOptions: -DfailIfNoTests=false -Dmaven.surefire.debug="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
7+
mvnOptions: -DfailIfNoTests=false
8+
properties:
9+
# - name: StateSetQuickcheck#size2nbits
10+
# entryPoint: "jflex.state.StateSetQuickcheck.size2nbits(I)V"
11+
# - name: StateSetQuickcheck#containsIsSubset
12+
# entryPoint: "jflex.state.StateSetQuickcheck.containsIsSubset(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
13+
# - name: StateSetQuickcheck#addIsUnion
14+
# entryPoint: "jflex.state.StateSetQuickcheck.addIsUnion(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
15+
# - name: StateSetQuickcheck#addCommutes
16+
# entryPoint: "jflex.state.StateSetQuickcheck.addCommutes(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
17+
# - name: StateSetQuickcheck#addEmpty
18+
# entryPoint: "jflex.state.StateSetQuickcheck.addEmpty(Ljflex/state/StateSet;)V"
19+
# - name: StateSetQuickcheck#addSelf
20+
# entryPoint: "jflex.state.StateSetQuickcheck.addSelf(Ljflex/state/StateSet;)V"
21+
# - name: StateSetQuickcheck#addIdemPotent
22+
# entryPoint: "jflex.state.StateSetQuickcheck.addIdemPotent(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
23+
# - name: StateSetQuickcheck#intersect
24+
# entryPoint: "jflex.state.StateSetQuickcheck.intersect(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
25+
# - name: StateSetQuickcheck#intersectUnchanged
26+
# entryPoint: "jflex.state.StateSetQuickcheck.intersectUnchanged(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
27+
# - name: StateSetQuickcheck#intersectCommutes
28+
# entryPoint: "jflex.state.StateSetQuickcheck.intersectCommutes(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
29+
# - name: StateSetQuickcheck#intersectEmpty
30+
# entryPoint: "jflex.state.StateSetQuickcheck.intersectEmpty(Ljflex/state/StateSet;)V"
31+
# - name: StateSetQuickcheck#intersectSelf
32+
# entryPoint: "jflex.state.StateSetQuickcheck.intersectSelf(Ljflex/state/StateSet;)V"
33+
# - name: StateSetQuickcheck#containsItsElements
34+
# entryPoint: "jflex.state.StateSetQuickcheck.containsItsElements(Ljflex/state/StateSet;)V"
35+
# - name: StateSetQuickcheck#removeRemoves
36+
# entryPoint: "jflex.state.StateSetQuickcheck.removeRemoves(Ljflex/state/StateSet;I)V"
37+
- name: StateSetQuickcheck#removeAdd
38+
entryPoint: "jflex.state.StateSetQuickcheck.removeAdd(Ljflex/state/StateSet;I)V"
39+
# - name: StateSetQuickcheck#clearMakesEmpty
40+
# entryPoint: "jflex.state.StateSetQuickcheck.clearMakesEmpty(Ljflex/state/StateSet;)V"
41+
# - name: StateSetQuickcheck#addStateAdds
42+
# entryPoint: "jflex.state.StateSetQuickcheck.addStateAdds(Ljflex/state/StateSet;I)V"
43+
# - name: StateSetQuickcheck#addStateDoesNotRemove
44+
# entryPoint: "jflex.state.StateSetQuickcheck.addStateDoesNotRemove(Ljflex/state/StateSet;I)V"
45+
# - name: StateSetQuickcheck#addStateAdd
46+
# entryPoint: "jflex.state.StateSetQuickcheck.addStateAdd(Ljflex/state/StateSet;I)V"
47+
# - name: StateSetQuickcheck#complementNoOriginalElements
48+
# entryPoint: "jflex.state.StateSetQuickcheck.complementNoOriginalElements(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
49+
# - name: StateSetQuickcheck#complementElements
50+
# entryPoint: "jflex.state.StateSetQuickcheck.complementElements(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
51+
# - name: StateSetQuickcheck#complementUnion
52+
# entryPoint: "jflex.state.StateSetQuickcheck.complementUnion(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
53+
# - name: StateSetQuickcheck#containsElements
54+
# entryPoint: "jflex.state.StateSetQuickcheck.containsElements(Ljflex/state/StateSet;I)V"
55+
# - name: StateSetQuickcheck#containsNoElements
56+
# entryPoint: "jflex.state.StateSetQuickcheck.containsNoElements(Ljflex/state/StateSet;)V"
57+
# - name: StateSetQuickcheck#copy
58+
# entryPoint: "jflex.state.StateSetQuickcheck.copy(Ljflex/state/StateSet;)V"
59+
# - name: StateSetQuickcheck#copyInto
60+
# entryPoint: "jflex.state.StateSetQuickcheck.copyInto(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
61+
# - name: StateSetQuickcheck#hashCode
62+
# entryPoint: "jflex.state.StateSetQuickcheck.hashCode(Ljflex/state/StateSet;Ljflex/state/StateSet;)V"
63+
# - name: StateSetQuickcheck#getAndRemoveRemoves
64+
# entryPoint: "jflex.state.StateSetQuickcheck.getAndRemoveRemoves(Ljflex/state/StateSet;)V"
65+
# - name: StateSetQuickcheck#getAndRemoveIsElement
66+
# entryPoint: "jflex.state.StateSetQuickcheck.getAndRemoveIsElement(Ljflex/state/StateSet;)V"
67+
# - name: StateSetQuickcheck#getAndRemoveAdd
68+
# entryPoint: "jflex.state.StateSetQuickcheck.getAndRemoveAdd(Ljflex/state/StateSet;)V"
69+
# - name: StateSetQuickcheck#enumerator
70+
# entryPoint: "jflex.state.StateSetQuickcheck.enumerator(Ljflex/state/StateSet;)V"

artifacts/configs/mph-table/mph-table.patch

Lines changed: 57 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,27 @@ index 65f0f80..508b290 100644
2828
+ </plugin>
2929
+ <plugin>
3030
+ <groupId>org.apache.maven.plugins</groupId>
31+
+ <artifactId>maven-assembly-plugin</artifactId>
32+
+ <version>3.3.0</version>
33+
+
34+
+ <configuration>
35+
+ <descriptorRefs>
36+
+ <descriptorRef>jar-with-dependencies</descriptorRef>
37+
+ </descriptorRefs>
38+
+ </configuration>
39+
+
40+
+ <executions>
41+
+ <execution>
42+
+ <id>make-assembly</id>
43+
+ <phase>package</phase>
44+
+ <goals>
45+
+ <goal>single</goal>
46+
+ </goals>
47+
+ </execution>
48+
+ </executions>
49+
+ </plugin>
50+
+ <plugin>
51+
+ <groupId>org.apache.maven.plugins</groupId>
3152
+ <artifactId>maven-jar-plugin</artifactId>
3253
+ <version>3.2.0</version>
3354
+ <executions>
@@ -66,42 +87,42 @@ index 0000000..33b6870
6687
--- /dev/null
6788
+++ b/src/test/java/com/indeed/mph/generators/IntListGenerator.java
6889
@@ -0,0 +1,36 @@
69-
+package com.indeed.mph.generators;
70-
+import com.pholser.junit.quickcheck.generator.ComponentizedGenerator;
71-
+import com.pholser.junit.quickcheck.generator.GenerationStatus;
72-
+import com.pholser.junit.quickcheck.random.SourceOfRandomness;
73-
+import java.util.ArrayList;
74-
+import java.util.List;
75-
+import java.util.stream.Collectors;
76-
+import java.util.stream.IntStream;
77-
+
78-
+public class IntListGenerator extends ComponentizedGenerator<List> {
79-
+ public IntListGenerator() {
80-
+ super(List.class);
81-
+ }
82-
+ boolean generatedEmptyList = false;
83-
+ @Override
84-
+ public List generate(SourceOfRandomness sourceOfRandomness, GenerationStatus generationStatus) {
85-
+ if (!generatedEmptyList) {
86-
+ generatedEmptyList = true;
87-
+ return new ArrayList();
88-
+ }
89-
+ int rng = sourceOfRandomness.nextInt(0, 20);
90-
+ int listSize = 0;
91-
+ if (rng >= 0 && rng <= 16) {
92-
+ listSize = sourceOfRandomness.nextInt(0, 100);
93-
+ } else if (rng >= 17 && rng <= 18) {
94-
+ listSize = sourceOfRandomness.nextInt(1000, 10000);
95-
+ } else if (rng >= 19 && rng <= 20) {
96-
+ listSize = sourceOfRandomness.nextInt(100000, 10000000);
97-
+ }
98-
+ return IntStream.range(0, listSize).mapToObj(i -> sourceOfRandomness.nextInt(Integer.MIN_VALUE, Integer.MAX_VALUE)).collect(Collectors.toList());
99-
+ }
100-
+ @Override
101-
+ public int numberOfNeededComponents() {
102-
+ return 1;
103-
+ }
104-
+}
90+
+package com.indeed.mph.generators;
91+
+import com.pholser.junit.quickcheck.generator.ComponentizedGenerator;
92+
+import com.pholser.junit.quickcheck.generator.GenerationStatus;
93+
+import com.pholser.junit.quickcheck.random.SourceOfRandomness;
94+
+import java.util.ArrayList;
95+
+import java.util.List;
96+
+import java.util.stream.Collectors;
97+
+import java.util.stream.IntStream;
98+
+
99+
+public class IntListGenerator extends ComponentizedGenerator<List> {
100+
+ public IntListGenerator() {
101+
+ super(List.class);
102+
+ }
103+
+ boolean generatedEmptyList = false;
104+
+ @Override
105+
+ public List generate(SourceOfRandomness sourceOfRandomness, GenerationStatus generationStatus) {
106+
+ if (!generatedEmptyList) {
107+
+ generatedEmptyList = true;
108+
+ return new ArrayList();
109+
+ }
110+
+ int rng = sourceOfRandomness.nextInt(0, 20);
111+
+ int listSize = 0;
112+
+ if (rng >= 0 && rng <= 16) {
113+
+ listSize = sourceOfRandomness.nextInt(0, 100);
114+
+ } else if (rng >= 17 && rng <= 18) {
115+
+ listSize = sourceOfRandomness.nextInt(1000, 10000);
116+
+ } else if (rng >= 19 && rng <= 20) {
117+
+ listSize = sourceOfRandomness.nextInt(100000, 10000000);
118+
+ }
119+
+ return IntStream.range(0, listSize).mapToObj(i -> sourceOfRandomness.nextInt(Integer.MIN_VALUE, Integer.MAX_VALUE)).collect(Collectors.toList());
120+
+ }
121+
+ @Override
122+
+ public int numberOfNeededComponents() {
123+
+ return 1;
124+
+ }
125+
+}
105126
diff --git a/src/test/java/com/indeed/mph/serializers/TestSmartListSerializer.java b/src/test/java/com/indeed/mph/serializers/TestSmartListSerializer.java
106127
index 8312fe2..e898509 100644
107128
--- a/src/test/java/com/indeed/mph/serializers/TestSmartListSerializer.java

0 commit comments

Comments
 (0)