diff --git a/ring-android/libringclient/src/test/java/net/jami/model/ConversationTest.java b/ring-android/libringclient/src/test/java/net/jami/model/ConversationTest.java index ce00a3da18896408331acd903abdc2ff0f705220..d854e0adf963594bc1501a387798666166853820 100644 --- a/ring-android/libringclient/src/test/java/net/jami/model/ConversationTest.java +++ b/ring-android/libringclient/src/test/java/net/jami/model/ConversationTest.java @@ -20,12 +20,6 @@ package net.jami.model; -import net.jami.model.Contact; -import net.jami.model.Conversation; -import net.jami.model.DataTransfer; -import net.jami.model.TextMessage; -import net.jami.model.Uri; - import org.junit.Before; import org.junit.Test; @@ -38,18 +32,18 @@ import static org.junit.Assert.assertEquals; */ public class ConversationTest { - private net.jami.model.Conversation conversation; + private Conversation conversation; @Before - public void setUp() throws Exception { - Contact contact = new Contact(1L); - conversation = new net.jami.model.Conversation(contact); + public void setUp() { + Contact contact = new Contact(Uri.fromString("jami://test")); + conversation = new Conversation("", contact); } @Test - public void init_test() throws Exception { - Contact contact = new Contact(1L); - Conversation conversation = new net.jami.model.Conversation(contact); + public void init_test() { + Contact contact = new Contact(Uri.fromString("jami://test")); + conversation = new Conversation("", contact); assertEquals(conversation.getContact(), contact); } @@ -86,7 +80,7 @@ public class ConversationTest { @Test public void addHistoryCall() throws Exception { int oldSize = conversation.getAggregateHistory().size(); - conversation.addHistoryCall(new HistoryCall()); + conversation.addCall(new Call("Coucou", "ring:test", "1", conversation, conversation.getContact(), Call.Direction.INCOMING)); int newSize = conversation.getAggregateHistory().size(); assertEquals(0, oldSize); @@ -96,7 +90,7 @@ public class ConversationTest { @Test public void addTextMessage() throws Exception { int oldSize = conversation.getAggregateHistory().size(); - conversation.addTextMessage(new net.jami.model.TextMessage(true, "Coucou", new net.jami.model.Uri("ring:test"), "1", "Toi")); + conversation.addTextMessage(new TextMessage( "Coucou", "ring:test", "1", conversation, "Toi")); int newSize = conversation.getAggregateHistory().size(); assertEquals(0, oldSize); @@ -150,7 +144,7 @@ public class ConversationTest { @Test public void addFileTransfer() throws Exception { int oldSize = conversation.getAggregateHistory().size(); - conversation.addFileTransfer(new DataTransfer(1L, "photo.jpg", true, 10L, 0L, "1", "1")); + conversation.addFileTransfer(new DataTransfer(1L, "Coucoou", "ring:sfvfv", "photo.jpg", true, 10L, 0L, 0L)); int newSize = conversation.getAggregateHistory().size(); assertEquals(0, oldSize); @@ -174,7 +168,7 @@ public class ConversationTest { int random = new Random().nextInt(20); for (int i = 0; i < random; i++) { - conversation.addTextMessage(new TextMessage(true, "Coucou", new Uri("ring:test"), "1", "Toi")); + conversation.addTextMessage(new TextMessage( "Coucou", "ring:test", "1", conversation, "Toi")); } int newSize = conversation.getAggregateHistory().size(); diff --git a/ring-android/libringclient/src/test/java/net/jami/model/StatusTest.java b/ring-android/libringclient/src/test/java/net/jami/model/StatusTest.java deleted file mode 100644 index 91dbd2f933e7baa76b3f91c49d3d0871aa37b6f5..0000000000000000000000000000000000000000 --- a/ring-android/libringclient/src/test/java/net/jami/model/StatusTest.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2004-2021 Savoir-faire Linux Inc. - * - * Author: Pierre Duchemin <pierre.duchemin@savoirfairelinux.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package net.jami.model; - -import net.jami.model.TextMessage; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class StatusTest { - - @Test - public void fromString_test() throws Exception { - net.jami.model.TextMessage.Status[] values = net.jami.model.TextMessage.Status.values(); - for (net.jami.model.TextMessage.Status s : values) { - - assertEquals(net.jami.model.TextMessage.Status.fromString(s.name()), s); - } - } - - @Test - public void fromString_invalid_test() throws Exception { - net.jami.model.TextMessage.Status status = net.jami.model.TextMessage.Status.fromString("abc"); - - assertEquals(net.jami.model.TextMessage.Status.UNKNOWN, status); - } - - @Test - public void fromString_null_test() throws Exception { - net.jami.model.TextMessage.Status status = net.jami.model.TextMessage.Status.fromString(null); - - assertEquals(net.jami.model.TextMessage.Status.UNKNOWN, status); - } - - @Test - public void fromInt_test() throws Exception { - for (int i = 0; i < 5; i++) { - net.jami.model.TextMessage.Status status = net.jami.model.TextMessage.Status.fromInt(i); - net.jami.model.TextMessage.Status[] values = net.jami.model.TextMessage.Status.values(); - - assertEquals(status, values[i]); - } - } - - @Test - public void fromInt_invalid_test() throws Exception { - net.jami.model.TextMessage.Status status = net.jami.model.TextMessage.Status.fromInt(-1); - - assertEquals(net.jami.model.TextMessage.Status.UNKNOWN, status); - } - - @Test - public void toString_test() throws Exception { - TextMessage.Status[] values = net.jami.model.TextMessage.Status.values(); - for (net.jami.model.TextMessage.Status s : values) { - assertEquals(s.toString(), s.name()); - } - } -} \ No newline at end of file diff --git a/ring-android/libringclient/src/test/java/net/jami/model/UriTest.java b/ring-android/libringclient/src/test/java/net/jami/model/UriTest.java index b9287d0e5f251c3d59b61f73e2f69eb9606fefa6..c962b68c91accd813af2e6b1300d544af6f76889 100644 --- a/ring-android/libringclient/src/test/java/net/jami/model/UriTest.java +++ b/ring-android/libringclient/src/test/java/net/jami/model/UriTest.java @@ -19,13 +19,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -package cx.ring.model; +package net.jami.model; -import net.jami.model.Uri; +import net.jami.utils.Tuple; import org.junit.Test; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; public class UriTest { @@ -33,35 +34,35 @@ public class UriTest { @Test public void testGoodRawString() { String uri = "ring:1234567890123456789012345678901234567890"; - net.jami.model.Uri test = new net.jami.model.Uri(uri); + Uri test = Uri.fromString(uri); assertTrue(test.getRawUriString().contentEquals(uri)); } @Test public void testBadIPAddress() { - assertFalse(net.jami.model.Uri.isIpAddress("not an ip")); + assertFalse(Uri.isIpAddress("not an ip")); } @Test public void testGoodIPAddress() { - assertTrue(net.jami.model.Uri.isIpAddress("127.0.0.1")); - assertTrue(net.jami.model.Uri.isIpAddress("2001:db8:0:85a3:0:0:ac1f:8001")); + assertTrue(Uri.isIpAddress("127.0.0.1")); + assertTrue(Uri.isIpAddress("2001:db8:0:85a3:0:0:ac1f:8001")); } @Test public void testRingModel() { String uri = "ring:1234567890123456789012345678901234567890"; - net.jami.model.Uri test = new net.jami.model.Uri(uri); + Tuple<Uri, String> test = Uri.fromStringWithName(uri); - assertTrue(test.getDisplayName() == null); - assertTrue(test.getScheme().contentEquals("ring:")); - assertTrue(test.getUriString().contentEquals("ring:1234567890123456789012345678901234567890")); + assertNull(test.second); + assertTrue(test.first.getScheme().contentEquals("ring:")); + assertTrue(test.first.getUri().contentEquals("ring:1234567890123456789012345678901234567890")); } @Test public void testSIPModel() { String uri = "100@sipuri"; - net.jami.model.Uri test = new Uri(uri); + Uri test = Uri.fromString(uri); assertTrue(test.getUsername().contentEquals("100")); assertTrue(test.getHost().contentEquals("sipuri"));