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 2014/05/17 15:31:25 UTC
svn commit: r1595477 [8/8] - in /directory/mavibot/trunk: ./ mavibot/img/
mavibot/src/main/java/org/apache/directory/mavibot/btree/
mavibot/src/main/java/org/apache/directory/mavibot/btree/comparator/
mavibot/src/main/java/org/apache/directory/mavibot/...
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongSerializerTest.java?rev=1595477&r1=1595476&r2=1595477&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/LongSerializerTest.java Sat May 17 13:31:23 2014
@@ -29,14 +29,11 @@ import org.junit.Test;
/**
* Test the LongSerializer class
- *
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LongSerializerTest
{
- private static LongSerializer serializer = new LongSerializer();
-
-
@Test
public void testLongSerializer() throws IOException
{
@@ -52,7 +49,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000000000001L;
@@ -67,7 +64,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x00000000000000FFL;
@@ -82,7 +79,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000000000100L;
@@ -97,7 +94,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x000000000000FFFFL;
@@ -112,7 +109,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000000010000L;
@@ -127,7 +124,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000000FFFFFFL;
@@ -142,7 +139,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000001000000L;
@@ -157,7 +154,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x000000007FFFFFFFL;
@@ -172,7 +169,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000080000000L;
@@ -187,7 +184,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x00000000FFFFFFFFL;
@@ -202,7 +199,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000000100000000L;
@@ -217,7 +214,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x000000FFFFFFFFFFL;
@@ -232,7 +229,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000010000000000L;
@@ -247,7 +244,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0000FFFFFFFFFFFFL;
@@ -262,7 +259,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0001000000000000L;
@@ -277,7 +274,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x01, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x00FFFFFFFFFFFFFFL;
@@ -292,7 +289,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x0100000000000000L;
@@ -307,7 +304,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x01, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x7FFFFFFFFFFFFFFFL;
@@ -322,7 +319,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x7F, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0x8000000000000000L;
@@ -337,7 +334,7 @@ public class LongSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x80, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
// ------------------------------------------------------------------
value = 0xFFFFFFFFFFFFFFFFL;
@@ -352,6 +349,6 @@ public class LongSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0xFF, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).longValue() );
+ assertEquals( value, LongSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).longValue() );
}
}
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ShortSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ShortSerializerTest.java?rev=1595477&r1=1595476&r2=1595477&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ShortSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/ShortSerializerTest.java Sat May 17 13:31:23 2014
@@ -29,14 +29,11 @@ import org.junit.Test;
/**
* Test the ShortSerializer class
- *
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ShortSerializerTest
{
- private static ShortSerializer serializer = new ShortSerializer();
-
-
@Test
public void testShortSerializer() throws IOException
{
@@ -46,7 +43,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
+ assertEquals( value, ShortSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = 0x0001;
@@ -55,7 +52,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0x01, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
+ assertEquals( value, ShortSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = 0x00FF;
@@ -64,7 +61,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x00, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
+ assertEquals( value, ShortSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = 0x0100;
@@ -73,7 +70,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x01, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
+ assertEquals( value, ShortSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = 0x7FFF;
@@ -82,7 +79,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0x7F, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
+ assertEquals( value, ShortSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = ( short ) 0x8000;
@@ -91,7 +88,7 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0x00, result[1] );
assertEquals( ( byte ) 0x80, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
+ assertEquals( value, ShortSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).shortValue() );
// ------------------------------------------------------------------
value = ( short ) 0xFFFF;
@@ -100,6 +97,6 @@ public class ShortSerializerTest
assertEquals( ( byte ) 0xFF, result[1] );
assertEquals( ( byte ) 0xFF, result[0] );
- assertEquals( value, serializer.deserialize( new BufferHandler( result ) ).shortValue() );
+ assertEquals( value, ShortSerializer.INSTANCE.deserialize( new BufferHandler( result ) ).shortValue() );
}
}
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/StringSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/StringSerializerTest.java?rev=1595477&r1=1595476&r2=1595477&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/StringSerializerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/serializer/StringSerializerTest.java Sat May 17 13:31:23 2014
@@ -29,12 +29,12 @@ import org.junit.Test;
/**
* Test the StringSerializer class
- *
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StringSerializerTest
{
- private static StringSerializer serializer = new StringSerializer();
+ private static StringSerializer serializer = StringSerializer.INSTANCE;
@Test
Modified: directory/mavibot/trunk/mavibot/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/resources/log4j.properties?rev=1595477&r1=1595476&r2=1595477&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/resources/log4j.properties (original)
+++ directory/mavibot/trunk/mavibot/src/test/resources/log4j.properties Sat May 17 13:31:23 2014
@@ -14,11 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#############################################################################
-log4j.rootCategory=OFF, stdout
+log4j.rootCategory=DEBUG, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c-%X{Replica}] - %m%n
+log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
#log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c-%X{Replica}] %C{1}.%M@%L - %m%n
log4j.appender.file=org.apache.log4j.RollingFileAppender
@@ -30,3 +30,6 @@ log4j.appender.file.MaxBackupIndex=100
#log4j.logger.org=FATAL
log4j.logger.org.apache.directory.mavibot.btree=ERROR
+log4j.logger.LOG_PAGES=ERROR
+log4j.logger.LOG_CHECK=ERROR
+log4j.logger.net.sf.ehcache.Cache=ERROR