Skip to content

Commit 5c4dead

Browse files
allanrenucciallanrenucci
committed
Reorder arguments in assertEquals according to the spec:
asserEquals(expected, found)
1 parent e78a3fb commit 5c4dead

File tree

3 files changed

+81
-82
lines changed

3 files changed

+81
-82
lines changed

‎sbt-bridge/test/xsbt/DependencySpecification.scala

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,20 @@ class DependencySpecification {
1212
val classDependencies = extractClassDependenciesPublic
1313
val memberRef = classDependencies.memberRef
1414
val inheritance = classDependencies.inheritance
15-
assertEquals(memberRef("A"), Set.empty)
16-
assertEquals(inheritance("A"), Set.empty)
17-
assertEquals(memberRef("B"), Set("A", "D"))
18-
assertEquals(inheritance("B"), Set("D"))
19-
assertEquals(memberRef("C"), Set("A"))
20-
assertEquals(inheritance("C"), Set.empty)
21-
assertEquals(memberRef("D"), Set.empty)
22-
assertEquals(inheritance("D"), Set.empty)
23-
assertEquals(memberRef("E"), Set.empty)
24-
assertEquals(inheritance("E"), Set.empty)
25-
assertEquals(memberRef("F"), Set("A", "B", "D", "E", "G", "C")) // C is the underlying type of MyC
26-
assertEquals(inheritance("F"), Set("A", "E"))
27-
assertEquals(memberRef("H"), Set("B", "E", "G"))
28-
// aliases and applied type constructors are expanded so we have inheritance dependency on B
29-
assertEquals(inheritance("H"), Set("B", "E"))
15+
assertEquals(Set.empty, memberRef("A"))
16+
assertEquals(Set.empty, inheritance("A"))
17+
assertEquals(Set("A", "D"), memberRef("B"))
18+
assertEquals(Set("D"), inheritance("B"))
19+
assertEquals(Set("A"), memberRef("C"))
20+
assertEquals(Set.empty, inheritance("C"))
21+
assertEquals(Set.empty, memberRef("D"))
22+
assertEquals(Set.empty, inheritance("D"))
23+
assertEquals(Set.empty, memberRef("E"))
24+
assertEquals(Set.empty, inheritance("E"))
25+
assertEquals(Set("A", "B", "D", "E", "G", "C"), memberRef("F")) // C is the underlying type of MyC
26+
assertEquals(Set("A", "E"), inheritance("F"))
27+
assertEquals(Set("B", "E", "G"), memberRef("H"))// aliases and applied type constructors are expanded so we have inheritance dependency on B
28+
assertEquals(Set("B", "E"), inheritance("H"))
3029
}
3130

3231
@Test
@@ -35,37 +34,37 @@ class DependencySpecification {
3534
val memberRef = classDependencies.memberRef
3635
val inheritance = classDependencies.inheritance
3736
val localInheritance = classDependencies.localInheritance
38-
assertEquals(memberRef("A"), Set.empty)
39-
assertEquals(inheritance("A"), Set.empty)
40-
assertEquals(memberRef("B"), Set.empty)
41-
assertEquals(inheritance("B"), Set.empty)
42-
assertEquals(memberRef("C.Inner1"), Set("A"))
43-
assertEquals(inheritance("C.Inner1"), Set("A"))
44-
assertEquals(memberRef("D"), Set("B"))
45-
assertEquals(inheritance("D"), Set.empty)
46-
assertEquals(localInheritance("D"), Set("B"))
47-
assertEquals(memberRef("E"), Set("B"))
48-
assertEquals(inheritance("E"), Set.empty)
49-
assertEquals(localInheritance("E"), Set("B"))
37+
assertEquals(Set.empty, memberRef("A"))
38+
assertEquals(Set.empty, inheritance("A"))
39+
assertEquals(Set.empty, memberRef("B"))
40+
assertEquals(Set.empty, inheritance("B"))
41+
assertEquals(Set("A"), memberRef("C.Inner1"))
42+
assertEquals(Set("A"), inheritance("C.Inner1"))
43+
assertEquals(Set("B"), memberRef("D"))
44+
assertEquals(Set.empty, inheritance("D"))
45+
assertEquals(Set("B"), localInheritance("D"))
46+
assertEquals(Set("B"), memberRef("E"))
47+
assertEquals(Set.empty, inheritance("E"))
48+
assertEquals(Set("B"), localInheritance("E"))
5049
}
5150

5251
@Test
5352
def extractedClassDependenciesWithTraitAsFirstParent = {
5453
val classDependencies = extractClassDependenciesTraitAsFirstPatent
5554
val memberRef = classDependencies.memberRef
5655
val inheritance = classDependencies.inheritance
57-
assertEquals(memberRef("A"), Set.empty)
58-
assertEquals(inheritance("A"), Set.empty)
59-
assertEquals(memberRef("B"), Set("A"))
60-
assertEquals(inheritance("B"), Set("A"))
56+
assertEquals(Set.empty, memberRef("A"))
57+
assertEquals(Set.empty, inheritance("A"))
58+
assertEquals(Set("A"), memberRef("B"))
59+
assertEquals(Set("A"), inheritance("B"))
6160
// verify that memberRef captures the oddity described in documentation of `Relations.inheritance`
6261
// we are mainly interested whether dependency on A is captured in `memberRef` relation so
6362
// the invariant that says that memberRef is superset of inheritance relation is preserved
64-
assertEquals(memberRef("C"), Set("A", "B"))
65-
assertEquals(inheritance("C"), Set("A", "B"))
63+
assertEquals(Set("A", "B"), memberRef("C"))
64+
assertEquals(Set("A", "B"), inheritance("C"))
6665
// same as above but indirect (C -> B -> A), note that only A is visible here
67-
assertEquals(memberRef("D"), Set("A", "C"))
68-
assertEquals(inheritance("D"), Set("A", "C"))
66+
assertEquals(Set("A", "C"), memberRef("D"))
67+
assertEquals(Set("A", "C"), inheritance("D"))
6968
}
7069

7170
@Test
@@ -80,10 +79,10 @@ class DependencySpecification {
8079

8180
val memberRef = classDependencies.memberRef
8281
val inheritance = classDependencies.inheritance
83-
assertEquals(memberRef("Outer"), Set.empty)
84-
assertEquals(inheritance("Outer"), Set.empty)
85-
assertEquals(memberRef("Bar"), Set("Outer", "Outer$.Inner"))
86-
assertEquals(inheritance("Bar"), Set.empty)
82+
assertEquals(Set.empty, memberRef("Outer"))
83+
assertEquals(Set.empty, inheritance("Outer"))
84+
assertEquals(Set("Outer", "Outer$.Inner"), memberRef("Bar"))
85+
assertEquals(Set.empty, inheritance("Bar"))
8786
}
8887

8988
@Test
@@ -100,10 +99,10 @@ class DependencySpecification {
10099

101100
val memberRef = classDependencies.memberRef
102101
val inheritance = classDependencies.inheritance
103-
assertEquals(memberRef("A"), Set("B"))
104-
assertEquals(inheritance("A"), Set.empty)
105-
assertEquals(memberRef("B"), Set.empty)
106-
assertEquals(inheritance("B"), Set.empty)
102+
assertEquals(Set("B"), memberRef("A"))
103+
assertEquals(Set.empty, inheritance("A"))
104+
assertEquals(Set.empty, memberRef("B"))
105+
assertEquals(Set.empty, inheritance("B"))
107106
}
108107

109108
@Test
@@ -135,14 +134,14 @@ class DependencySpecification {
135134
.extractDependenciesFromSrcs(srcA, srcB, srcC, srcD, srcE, srcF, srcG, srcH)
136135
.memberRef
137136

138-
assertEquals(deps("A"), Set.empty)
139-
assertEquals(deps("B"), Set("abc.A", "abc.A$.Inner"))
140-
assertEquals(deps("C"), Set("abc.A", "abc.A2"))
141-
assertEquals(deps("D"), Set("abc.A2"))
142-
assertEquals(deps("E"), Set("abc.A"))
143-
assertEquals(deps("F"), Set.empty)
144-
assertEquals(deps("foo.bar.G"), Set("abc.A"))
145-
assertEquals(deps("H"), Set("abc.A"))
137+
assertEquals(Set.empty, deps("A"))
138+
assertEquals(Set("abc.A", "abc.A$.Inner"), deps("B"))
139+
assertEquals(Set("abc.A", "abc.A2"), deps("C"))
140+
assertEquals(Set("abc.A2"), deps("D"))
141+
assertEquals(Set("abc.A"), deps("E"))
142+
assertEquals(Set.empty, deps("F"))
143+
assertEquals(Set("abc.A"), deps("foo.bar.G"))
144+
assertEquals(Set("abc.A"), deps("H"))
146145
}
147146

148147
private def extractClassDependenciesPublic: ExtractedClassDependencies = {

‎sbt-bridge/test/xsbt/ExtractAPISpecification.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ExtractAPISpecification {
3636
val compilerForTesting = new ScalaCompilerForUnitTesting
3737
val apis = compilerForTesting.extractApiFromSrc(src)
3838
val Seq(fooClassApi) = apis.toSeq
39-
assertEquals(fooClassApi.definitionType, DefinitionType.PackageModule)
39+
assertEquals(DefinitionType.PackageModule, fooClassApi.definitionType)
4040
}
4141

4242
@Test
@@ -47,7 +47,7 @@ class ExtractAPISpecification {
4747
|}""".stripMargin
4848
val compilerForTesting = new ScalaCompilerForUnitTesting
4949
val apis = compilerForTesting.extractApiFromSrc(src).map(c => c.name -> c).toMap
50-
assertEquals(apis.keys, Set("A", "A.B"))
50+
assertEquals(Set("A", "A.B"), apis.keys)
5151
}
5252

5353
@Test
@@ -59,7 +59,7 @@ class ExtractAPISpecification {
5959
|class D { def foo: Unit = { new B {} } }""".stripMargin
6060
val compilerForTesting = new ScalaCompilerForUnitTesting
6161
val apis = compilerForTesting.extractApiFromSrc(src).map(c => c.name -> c).toMap
62-
assertEquals(apis.keys, Set("A", "B", "C", "D"))
62+
assertEquals(Set("A", "B", "C", "D"), apis.keys)
6363
}
6464

6565
@Ignore
@@ -93,7 +93,7 @@ class ExtractAPISpecification {
9393
|""".stripMargin
9494
val compilerForTesting = new ScalaCompilerForUnitTesting
9595
val apis = compilerForTesting.extractApiFromSrc(src).map(c => c.name -> c).toMap
96-
assertEquals(apis.keys, Set("A", "B", "B.Inner1"))
96+
assertEquals(Set("A", "B", "B.Inner1"), apis.keys)
9797
}
9898

9999
@Test
@@ -165,7 +165,7 @@ class ExtractAPISpecification {
165165
""".stripMargin
166166
val compilerForTesting = new ScalaCompilerForUnitTesting
167167
val apis = compilerForTesting.extractApiFromSrc(src).map(a => a.name -> a).toMap
168-
assertEquals(apis.keySet, Set("A", "A.AA", "B", "B.AA"))
168+
assertEquals(Set("A", "A.AA", "B", "B.AA"), apis.keySet)
169169
assertNotEquals(apis("A.AA"), apis("B.AA"))
170170
}
171171

