You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/03/30 16:58:16 UTC
svn commit: r1086976 [2/2] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/
apacheds/trunk/core-jndi/src/main/java/org/apache/di...
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java Wed Mar 30 14:58:15 2011
@@ -154,7 +154,7 @@ public class StringValueTest
StringValue sv2 = new StringValue( "" );
assertNotSame( sv2, sv1 );
- assertNull( sv1.get() );
+ assertNull( sv1.getValue() );
assertEquals( "", sv2.getString() );
}
@@ -209,7 +209,7 @@ public class StringValueTest
{
StringValue csv = new StringValue( (String)null );
- assertNull( csv.get() );
+ assertNull( csv.getValue() );
assertFalse( csv.isSchemaAware() );
assertTrue( csv.isValid( new Ia5StringSyntaxChecker() ) );
assertTrue( csv.isNull() );
@@ -225,7 +225,7 @@ public class StringValueTest
{
StringValue csv = new StringValue( "" );
- assertNotNull( csv.get() );
+ assertNotNull( csv.getValue() );
assertEquals( "", csv.getString() );
assertFalse( csv.isSchemaAware() );
assertTrue( csv.isValid( new Ia5StringSyntaxChecker() ) );
@@ -243,7 +243,7 @@ public class StringValueTest
{
StringValue csv = new StringValue( "test" );
- assertEquals( "test", csv.get() );
+ assertEquals( "test", csv.getValue() );
assertFalse( csv.isSchemaAware() );
assertTrue( csv.isValid( new Ia5StringSyntaxChecker() ) );
assertFalse( csv.isNull() );
@@ -253,16 +253,16 @@ public class StringValueTest
/**
- * Test method for {@link org.apache.directory.shared.ldap.model.entry.StringValue#get()}.
+ * Test method for {@link org.apache.directory.shared.ldap.model.entry.StringValue#getValue()}.
*/
@Test
public void testGet()
{
StringValue sv = new StringValue( "test" );
- assertEquals( "test", sv.get() );
+ assertEquals( "test", sv.getValue() );
StringValue sv2 = new StringValue( "" );
- assertEquals( "", sv2.get() );
+ assertEquals( "", sv2.getValue() );
}
@@ -274,10 +274,10 @@ public class StringValueTest
{
StringValue sv = new StringValue( "test" );
- assertEquals( "test", sv.get() );
+ assertEquals( "test", sv.getValue() );
StringValue sv2 = new StringValue( "" );
- assertEquals( "", sv2.get() );
+ assertEquals( "", sv2.getValue() );
}
@@ -289,21 +289,21 @@ public class StringValueTest
{
StringValue sv = new StringValue( (String)null );
- assertNull( sv.get() );
+ assertNull( sv.getValue() );
assertFalse( sv.isSchemaAware() );
assertTrue( sv.isValid( new Ia5StringSyntaxChecker() ) );
assertTrue( sv.isNull() );
sv = new StringValue( "" );
- assertNotNull( sv.get() );
- assertEquals( "", sv.get() );
+ assertNotNull( sv.getValue() );
+ assertEquals( "", sv.getValue() );
assertFalse( sv.isSchemaAware() );
assertTrue( sv.isValid( new Ia5StringSyntaxChecker() ) );
assertFalse( sv.isNull() );
sv = new StringValue( "Test" );
- assertNotNull( sv.get() );
- assertEquals( "Test", sv.get() );
+ assertNotNull( sv.getValue() );
+ assertEquals( "Test", sv.getValue() );
assertFalse( sv.isSchemaAware() );
assertTrue( sv.isValid( new Ia5StringSyntaxChecker() ) );
assertFalse( sv.isNull() );
@@ -530,7 +530,7 @@ public class StringValueTest
StringValue csvSer = deserializeValue( at, serializeValue( csv ) );
assertNotSame( csv, csvSer );
- assertEquals( csv.get(), csvSer.get() );
+ assertEquals( csv.getValue(), csvSer.getValue() );
assertEquals( csv.getNormValue(), csvSer.getNormValue() );
assertTrue( csvSer.isSchemaAware() );
}
@@ -547,8 +547,8 @@ public class StringValueTest
StringValue csvSer = deserializeValue( null, serializeValue( csv ) );
assertNotSame( csv, csvSer );
- assertEquals( csv.get(), csvSer.get() );
- assertEquals( csv.get(), csvSer.getNormValue() );
+ assertEquals( csv.getValue(), csvSer.getValue() );
+ assertEquals( csv.getValue(), csvSer.getNormValue() );
assertFalse( csvSer.isSchemaAware() );
}
@@ -565,7 +565,7 @@ public class StringValueTest
StringValue csvSer = deserializeValue( at, serializeValue( csv ) );
assertNotSame( csv, csvSer );
- assertEquals( csv.get(), csvSer.get() );
+ assertEquals( csv.getValue(), csvSer.getValue() );
assertEquals( csv.getNormValue(), csvSer.getNormValue() );
assertTrue( csvSer.isSchemaAware() );
}
@@ -583,7 +583,7 @@ public class StringValueTest
StringValue csvSer = deserializeValue( at, serializeValue( csv ) );
assertNotSame( csv, csvSer );
- assertEquals( csv.get(), csvSer.get() );
+ assertEquals( csv.getValue(), csvSer.getValue() );
assertEquals( csv.getNormValue(), csvSer.getNormValue() );
assertTrue( csvSer.isSchemaAware() );
}
@@ -601,7 +601,7 @@ public class StringValueTest
StringValue csvSer = deserializeValue( at, serializeValue( csv ) );
assertNotSame( csv, csvSer );
- assertEquals( csv.get(), csvSer.get() );
+ assertEquals( csv.getValue(), csvSer.getValue() );
assertEquals( csv.getNormValue(), csvSer.getNormValue() );
assertTrue( csvSer.isSchemaAware() );
}
@@ -618,7 +618,7 @@ public class StringValueTest
StringValue csvSer = deserializeValue( null, serializeValue( csv ) );
assertNotSame( csv, csvSer );
- assertEquals( csv.get(), csvSer.get() );
+ assertEquals( csv.getValue(), csvSer.getValue() );
assertEquals( csv.getNormValue(), csvSer.getNormValue() );
assertFalse( csvSer.isSchemaAware() );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java Wed Mar 30 14:58:15 2011
@@ -205,10 +205,10 @@ public class LdifAttributesReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
@@ -235,10 +235,10 @@ public class LdifAttributesReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
@@ -265,10 +265,10 @@ public class LdifAttributesReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
@@ -295,10 +295,10 @@ public class LdifAttributesReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
@@ -325,10 +325,10 @@ public class LdifAttributesReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java Wed Mar 30 14:58:15 2011
@@ -532,10 +532,10 @@ public class LdifReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
@@ -578,10 +578,10 @@ public class LdifReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
@@ -624,10 +624,10 @@ public class LdifReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
@@ -669,10 +669,10 @@ public class LdifReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
@@ -715,10 +715,10 @@ public class LdifReaderTest
assertTrue( attr.contains( "app1" ) );
attr = entry.get( "dependencies" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
attr = entry.get( "envvars" );
- assertNull( attr.get().get() );
+ assertNull( attr.get().getValue() );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java Wed Mar 30 14:58:15 2011
@@ -171,8 +171,8 @@ public class FastDnParserTest
assertEquals( "a", dn.getRdn().getAva().getUpType() );
assertEquals( "a", dn.getRdn().getAva().getNormType() );
- assertEquals( "b", dn.getRdn().getAva().getUpValue().get() );
- assertEquals( "b", dn.getRdn().getAva().getNormValue().get() );
+ assertEquals( "b", dn.getRdn().getAva().getUpValue().getValue() );
+ assertEquals( "b", dn.getRdn().getAva().getNormValue().getValue() );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java Wed Mar 30 14:58:15 2011
@@ -373,7 +373,7 @@ public class ExportDsmlRunnable implemen
{
Value<?> value = ( Value<?> ) iterator.next();
- srr.addSearchResultReference( new LdapUrl( ( String ) value.get() ) );
+ srr.addSearchResultReference( new LdapUrl( ( String ) value.getValue() ) );
}
}