http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6894a87b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java~ ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java~ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java~ new file mode 100644 index 0000000..4f372ed --- /dev/null +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java~ @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.logger.log4j2; + +import java.net.URL; +import java.util.UUID; +import junit.framework.TestCase; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.logger.log4j2.Log4J2Logger; +import org.apache.ignite.testframework.junits.common.GridCommonTest; + +/** + * Log4j initialized test. + */ +@GridCommonTest(group = "Logger") +public class GridLog4j2InitializedTest extends TestCase { + + /** + * @throws Exception If failed. + */ + @Override + protected void setUp() throws Exception { + + } + + /** */ + public void testLogInitialize() { + + IgniteConfiguration cfg = new IgniteConfiguration(); + + cfg.setGridName("grid" + 1); + cfg.setNodeId(new UUID(1, 1)); + cfg.setIgniteHome("/home/glutters/Documenti/apache-ignite/ignite-master/incubator-ignite/"); + + URL xml = U.resolveIgniteUrl("config/ignite-log4j2.xml"); + IgniteLogger log; + try { + + log = new Log4J2Logger(xml); + // log.isQuiet(); + cfg.setGridLogger(log); + } catch (IgniteCheckedException e) { + e.printStackTrace(); + return; + } + + assert log.isInfoEnabled() == true; + + if (log.isDebugEnabled()) + log.debug("This is 'debug' message."); + + log.info("This is 'info' message."); + log.warning("This is 'warning' message."); + log.warning("This is 'warning' message.", new Exception( + "It's a test warning exception")); + log.error("This is 'error' message."); + + assert log.getLogger(GridLog4j2InitializedTest.class.getName()) instanceof Log4J2Logger; + } + +}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6894a87b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2LoggingFileTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2LoggingFileTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2LoggingFileTest.java new file mode 100644 index 0000000..4f5b5fd --- /dev/null +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2LoggingFileTest.java @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.logger.log4j2; + +import java.io.File; +import java.util.UUID; + +import junit.framework.TestCase; + +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.logger.LoggerNodeIdAware; +import org.apache.ignite.logger.log4j2.Log4J2Logger; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; + +/** + * Grid Log4j SPI test. + */ +public class GridLog4j2LoggingFileTest extends TestCase { + /** */ + private IgniteLogger log; + + /** {@inheritDoc} */ + @Override + protected void setUp() throws Exception { + + + File xml = GridTestUtils + .resolveIgnitePath("modules/core/src/test/config/log4j2-test.xml"); + + assert xml != null; + assert xml.exists() == true; + + log = new Log4J2Logger(xml).getLogger(getClass()); + ((LoggerNodeIdAware) log).setNodeId(UUID.randomUUID()); + + } + + /** + * Tests log4j logging SPI. + */ + @Test + public void testLog() { + assert log.isDebugEnabled() == true; + assert log.isInfoEnabled() == true; + + log.debug("This is 'debug' message."); + log.info("This is 'info' message."); + log.warning("This is 'warning' message."); + log.warning("This is 'warning' message.", new Exception( + "It's a test warning exception")); + log.error("This is 'error' message."); + log.error("This is 'error' message.", new Exception( + "It's a test error exception")); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6894a87b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2LoggingFileTest.java~ ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2LoggingFileTest.java~ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2LoggingFileTest.java~ new file mode 100644 index 0000000..c414bdf --- /dev/null +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2LoggingFileTest.java~ @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.logger.log4j2; + +import java.io.File; +import java.util.UUID; + +import junit.framework.TestCase; + +import org.apache.ignite.IgniteLogger; +import org.apache.ignite.logger.LoggerNodeIdAware; +import org.apache.ignite.logger.log4j2.Log4J2Logger; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; + +/** + * Grid Log4j SPI test. + */ +public class GridLog4j2LoggingFileTest extends TestCase { + /** */ + private IgniteLogger log; + + /** {@inheritDoc} */ + @Override + protected void setUp() throws Exception { + + System.setProperty("IGNITE_HOME", + "/home/glutters/Documenti/apache-ignite/commit-patch-788/incubator-ignite"); + + File xml = GridTestUtils + .resolveIgnitePath("modules/core/src/test/config/log4j2-test.xml"); + + assert xml != null; + assert xml.exists() == true; + + log = new Log4J2Logger(xml).getLogger(getClass()); + ((LoggerNodeIdAware) log).setNodeId(UUID.randomUUID()); + + } + + /** + * Tests log4j logging SPI. + */ + @Test + public void testLog() { + assert log.isDebugEnabled() == true; + assert log.isInfoEnabled() == true; + + log.debug("This is 'debug' message."); + log.info("This is 'info' message."); + log.warning("This is 'warning' message."); + log.warning("This is 'warning' message.", new Exception( + "It's a test warning exception")); + log.error("This is 'error' message."); + log.error("This is 'error' message.", new Exception( + "It's a test error exception")); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6894a87b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/package-info.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/package-info.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/package-info.java new file mode 100644 index 0000000..523478f --- /dev/null +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * <!-- Package description. --> + * Contains internal tests or test related classes and interfaces. + */ +package org.apache.ignite.logger.log4j2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6894a87b/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java b/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java new file mode 100644 index 0000000..d025332 --- /dev/null +++ b/modules/log4j2/src/test/java/org/apache/ignite/testsuites/IgniteLog4j2TestSuite.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.testsuites; + +import org.apache.ignite.logger.log4j2.GridLog4j2CorrectFileNameTest; +import org.apache.ignite.logger.log4j2.GridLog4j2InitializedTest; +import org.apache.ignite.logger.log4j2.GridLog4j2LoggingFileTest; + +import junit.framework.TestSuite; + +/** + * Log4j2 logging tests. + */ +public class IgniteLog4j2TestSuite extends TestSuite { + /** + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("Log4j2 Logging Test Suite"); + + suite.addTest(new TestSuite(GridLog4j2InitializedTest.class)); + suite.addTest(new TestSuite(GridLog4j2CorrectFileNameTest.class)); + suite.addTest(new TestSuite(GridLog4j2LoggingFileTest.class)); + return suite; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6894a87b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2ae259c..4d53d96 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,7 @@ <module>modules/jta</module> <module>modules/aws</module> <module>modules/log4j</module> + <module>modules/log4j2</module> <module>modules/slf4j</module> <module>modules/jcl</module> <module>modules/codegen</module>