@@ -181,7 +181,7 @@ class ExtractAPISpecification {
181181
""".stripMargin
182182
val compilerForTesting = new ScalaCompilerForUnitTesting
183183
val apis = compilerForTesting.extractApiFromSrc(src).map(a => a.name -> a).toMap
184-
assertEquals(apis.keySet, Set("abc.package", "abc.package$.BuildInfoKey", "abc.package$.BuildInfoKey$.Entry"))
184+
assertEquals(Set("abc.package", "abc.package$.BuildInfoKey", "abc.package$.BuildInfoKey$.Entry"), apis.keySet)
185185
}
186186

187187
/**
@@ -210,7 +210,7 @@ class ExtractAPISpecification {
210210
def hasSelfType(c: ClassLike): Boolean =
211211
c.selfType != emptyType
212212
val (withSelfType, withoutSelfType) = apis.partition(hasSelfType)
213-
assertEquals(withSelfType.map(_.name).toSet, Set("C3", "C4", "C5", "C6"))
214-
assertEquals(withoutSelfType.map(_.name).toSet, Set("X", "Y", "C1", "C2", "C8"))
213+
assertEquals(Set("C3", "C4", "C5", "C6"), withSelfType.map(_.name).toSet)
214+
assertEquals(Set("X", "Y", "C1", "C2", "C8"), withoutSelfType.map(_.name).toSet)
215215
}
216216
}

‎sbt-bridge/test/xsbt/ExtractUsedNamesSpecification.scala

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ExtractUsedNamesSpecification {
1818
val expectedNames = standardNames ++ Set("a", "A", "A2", "b")
1919
// names used at top level are attributed to the first class defined in a compilation unit
2020

21-
assertEquals(usedNames("a.A"), expectedNames)
21+
assertEquals(expectedNames, usedNames("a.A"))
2222
}
2323

2424
// test covers https://github.com/gkossakowski/sbt/issues/6
@@ -44,7 +44,7 @@ class ExtractUsedNamesSpecification {
4444
val compilerForTesting = new ScalaCompilerForUnitTesting
4545
val usedNames = compilerForTesting.extractUsedNamesFromSrc(srcA, srcB)
4646
val expectedNames = standardNames ++ Set("a", "c", "A", "B", "C", "D", "b", "BB")
47-
assertEquals(usedNames("b.X"), expectedNames)
47+
assertEquals(expectedNames, usedNames("b.X"))
4848
}
4949

5050
// test for https://github.com/gkossakowski/sbt/issues/5
@@ -59,7 +59,7 @@ class ExtractUsedNamesSpecification {
5959
val compilerForTesting = new ScalaCompilerForUnitTesting
6060
val usedNames = compilerForTesting.extractUsedNamesFromSrc(srcA, srcB)
6161
val expectedNames = standardNames ++ Set("A", "a", "=", "Int")
62-
assertEquals(usedNames("B"), expectedNames)
62+
assertEquals(expectedNames, usedNames("B"))
6363
}
6464

6565
@Test
@@ -83,11 +83,11 @@ class ExtractUsedNamesSpecification {
8383
val namesB = Set("A", "Int", "A;init;", "Unit")
8484
val namesC = Set("B;init;", "B", "Unit")
8585
val namesD = standardNames ++ Set("C", "X", "foo", "Int", "T")
86-
assertEquals(usedNames("A"), namesA)
87-
assertEquals(usedNames("A.X"), namesAX)
88-
assertEquals(usedNames("B"), namesB)
89-
assertEquals(usedNames("C"), namesC)
90-
assertEquals(usedNames("D"), namesD)
86+
assertEquals(namesA, usedNames("A"))
87+
assertEquals(namesAX, usedNames("A.X"))
88+
assertEquals(namesB, usedNames("B"))
89+
assertEquals(namesC, usedNames("C"))
90+
assertEquals(namesD, usedNames("D"))
9191
}
9292

9393
// See source-dependencies/types-in-used-names-a for an example where
@@ -147,11 +147,11 @@ class ExtractUsedNamesSpecification {
147147
"Predef",
148148
"???",
149149
"Nothing")
150-
assertEquals(usedNames("Test_lista"), expectedNames_lista)
151-
assertEquals(usedNames("Test_at"), expectedNames_at)
152-
assertEquals(usedNames("Test_as"), expectedNames_as)
153-
assertEquals(usedNames("Test_foo"), expectedNames_foo)
154-
assertEquals(usedNames("Test_bar"), expectedNames_bar)
150+
assertEquals(expectedNames_lista, usedNames("Test_lista"))
151+
assertEquals(expectedNames_at, usedNames("Test_at"))
152+
assertEquals(expectedNames_as, usedNames("Test_as"))
153+
assertEquals(expectedNames_foo, usedNames("Test_foo"))
154+
assertEquals(expectedNames_bar, usedNames("Test_bar"))
155155
}
156156

157157
@Test
@@ -168,7 +168,7 @@ class ExtractUsedNamesSpecification {
168168
val compilerForTesting = new ScalaCompilerForUnitTesting
169169
val usedNames = compilerForTesting.extractUsedNamesFromSrc(srcFoo, srcBar)
170170
val expectedNames = standardNames ++ Set("Outer", "TypeInner", "Inner", "Int")
171-
assertEquals(usedNames("Bar"), expectedNames)
171+
assertEquals(expectedNames, usedNames("Bar"))
172172
}
173173

174174
// test for https://github.com/gkossakowski/sbt/issues/3
@@ -178,7 +178,7 @@ class ExtractUsedNamesSpecification {
178178
val compilerForTesting = new ScalaCompilerForUnitTesting
179179
val usedNames = compilerForTesting.extractUsedNamesFromSrc(src)
180180
val expectedNames = standardNames ++ Set("A", "foo", "Int")
181-
assertEquals(usedNames("A"), expectedNames)
181+
assertEquals(expectedNames, usedNames("A"))
182182
}
183183

184184
// pending test for https://issues.scala-lang.org/browse/SI-7173
@@ -188,7 +188,7 @@ class ExtractUsedNamesSpecification {
188188
val compilerForTesting = new ScalaCompilerForUnitTesting
189189
val usedNames = compilerForTesting.extractUsedNamesFromSrc(src)
190190
val expectedNames = standardNames ++ Set("A", "foo", "Int")
191-
assertEquals(usedNames("A"), expectedNames)
191+
assertEquals(expectedNames, usedNames("A"))
192192
}
193193

194194
// test for https://github.com/gkossakowski/sbt/issues/4
@@ -203,7 +203,7 @@ class ExtractUsedNamesSpecification {
203203
val compilerForTesting = new ScalaCompilerForUnitTesting
204204
val usedNames = compilerForTesting.extractUsedNamesFromSrc(srcA, srcB)
205205
val expectedNames = standardNames ++ Set("A", "a", "Int", "selectDynamic", "bla")
206-
assertEquals(usedNames("B"), expectedNames)
206+
assertEquals(expectedNames, usedNames("B"))
207207
}
208208

209209
@Test
@@ -242,12 +242,12 @@ class ExtractUsedNamesSpecification {
242242
|}
243243
""".stripMargin
244244

245-
assertEquals(findPatMatUsages(classWithPatMatOfType()), Set(sealedClassName))
245+
assertEquals(Set(sealedClassName), findPatMatUsages(classWithPatMatOfType()))
246246
// Option is sealed
247-
assertEquals(findPatMatUsages(classWithPatMatOfType(s"Option[$sealedClassName]")),
248-
Set(sealedClassName, "Option"))
247+
assertEquals(Set(sealedClassName, "Option"),
248+
findPatMatUsages(classWithPatMatOfType(s"Option[$sealedClassName]")))
249249
// Seq and Set is not
250-
assertEquals(findPatMatUsages(classWithPatMatOfType(s"Seq[Set[$sealedClassName]]")), Set(sealedClassName))
250+
assertEquals(Set(sealedClassName), findPatMatUsages(classWithPatMatOfType(s"Seq[Set[$sealedClassName]]")))
251251

252252
def inNestedCase(tpe: String) =
253253
s"""package client
@@ -259,7 +259,7 @@ class ExtractUsedNamesSpecification {
259259
| }
260260
|}""".stripMargin
261261

262-
assertEquals(findPatMatUsages(inNestedCase(sealedClassName)), Set())
262+
assertEquals(Set(), findPatMatUsages(inNestedCase(sealedClassName)))
263263

264264
val notUsedInPatternMatch =
265265
s"""package client
@@ -272,7 +272,7 @@ class ExtractUsedNamesSpecification {
272272
| val aa: $sealedClassName = ???
273273
|}""".stripMargin
274274

275-
assertEquals(findPatMatUsages(notUsedInPatternMatch), Set())
275+
assertEquals(Set(), findPatMatUsages(notUsedInPatternMatch))
276276
}
277277

278278
/**

0 commit comments

Comments
 (0)