From fcdc29df49302ebbed9cbe9c88b5646a0809aa8a Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 12 Jul 2013 16:45:22 +0200 Subject: [PATCH] DATAMONGO-723 - Cleand up a few misnamed test cases. Reactivated test cases that were name Test instead of Tests by accident. --- spring-data-mongodb-log4j/README.md | 2 +- ...> MongoLog4jAppenderIntegrationTests.java} | 54 ++++++++-------- .../src/test/resources/log4j.properties | 9 +-- ...ringToWriteConcernConverterUnitTests.java} | 2 +- ... => MongoFactoryBeanIntegrationTests.java} | 2 +- .../data/mongodb/core/SomeEnumTest.java | 64 ------------------- ...=> ValidatingMongoEventListenerTests.java} | 2 +- ...datingMongoEventListenerTests-context.xml} | 2 +- 8 files changed, 34 insertions(+), 103 deletions(-) rename spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/{AppenderTest.java => MongoLog4jAppenderIntegrationTests.java} (61%) rename spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/{StringToWriteConcernConverterUnitTest.java => StringToWriteConcernConverterUnitTests.java} (95%) rename spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/{MongoFactoryBeanIntegrationTest.java => MongoFactoryBeanIntegrationTests.java} (98%) delete mode 100644 spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SomeEnumTest.java rename spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/{ValidatingMongoEventListenerTest.java => ValidatingMongoEventListenerTests.java} (97%) rename spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/core/mapping/event/{ValidatingMongoEventListenerTest-context.xml => ValidatingMongoEventListenerTests-context.xml} (95%) diff --git a/spring-data-mongodb-log4j/README.md b/spring-data-mongodb-log4j/README.md index b938bb397..ed4c96d3a 100644 --- a/spring-data-mongodb-log4j/README.md +++ b/spring-data-mongodb-log4j/README.md @@ -32,7 +32,7 @@ An example log entry might look like: { "_id" : ObjectId("4d89341a8ef397e06940d5cd"), "applicationId" : "my.application", - "name" : "org.springframework.data.mongodb.log4j.AppenderTest", + "name" : "org.springframework.data.mongodb.log4j.MongoLog4jAppenderIntegrationTests", "level" : "DEBUG", "timestamp" : ISODate("2011-03-23T16:53:46.778Z"), "properties" : { diff --git a/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/AppenderTest.java b/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderIntegrationTests.java similarity index 61% rename from spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/AppenderTest.java rename to spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderIntegrationTests.java index de02fe58c..1f8c669d1 100644 --- a/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/AppenderTest.java +++ b/spring-data-mongodb-log4j/src/test/java/org/springframework/data/mongodb/log4j/MongoLog4jAppenderIntegrationTests.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011 by the original author(s). + * Copyright 2011-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,63 +13,65 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.mongodb.log4j; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import java.net.UnknownHostException; import java.util.Calendar; -import com.mongodb.DB; -import com.mongodb.DBCursor; -import com.mongodb.Mongo; import org.apache.log4j.Logger; import org.apache.log4j.MDC; import org.junit.Before; import org.junit.Test; +import com.mongodb.DB; +import com.mongodb.DBCursor; +import com.mongodb.Mongo; + /** - * @author Jon Brisbin + * Integration tests for {@link MongoLog4jAppender}. + * + * @author Jon Brisbin + * @author Oliver Gierke */ -public class AppenderTest { +public class MongoLog4jAppenderIntegrationTests { - private static final String NAME = AppenderTest.class.getName(); - private Logger log = Logger.getLogger(NAME); - private Mongo mongo; - private DB db; - private String collection; + static final String NAME = MongoLog4jAppenderIntegrationTests.class.getName(); + + Logger log = Logger.getLogger(NAME); + Mongo mongo; + DB db; + String collection; @Before - public void setup() { - try { - mongo = new Mongo("localhost", 27017); - db = mongo.getDB("logs"); - Calendar now = Calendar.getInstance(); - collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1); - db.getCollection(collection).drop(); - } catch (UnknownHostException e) { - throw new RuntimeException(e.getMessage(), e); - } + public void setUp() throws Exception { + + mongo = new Mongo("localhost", 27017); + db = mongo.getDB("logs"); + + Calendar now = Calendar.getInstance(); + collection = String.valueOf(now.get(Calendar.YEAR)) + String.format("%1$02d", now.get(Calendar.MONTH) + 1); + db.getCollection(collection).drop(); } @Test public void testLogging() { + log.debug("DEBUG message"); log.info("INFO message"); log.warn("WARN message"); log.error("ERROR message"); DBCursor msgs = db.getCollection(collection).find(); - assertThat(msgs.count(), is(4)); + assertThat(msgs.count(), is(4)); } @Test public void testProperties() { + MDC.put("property", "one"); log.debug("DEBUG message"); } - } diff --git a/spring-data-mongodb-log4j/src/test/resources/log4j.properties b/spring-data-mongodb-log4j/src/test/resources/log4j.properties index 1bd597cbc..88459b3ff 100644 --- a/spring-data-mongodb-log4j/src/test/resources/log4j.properties +++ b/spring-data-mongodb-log4j/src/test/resources/log4j.properties @@ -10,11 +10,4 @@ log4j.appender.stdout.collectionPattern = %X{year}%X{month} log4j.appender.stdout.applicationId = my.application log4j.appender.stdout.warnOrHigherWriteConcern = FSYNC_SAFE -log4j.category.org.apache.activemq=ERROR -log4j.category.org.springframework.batch=DEBUG -log4j.category.org.springframework.data.document.mongodb=DEBUG -log4j.category.org.springframework.transaction=INFO - -log4j.category.org.hibernate.SQL=DEBUG -# for debugging datasource initialization -# log4j.category.test.jdbc=DEBUG +log4j.category.org.springframework.data.mongodb=DEBUG diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTest.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java similarity index 95% rename from spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTest.java rename to spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java index 5e8d0fbcd..f1aa0d2aa 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTest.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java @@ -27,7 +27,7 @@ import com.mongodb.WriteConcern; * * @author Oliver Gierke */ -public class StringToWriteConcernConverterUnitTest { +public class StringToWriteConcernConverterUnitTests { StringToWriteConcernConverter converter = new StringToWriteConcernConverter(); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoFactoryBeanIntegrationTest.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoFactoryBeanIntegrationTests.java similarity index 98% rename from spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoFactoryBeanIntegrationTest.java rename to spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoFactoryBeanIntegrationTests.java index 5abe37dbd..1d6045523 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoFactoryBeanIntegrationTest.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoFactoryBeanIntegrationTests.java @@ -35,7 +35,7 @@ import com.mongodb.WriteConcern; * @author Oliver Gierke * @author Thomas Darimont */ -public class MongoFactoryBeanIntegrationTest { +public class MongoFactoryBeanIntegrationTests { /** * @see DATAMONGO-408 diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SomeEnumTest.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SomeEnumTest.java deleted file mode 100644 index 143938e30..000000000 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SomeEnumTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.springframework.data.mongodb.core; - -public class SomeEnumTest { - - public enum StringEnum { - ONE, TWO, FIVE; - } - - public enum NumberEnum { - ONE(1), TWO(2), FIVE(5); - - private int value; - - public int value() { - return value; - } - - NumberEnum(int value) { - this.value = value; - } - - } - - private StringEnum stringEnum; - - private NumberEnum numberEnum; - - private String id; - - private String name; - - public StringEnum getStringEnum() { - return stringEnum; - } - - public void setStringEnum(StringEnum stringEnum) { - this.stringEnum = stringEnum; - } - - public NumberEnum getNumberEnum() { - return numberEnum; - } - - public void setNumberEnum(NumberEnum numberEnum) { - this.numberEnum = numberEnum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - -} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTest.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java similarity index 97% rename from spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTest.java rename to spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java index fff4fdf5c..9eba54c61 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTest.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java @@ -36,7 +36,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration -public class ValidatingMongoEventListenerTest { +public class ValidatingMongoEventListenerTests { @Autowired MongoTemplate mongoTemplate; diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTest-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests-context.xml similarity index 95% rename from spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTest-context.xml rename to spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests-context.xml index 2e03229b7..97797b984 100644 --- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTest-context.xml +++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests-context.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - +