From c869d6798d497c2c322020d805ffb8498d8576ae Mon Sep 17 00:00:00 2001 From: Jonas Hanselle Date: Wed, 30 May 2018 12:13:26 +0200 Subject: [PATCH 1/3] add my name to unit test add my name to integration test --- .../java/de/upb/otfmlpg/main/ParticipantList.java | 1 + .../java/de/upb/otfmlpg/test/IntegrationTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/de/upb/otfmlpg/main/ParticipantList.java b/src/main/java/de/upb/otfmlpg/main/ParticipantList.java index 31bdbfc..e1e77c1 100644 --- a/src/main/java/de/upb/otfmlpg/main/ParticipantList.java +++ b/src/main/java/de/upb/otfmlpg/main/ParticipantList.java @@ -13,6 +13,7 @@ public ParticipantList() { this.allParticipants.add(new Participant("noni4")); this.allParticipants.add(new Participant("fweiland")); this.allParticipants.add(new Participant("mwever")); + this.allParticipants.add(new Participant("jmhansel")); } @Override diff --git a/src/test/java/de/upb/otfmlpg/test/IntegrationTest.java b/src/test/java/de/upb/otfmlpg/test/IntegrationTest.java index 430085f..dd56095 100644 --- a/src/test/java/de/upb/otfmlpg/test/IntegrationTest.java +++ b/src/test/java/de/upb/otfmlpg/test/IntegrationTest.java @@ -28,6 +28,19 @@ public IntegrationTest(final String toCheck) { public void test() { assertTrue(this.participants.toString().contains(this.toCheck)); } +<<<<<<< HEAD +======= + + @Parameters(name="{0}") + public static Collection participants() { + return Arrays.asList(new String[][] { + { "mirkoj" }, + { "jmhansel" } +// { "fweiland" }, +// ... + }); + } +>>>>>>> add my name to unit test @Parameters(name = "{0}") public static Collection participants() { From c231eac0443fdc0119d6739e9a4bf69b163195ae Mon Sep 17 00:00:00 2001 From: Jonas Hanselle Date: Tue, 5 Jun 2018 12:41:41 +0200 Subject: [PATCH 2/3] add a comment --- src/main/java/de/upb/otfmlpg/main/ParticipantList.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/upb/otfmlpg/main/ParticipantList.java b/src/main/java/de/upb/otfmlpg/main/ParticipantList.java index e1e77c1..41683f1 100644 --- a/src/main/java/de/upb/otfmlpg/main/ParticipantList.java +++ b/src/main/java/de/upb/otfmlpg/main/ParticipantList.java @@ -14,6 +14,7 @@ public ParticipantList() { this.allParticipants.add(new Participant("fweiland")); this.allParticipants.add(new Participant("mwever")); this.allParticipants.add(new Participant("jmhansel")); + } @Override From 139de9bcbc3608ba8a967f70e0b45682267050cf Mon Sep 17 00:00:00 2001 From: Jonas Hanselle Date: Tue, 5 Jun 2018 12:58:55 +0200 Subject: [PATCH 3/3] fix integration test --- src/test/java/de/upb/otfmlpg/test/IntegrationTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/java/de/upb/otfmlpg/test/IntegrationTest.java b/src/test/java/de/upb/otfmlpg/test/IntegrationTest.java index dd56095..8f3e6c5 100644 --- a/src/test/java/de/upb/otfmlpg/test/IntegrationTest.java +++ b/src/test/java/de/upb/otfmlpg/test/IntegrationTest.java @@ -28,8 +28,6 @@ public IntegrationTest(final String toCheck) { public void test() { assertTrue(this.participants.toString().contains(this.toCheck)); } -<<<<<<< HEAD -======= @Parameters(name="{0}") public static Collection participants() { @@ -40,7 +38,6 @@ public static Collection participants() { // ... }); } ->>>>>>> add my name to unit test @Parameters(name = "{0}") public static Collection participants() {