Skip to content

Commit 6c59ddd

Browse files
authored
Merge pull request #41 from VariantSync/benjamin/assertions
Always check assertions
2 parents d2f7689 + 21432c8 commit 6c59ddd

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/java/org/variantsync/diffdetective/diff/difftree/DiffNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,12 @@ public void drop() {
363363
}
364364

365365
private void dropBeforeChild(final DiffNode child) {
366-
assert child.beforeParent == this;
366+
Assert.assertTrue(child.beforeParent == this);
367367
child.beforeParent = null;
368368
}
369369

370370
private void dropAfterChild(final DiffNode child) {
371-
assert child.afterParent == this;
371+
Assert.assertTrue(child.afterParent == this);
372372
child.afterParent = null;
373373
}
374374

src/main/java/org/variantsync/diffdetective/diff/difftree/transform/CollapseNestedNonEditedMacros.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.variantsync.diffdetective.diff.difftree.DiffTree;
88
import org.variantsync.diffdetective.diff.difftree.DiffType;
99
import org.variantsync.diffdetective.diff.difftree.traverse.DiffTreeTraversal;
10+
import org.variantsync.diffdetective.util.Assert;
1011

1112
import java.util.ArrayList;
1213
import java.util.List;
@@ -45,7 +46,7 @@ public void transform(final DiffTree diffTree) {
4546

4647
// All found chains should at least have size 2.
4748
for (final Stack<DiffNode> chain : chains) {
48-
assert chain.size() >= 2;
49+
Assert.assertTrue(chain.size() >= 2);
4950
}
5051

5152
// System.out.println(StringUtils.prettyPrintNestedCollections(chains));
@@ -97,7 +98,7 @@ private static void collapseChain(Stack<DiffNode> chain) {
9798
final ArrayList<Node> featureMappings = new ArrayList<>(chain.size());
9899

99100
DiffNode lastPopped = null;
100-
assert !chain.isEmpty();
101+
Assert.assertTrue(!chain.isEmpty());
101102
while (!chain.isEmpty()) {
102103
lastPopped = chain.pop();
103104

@@ -118,7 +119,7 @@ private static void collapseChain(Stack<DiffNode> chain) {
118119
}
119120
}
120121

121-
assert head == lastPopped;
122+
Assert.assertTrue(head == lastPopped);
122123

123124
final DiffNode beforeParent = head.getBeforeParent();
124125
final DiffNode afterParent = head.getAfterParent();

src/main/java/org/variantsync/diffdetective/internal/SimpleRenderer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.variantsync.diffdetective.mining.DiffTreeMiner;
1515
import org.variantsync.diffdetective.mining.RWCompositePatternNodeFormat;
1616
import org.variantsync.diffdetective.mining.RWCompositePatternTreeFormat;
17+
import org.variantsync.diffdetective.util.Assert;
1718
import org.variantsync.diffdetective.util.FileUtils;
1819

1920
import java.io.IOException;
@@ -156,7 +157,7 @@ public static void main(String[] args) throws IOException {
156157

157158
final List<DiffTreeTransformer> transform = DiffTreeMiner.Postprocessing(repository);
158159
final PatchDiff patch = DiffTreeParser.parsePatch(repository, file, commit);
159-
assert patch != null;
160+
Assert.assertNotNull(patch != null);
160161
DiffTreeTransformer.apply(transform, patch.getDiffTree());
161162
renderer.render(patch, Path.of("render", repoName), RENDER_OPTIONS_TO_USE);
162163
}

0 commit comments

Comments
 (0)