summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Clayton <alex.clayton@isode.com>2016-03-16 10:48:22 (GMT)
committerAlex Clayton <alex.clayton@isode.com>2016-03-16 10:54:54 (GMT)
commit892af8539f2b46e840d7344489529259d1df03b9 (patch)
tree78fed06774602915dc2335990bff7777d3e9bda5
parenta452bc6ceed519cba43328f0d741af9723197a24 (diff)
downloadstroke-892af8539f2b46e840d7344489529259d1df03b9.zip
stroke-892af8539f2b46e840d7344489529259d1df03b9.tar.bz2
Add JID.isValid() checks to the JIDTest unit tests.
As per swiften patch 'Add more tests for JID validity' (59c64a11e0bceca4876ba69ef2f30519629b108c). Test-information: All unit tests pass. Change-Id: Iefb77fa089afd13c0f8b5f51f2a3115001a061e8
-rw-r--r--test/com/isode/stroke/jid/JIDTest.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/test/com/isode/stroke/jid/JIDTest.java b/test/com/isode/stroke/jid/JIDTest.java
index 9a7b16a..96de429 100644
--- a/test/com/isode/stroke/jid/JIDTest.java
+++ b/test/com/isode/stroke/jid/JIDTest.java
@@ -1,8 +1,8 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
/*
* Copyright (c) 2015 Tarun Gupta.
* Licensed under the simplified BSD license.
@@ -30,23 +30,25 @@ public class JIDTest {
JID testling = new JID("foo@bar/baz");
assertEquals("foo", testling.getNode());
assertEquals("bar", testling.getDomain());
assertEquals("baz", testling.getResource());
assertFalse(testling.isBare());
+ assertTrue(testling.isValid());
}
@Test
public void testConstructorWithString_NoResource() {
JID testling = new JID("foo@bar");
assertEquals("foo", testling.getNode());
assertEquals("bar", testling.getDomain());
assertEquals("", testling.getResource());
assertTrue(testling.isBare());
+ assertTrue(testling.isValid());
}
@Test
public void testConstructorWithString_EmptyResource() {
JID testling = new JID("bar/");
@@ -61,23 +63,25 @@ public class JIDTest {
JID testling = new JID("bar/baz");
assertEquals("", testling.getNode());
assertEquals("bar", testling.getDomain());
assertEquals("baz", testling.getResource());
assertFalse(testling.isBare());
+ assertTrue(testling.isValid());
}
@Test
public void testConstructorWithString_OnlyDomain() {
JID testling = new JID("bar");
assertEquals("", testling.getNode());
assertEquals("bar", testling.getDomain());
assertEquals("", testling.getResource());
assertTrue(testling.isBare());
+ assertTrue(testling.isValid());
}
@Test
public void testConstructorWithString_InvalidDomain() {
assertFalse(new JID("foo@bar,baz").isValid());
@@ -95,20 +99,22 @@ public class JIDTest {
@Test
public void testConstructorWithString_UpperCaseDomain() {
JID testling = new JID("FoΩ");
assertEquals("foω", testling.getDomain());
+ assertTrue(testling.isValid());
}
@Test
public void testConstructorWithString_UpperCaseResource() {
JID testling = new JID("bar/FoΩ");
assertEquals(testling.getResource(), "FoΩ");
+ assertTrue(testling.isValid());
}
@Test
public void testConstructorWithString_EmptyNode() {
JID testling = new JID("@bar");
@@ -136,12 +142,13 @@ public class JIDTest {
public void testConstructorWithStrings() {
JID testling = new JID("foo", "bar", "baz");
assertEquals("foo", testling.getNode());
assertEquals("bar", testling.getDomain());
assertEquals("baz", testling.getResource());
+ assertTrue(testling.isValid());
}
@Test
public void testConstructorWithStrings_EmptyDomain() {
JID testling = new JID("foo", "", "baz");
@@ -176,12 +183,13 @@ public class JIDTest {
public void testToBare_EmptyNode() {
JID testling = new JID("bar/baz");
assertEquals("", testling.toBare().getNode());
assertEquals("bar", testling.toBare().getDomain());
assertTrue(testling.toBare().isBare());
+ assertTrue(testling.isValid());
}
@Test
public void testToBare_EmptyResource() {
JID testling = new JID("bar/");