You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/29 09:23:06 UTC
svn commit: r1064981 [8/8] - in /directory:
apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/
apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/
apacheds/trunk/protocol-ldap/src/main/java/org/apach...
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java?rev=1064981&r1=1064980&r2=1064981&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java Sat Jan 29 08:23:02 2011
@@ -32,8 +32,8 @@ import org.apache.directory.junit.tools.
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControl;
-import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlContainer;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueDecorator;
+import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueContainer;
import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlDecoder;
import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
import org.apache.directory.shared.util.Strings;
@@ -69,8 +69,8 @@ public class SyncStateValueControlTest
} );
bb.flip();
- SyncStateValueControlContainer container = new SyncStateValueControlContainer();
- container.setSyncStateValueControl( new SyncStateValueControl() );
+ SyncStateValueContainer container = new SyncStateValueContainer();
+ container.setSyncStateValueControl( new SyncStateValueDecorator() );
try
{
@@ -82,7 +82,7 @@ public class SyncStateValueControlTest
fail( de.getMessage() );
}
- SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
+ SyncStateValueDecorator syncStateValue = container.getSyncStateValueControl();
assertEquals( SyncStateTypeEnum.PRESENT, syncStateValue.getSyncStateType() );
assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
assertEquals( "xkcd", Strings.utf8ToString(syncStateValue.getCookie()) );
@@ -135,8 +135,8 @@ public class SyncStateValueControlTest
} );
bb.flip();
- SyncStateValueControlContainer container = new SyncStateValueControlContainer();
- container.setSyncStateValueControl( new SyncStateValueControl() );
+ SyncStateValueContainer container = new SyncStateValueContainer();
+ container.setSyncStateValueControl( new SyncStateValueDecorator() );
try
{
@@ -147,7 +147,7 @@ public class SyncStateValueControlTest
fail( de.getMessage() );
}
- SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
+ SyncStateValueDecorator syncStateValue = container.getSyncStateValueControl();
assertEquals( SyncStateTypeEnum.ADD, syncStateValue.getSyncStateType() );
assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
assertNull( syncStateValue.getCookie() );
@@ -200,8 +200,8 @@ public class SyncStateValueControlTest
} );
bb.flip();
- SyncStateValueControlContainer container = new SyncStateValueControlContainer();
- container.setSyncStateValueControl( new SyncStateValueControl() );
+ SyncStateValueContainer container = new SyncStateValueContainer();
+ container.setSyncStateValueControl( new SyncStateValueDecorator() );
try
{
@@ -213,7 +213,7 @@ public class SyncStateValueControlTest
fail( de.getMessage() );
}
- SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
+ SyncStateValueDecorator syncStateValue = container.getSyncStateValueControl();
assertEquals( SyncStateTypeEnum.MODIFY, syncStateValue.getSyncStateType() );
assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
assertEquals( "", Strings.utf8ToString(syncStateValue.getCookie()) );
@@ -261,8 +261,8 @@ public class SyncStateValueControlTest
} );
bb.flip();
- SyncStateValueControlContainer container = new SyncStateValueControlContainer();
- container.setSyncStateValueControl( new SyncStateValueControl() );
+ SyncStateValueContainer container = new SyncStateValueContainer();
+ container.setSyncStateValueControl( new SyncStateValueDecorator() );
try
{
@@ -290,8 +290,8 @@ public class SyncStateValueControlTest
} );
bb.flip();
- SyncStateValueControlContainer container = new SyncStateValueControlContainer();
- container.setSyncStateValueControl( new SyncStateValueControl() );
+ SyncStateValueContainer container = new SyncStateValueContainer();
+ container.setSyncStateValueControl( new SyncStateValueDecorator() );
try
{
@@ -321,8 +321,8 @@ public class SyncStateValueControlTest
} );
bb.flip();
- SyncStateValueControlContainer container = new SyncStateValueControlContainer();
- container.setSyncStateValueControl( new SyncStateValueControl() );
+ SyncStateValueContainer container = new SyncStateValueContainer();
+ container.setSyncStateValueControl( new SyncStateValueDecorator() );
try
{
@@ -356,8 +356,8 @@ public class SyncStateValueControlTest
} );
bb.flip();
- SyncStateValueControlContainer container = new SyncStateValueControlContainer();
- container.setSyncStateValueControl( new SyncStateValueControl() );
+ SyncStateValueContainer container = new SyncStateValueContainer();
+ container.setSyncStateValueControl( new SyncStateValueDecorator() );
try
{
@@ -369,7 +369,7 @@ public class SyncStateValueControlTest
fail( de.getMessage() );
}
- SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
+ SyncStateValueDecorator syncStateValue = container.getSyncStateValueControl();
assertEquals( SyncStateTypeEnum.MODDN, syncStateValue.getSyncStateType() );
assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
assertEquals( "xkcd", Strings.utf8ToString(syncStateValue.getCookie()) );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java?rev=1064981&r1=1064980&r2=1064981&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java Sat Jan 29 08:23:02 2011
@@ -1525,11 +1525,11 @@ public class LdifReaderTest
assertTrue( entry.isChangeDelete() );
// Check the control
- Control control = entry.getControl( "1.2.840.113556.1.4.805" );
+ LdifControl control = entry.getControl( "1.2.840.113556.1.4.805" );
assertEquals( "1.2.840.113556.1.4.805", control.getOid() );
assertFalse( control.isCritical() );
- assertEquals( "control-value", Strings.utf8ToString(control.getValue()) );
+ assertEquals( "control-value", Strings.utf8ToString( control.getValue() ) );
}
@@ -1893,7 +1893,7 @@ public class LdifReaderTest
assertTrue( entry.hasControls() );
assertEquals( 1, entry.getControls().size() );
- Control control = entry.getControl( "1.1.1" );
+ LdifControl control = entry.getControl( "1.1.1" );
assertEquals( "1.1.1", control.getOid() );
assertFalse( control.isCritical() );
@@ -1933,7 +1933,7 @@ public class LdifReaderTest
assertEquals( 6, entry.getControls().size() );
// First control
- Control control = entry.getControl( "1.1.1" );
+ LdifControl control = entry.getControl( "1.1.1" );
assertEquals( "1.1.1", control.getOid() );
assertFalse( control.isCritical() );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractMessageTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractMessageTest.java?rev=1064981&r1=1064980&r2=1064981&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractMessageTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractMessageTest.java Sat Jan 29 08:23:02 2011
@@ -27,7 +27,6 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.message.AbstractMessage;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -134,7 +133,7 @@ public class AbstractMessageTest
private static final long serialVersionUID = 1L;
};
- msg0.addControl( new ControlImpl( "0.0" )
+ msg0.addControl( new Control()
{
private static final long serialVersionUID = 1L;
@@ -150,15 +149,9 @@ public class AbstractMessageTest
}
- public byte[] getValue()
- {
- return null;
- }
-
-
public String getOid()
{
- return null;
+ return "0.0";
}
} );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java?rev=1064981&r1=1064980&r2=1064981&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java Sat Jan 29 08:23:02 2011
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertTru
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -190,7 +189,7 @@ public class AbstractResultResponseTest
private static final long serialVersionUID = 1L;
};
- msg0.addControl( new ControlImpl( "0.0" )
+ msg0.addControl( new Control()
{
private static final long serialVersionUID = 1L;
@@ -206,15 +205,9 @@ public class AbstractResultResponseTest
}
- public byte[] getValue()
- {
- return null;
- }
-
-
public String getOid()
{
- return null;
+ return "0.0";
}
} );
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1064981&r1=1064980&r2=1064981&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sat Jan 29 08:23:02 2011
@@ -82,8 +82,10 @@
<module>ldap-schema</module>
<module>ldap-schema-converter</module>
<module>ldap-client-api</module>
+ <!--
<module>dsml-parser</module>
<module>dsml-engine</module>
+ -->
</modules>
<build>