You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by gs...@apache.org on 2008/04/17 11:55:43 UTC
svn commit: r649031 - in /labs/vysper: build.xml
src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java
src/test/java/org/apache/vysper/xmpp/addressing/
src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java
Author: gseitz
Date: Thu Apr 17 02:55:35 2008
New Revision: 649031
URL: http://svn.apache.org/viewvc?rev=649031&view=rev
Log:
added docs target to build.xml
fixed EntityConformance check and added TestCase
Added:
labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/
labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java (with props)
Modified:
labs/vysper/build.xml
labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java
Modified: labs/vysper/build.xml
URL: http://svn.apache.org/viewvc/labs/vysper/build.xml?rev=649031&r1=649030&r2=649031&view=diff
==============================================================================
--- labs/vysper/build.xml (original)
+++ labs/vysper/build.xml Thu Apr 17 02:55:35 2008
@@ -57,7 +57,8 @@
<property name="compiler.args.vysper" value="${compiler.args}"/>
- <property name="vysper.output.dir" value="${basedir}/build/ant/classes"/>
+ <property name="vysper.output.dir" value="${basedir}/build/ant/classes"/>
+ <property name="vysper.docs.dir" value="${basedir}/build/ant/apidocs"/>
<property name="vysper.unittest.base.dir" value="${basedir}/build/ant/tests/junit"/>
<property name="vysper.unittest.output.classes.dir" value="${vysper.unittest.base.dir}/classes"/>
<property name="vysper.unittest.output.reports.dir" value="${vysper.unittest.base.dir}/reports"/>
@@ -190,5 +191,10 @@
<target name="clean" depends="clean.vysper" description="cleanup all"/>
- <target name="all" depends="init, clean, compile.vysper" description="build all"/>
+ <target name="all" depends="init, clean, compile.vysper" description="build all"/>
+
+ <target name="docs" description="generate javadocs">
+ <javadoc sourcepathref="sourcepath" destdir="${vysper.docs.dir}">
+ </javadoc>
+ </target>
</project>
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java?rev=649031&r1=649030&r2=649031&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java Thu Apr 17 02:55:35 2008
@@ -17,8 +17,12 @@
package org.apache.vysper.xmpp.addressing;
+import org.apache.vysper.util.annotations.RfcCompliant;
+import org.apache.vysper.util.annotations.RfcCompliant.ComplianceStatus;
+
/**
*/
+@RfcCompliant(rfc="3290", section="3.1", status=ComplianceStatus.PARTIAL)
public class EntityConformance {
public static boolean checkRFC3920Conformance(Entity entity) {
@@ -31,7 +35,7 @@
}
private static boolean checkPartConformity(String part) {
- return part != null && part.getBytes().length > 1023;
+ return part == null || part.getBytes().length < 1023;
}
private static boolean checkPartIsEmpty(String part) {
Added: labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java?rev=649031&view=auto
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java (added)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java Thu Apr 17 02:55:35 2008
@@ -0,0 +1,39 @@
+package org.apache.vysper.xmpp.addressing;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+public class EntityConformanceTestCase extends TestCase {
+
+ public void testCheckRFC3920Conformance() {
+ String error = buildLargeString();
+ String ok = "x";
+
+ assertFalse(doCheck(error, ok, ok));
+ assertFalse(doCheck(ok, error, ok));
+ assertFalse(doCheck(ok, ok, error));
+ assertFalse(doCheck(ok, null, ok));
+ assertFalse(doCheck(ok, "", ok));
+
+ assertTrue(doCheck(ok, ok, ok));
+ assertTrue(doCheck(null, ok, null));
+ assertTrue(doCheck(ok, ok, null));
+ assertTrue(doCheck(null, ok, ok));
+ assertTrue(doCheck("", ok, ""));
+ assertTrue(doCheck(ok, ok, ""));
+ assertTrue(doCheck("", ok, ok));
+
+ }
+
+ private boolean doCheck(String node, String domain, String resource) {
+ return EntityConformance.checkRFC3920Conformance(new EntityImpl(
+ node, domain, resource));
+ }
+
+ private String buildLargeString() {
+ char[] chars = new char[1024];
+ Arrays.fill(chars, 'x');
+ return new String(chars);
+ }
+}
Propchange: labs/vysper/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org