You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/04/03 10:54:44 UTC
[sling-whiteboard] branch master updated: [feature-diff] expected
values always first
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 9c081e6 [feature-diff] expected values always first
9c081e6 is described below
commit 9c081e6fe7f84406bcd089df23230850c27914a0
Author: stripodi <st...@192.168.1.111>
AuthorDate: Wed Apr 3 12:54:33 2019 +0200
[feature-diff] expected values always first
---
.../feature/diff/ArtifactsComparatorTest.java | 24 +++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/feature-diff/src/test/java/org/apache/sling/feature/diff/ArtifactsComparatorTest.java b/feature-diff/src/test/java/org/apache/sling/feature/diff/ArtifactsComparatorTest.java
index 51c0b6e..91cb379 100644
--- a/feature-diff/src/test/java/org/apache/sling/feature/diff/ArtifactsComparatorTest.java
+++ b/feature-diff/src/test/java/org/apache/sling/feature/diff/ArtifactsComparatorTest.java
@@ -22,10 +22,24 @@ import static org.junit.Assert.assertFalse;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Artifacts;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
public class ArtifactsComparatorTest {
+ private ArtifactsComparator comparator;
+
+ @Before
+ public void setUp() {
+ comparator = new ArtifactsComparator("bundles");
+ }
+
+ @After
+ public void tearDown() {
+ comparator = null;
+ }
+
@Test(expected = NullPointerException.class)
public void nullIdNotAcceptedByTheConstructor() {
new ArtifactsComparator(null);
@@ -39,10 +53,10 @@ public class ArtifactsComparatorTest {
Artifacts currentArtifacts = new Artifacts();
- DiffSection artifactsDiff = new ArtifactsComparator("bundles").apply(previousArtifacts, currentArtifacts);
+ DiffSection artifactsDiff = comparator.apply(previousArtifacts, currentArtifacts);
assertFalse(artifactsDiff.isEmpty());
- assertEquals(artifactsDiff.getRemoved().iterator().next(), previousArtifact.getId().toMvnId());
+ assertEquals(previousArtifact.getId().toMvnId(), artifactsDiff.getRemoved().iterator().next());
}
@Test
@@ -53,10 +67,10 @@ public class ArtifactsComparatorTest {
Artifact currentArtifact = new Artifact(ArtifactId.fromMvnId("org.apache.sling:org.apache.sling.feature.diff:1.0.0"));
currentArtifacts.add(currentArtifact);
- DiffSection artifactsDiff = new ArtifactsComparator("bundles").apply(previousArtifacts, currentArtifacts);
+ DiffSection artifactsDiff = comparator.apply(previousArtifacts, currentArtifacts);
assertFalse(artifactsDiff.isEmpty());
- assertEquals(artifactsDiff.getAdded().iterator().next(), currentArtifact.getId().toMvnId());
+ assertEquals(currentArtifact.getId().toMvnId(), artifactsDiff.getAdded().iterator().next());
}
@Test
@@ -69,7 +83,7 @@ public class ArtifactsComparatorTest {
Artifact currentArtifact = new Artifact(ArtifactId.fromMvnId("org.apache.sling:org.apache.sling.feature.diff:1.0.0"));
currentArtifacts.add(currentArtifact);
- DiffSection artifactsDiff = new ArtifactsComparator("bundles").apply(previousArtifacts, currentArtifacts);
+ DiffSection artifactsDiff = comparator.apply(previousArtifacts, currentArtifacts);
assertFalse(artifactsDiff.isEmpty());
DiffSection artifactDiff = artifactsDiff.getUpdates().iterator().next();