Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
biopet.biopet
Commits
a51bf527
Commit
a51bf527
authored
Jul 23, 2015
by
Peter van 't Hof
Browse files
Added simple test for merge conflicts
parent
d08baac8
Changes
1
Hide whitespace changes
Inline
Side-by-side
public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/utils/ConfigUtilsTest.scala
View file @
a51bf527
...
...
@@ -205,7 +205,17 @@ class ConfigUtilsTest extends TestNGSuite with Matchers {
//TODO: test BiopetQScript error message
}
}
@Test
def
testMergeConflict
:
Unit
=
{
val
map1
=
Map
(
"c"
->
"1"
)
val
map2
=
Map
(
"c"
->
"2"
)
mergeMaps
(
map1
,
map2
)
shouldBe
Map
(
"c"
->
"1"
)
mergeMaps
(
map1
,
map2
,
(
a
,
b
,
k
)
=>
a
.
toString
+
b
.
toString
)
shouldBe
Map
(
"c"
->
"12"
)
mergeMaps
(
map2
,
map1
,
(
a
,
b
,
k
)
=>
a
.
toString
+
b
.
toString
)
shouldBe
Map
(
"c"
->
"21"
)
mergeMaps
(
map2
,
map2
,
(
a
,
b
,
k
)
=>
a
.
toString
+
b
.
toString
)
shouldBe
Map
(
"c"
->
"22"
)
}
}
object
ConfigUtilsTest
{
def
writeTemp
(
text
:
String
,
extension
:
String
)
:
File
=
{
val
file
=
File
.
createTempFile
(
"TestConfigUtils."
,
extension
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment