Skip to content

Commit 9f4bbdc

Browse files
authored
Merge pull request gousiosg#5 from bitslab/ameka
Modified JCallGraph, Argument classes, and RepoTool to reflect the following changes:
2 parents 886f2c0 + 47803cd commit 9f4bbdc

File tree

9 files changed

+410
-345
lines changed

9 files changed

+410
-345
lines changed

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

Lines changed: 0 additions & 62 deletions
This file was deleted.

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,48 @@ index 65f0f80..508b290 100644
6060
<dependencies>
6161

6262
<dependency>
63+
diff --git a/src/test/java/com/indeed/mph/generators/IntListGenerator.java b/src/test/java/com/indeed/mph/generators/IntListGenerator.java
64+
new file mode 100644
65+
index 0000000..33b6870
66+
--- /dev/null
67+
+++ b/src/test/java/com/indeed/mph/generators/IntListGenerator.java
68+
@@ -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+
+}
63105
diff --git a/src/test/java/com/indeed/mph/serializers/TestSmartListSerializer.java b/src/test/java/com/indeed/mph/serializers/TestSmartListSerializer.java
64106
index 8312fe2..e898509 100644
65107
--- a/src/test/java/com/indeed/mph/serializers/TestSmartListSerializer.java
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
name: mph-table
22
URL: https://github.com/indeedeng/mph-table.git
33
checkoutID: dbd5413df33bf8f0a995822eeefe94df50f3c5a7
4-
patchName: artifacts/configs/mph-table/mph-changes.patch
4+
patchName: artifacts/configs/mph-table/mph-table.patch
5+
properties:
6+
- name: TestSmartListSerializer#canRoundTripSerializableLists
7+
entryPoint: "com.indeed.mph.serializers.TestSmartListSerializer.canRoundTripSerializableLists(Ljava/util/List;Ljava/util/List;Ljava/util/List;)V"
8+
- name: TestSmartListSerializer#canRoundTripSerializableListsWithGenerator
9+
entryPoint: "com.indeed.mph.serializers.TestSmartListSerializer.canRoundTripSerializableListsWithGenerator(Ljava/util/List;Ljava/util/List;Ljava/util/List;)V"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="jacoco-resources/report.gif" type="image/gif"/><title>indeed-mph-table</title><script type="text/javascript" src="jacoco-resources/sort.js"></script></head><body onload="initialSort(['breadcrumb', 'coveragetable'])"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="jacoco-sessions.html" class="el_session">Sessions</a></span><span class="el_report">indeed-mph-table</span></div><h1>indeed-mph-table</h1><table class="coverage" cellspacing="0" id="coveragetable"><thead><tr><td class="sortable" id="a" onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" onclick="toggleSort(this)">Methods</td><td class="sortable ctr1" id="l" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="m" onclick="toggleSort(this)">Classes</td></tr></thead><tfoot><tr><td>Total</td><td class="bar">9,534 of 9,772</td><td class="ctr2">2%</td><td class="bar">879 of 890</td><td class="ctr2">1%</td><td class="ctr1">893</td><td class="ctr2">922</td><td class="ctr1">1,776</td><td class="ctr2">1,841</td><td class="ctr1">426</td><td class="ctr2">453</td><td class="ctr1">51</td><td class="ctr2">59</td></tr></tfoot><tbody><tr><td id="a0"><a href="com.indeed.mph/index.html" class="el_package">com.indeed.mph</a></td><td class="bar" id="b0"><img src="jacoco-resources/redbar.gif" width="119" height="10" title="6,861" alt="6,861"/></td><td class="ctr2" id="c1">0%</td><td class="bar" id="d0"><img src="jacoco-resources/redbar.gif" width="120" height="10" title="578" alt="578"/></td><td class="ctr2" id="e1">0%</td><td class="ctr1" id="f0">592</td><td class="ctr2" id="g0">595</td><td class="ctr1" id="h0">1,238</td><td class="ctr2" id="i0">1,244</td><td class="ctr1" id="j0">286</td><td class="ctr2" id="k0">289</td><td class="ctr1" id="l0">32</td><td class="ctr2" id="m0">33</td></tr><tr><td id="a1"><a href="com.indeed.mph.serializers/index.html" class="el_package">com.indeed.mph.serializers</a></td><td class="bar" id="b1"><img src="jacoco-resources/redbar.gif" width="46" height="10" title="2,673" alt="2,673"/><img src="jacoco-resources/greenbar.gif" width="3" height="10" title="217" alt="217"/></td><td class="ctr2" id="c0">7%</td><td class="bar" id="d1"><img src="jacoco-resources/redbar.gif" width="62" height="10" title="301" alt="301"/><img src="jacoco-resources/greenbar.gif" width="2" height="10" title="11" alt="11"/></td><td class="ctr2" id="e0">3%</td><td class="ctr1" id="f1">301</td><td class="ctr2" id="g1">327</td><td class="ctr1" id="h1">538</td><td class="ctr2" id="i1">597</td><td class="ctr1" id="j1">140</td><td class="ctr2" id="k1">164</td><td class="ctr1" id="l1">19</td><td class="ctr2" id="m1">26</td></tr></tbody></table><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.8.6.202009150832</span></div></body></html><html><section><h1> Total Time Elapsed: 17.879733831 seconds</h1></section></html>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="jacoco-resources/report.gif" type="image/gif"/><title>indeed-mph-table</title><script type="text/javascript" src="jacoco-resources/sort.js"></script></head><body onload="initialSort(['breadcrumb', 'coveragetable'])"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="jacoco-sessions.html" class="el_session">Sessions</a></span><span class="el_report">indeed-mph-table</span></div><h1>indeed-mph-table</h1><table class="coverage" cellspacing="0" id="coveragetable"><thead><tr><td class="sortable" id="a" onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" onclick="toggleSort(this)">Methods</td><td class="sortable ctr1" id="l" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="m" onclick="toggleSort(this)">Classes</td></tr></thead><tfoot><tr><td>Total</td><td class="bar">9,405 of 9,772</td><td class="ctr2">3%</td><td class="bar">862 of 890</td><td class="ctr2">3%</td><td class="ctr1">885</td><td class="ctr2">922</td><td class="ctr1">1,752</td><td class="ctr2">1,841</td><td class="ctr1">426</td><td class="ctr2">453</td><td class="ctr1">51</td><td class="ctr2">59</td></tr></tfoot><tbody><tr><td id="a0"><a href="com.indeed.mph/index.html" class="el_package">com.indeed.mph</a></td><td class="bar" id="b0"><img src="jacoco-resources/redbar.gif" width="119" height="10" title="6,861" alt="6,861"/></td><td class="ctr2" id="c1">0%</td><td class="bar" id="d0"><img src="jacoco-resources/redbar.gif" width="120" height="10" title="578" alt="578"/></td><td class="ctr2" id="e1">0%</td><td class="ctr1" id="f0">592</td><td class="ctr2" id="g0">595</td><td class="ctr1" id="h0">1,238</td><td class="ctr2" id="i0">1,244</td><td class="ctr1" id="j0">286</td><td class="ctr2" id="k0">289</td><td class="ctr1" id="l0">32</td><td class="ctr2" id="m0">33</td></tr><tr><td id="a1"><a href="com.indeed.mph.serializers/index.html" class="el_package">com.indeed.mph.serializers</a></td><td class="bar" id="b1"><img src="jacoco-resources/redbar.gif" width="44" height="10" title="2,544" alt="2,544"/><img src="jacoco-resources/greenbar.gif" width="6" height="10" title="346" alt="346"/></td><td class="ctr2" id="c0">11%</td><td class="bar" id="d1"><img src="jacoco-resources/redbar.gif" width="58" height="10" title="284" alt="284"/><img src="jacoco-resources/greenbar.gif" width="5" height="10" title="28" alt="28"/></td><td class="ctr2" id="e0">8%</td><td class="ctr1" id="f1">293</td><td class="ctr2" id="g1">327</td><td class="ctr1" id="h1">514</td><td class="ctr2" id="i1">597</td><td class="ctr1" id="j1">140</td><td class="ctr2" id="k1">164</td><td class="ctr1" id="l1">19</td><td class="ctr2" id="m1">26</td></tr></tbody></table><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.8.6.202009150832</span></div></body></html><html><section><h1> Total Time Elapsed: 46.7510832 seconds</h1></section></html>

0 commit comments

Comments
 (0)