ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [23/50] incubator-ignite git commit: * Update javadoc with new class name. * Rename test class name to match the class it's testing.
Date Wed, 29 Apr 2015 12:32:48 GMT
* Update javadoc with new class name.
* Rename test class name to match the class it's testing.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d0956ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d0956ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d0956ad

Branch: refs/heads/ignite-500
Commit: 0d0956ad74d7be3d493446fbb86bc02a4f1e02fb
Parents: 19bd611
Author: Cosmin Stroe <cstroe@gmail.com>
Authored: Fri Apr 24 12:26:42 2015 -0500
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Tue Apr 28 12:53:54 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/logger/java/JavaLogger.java   |  4 +-
 .../logger/java/IgniteJavaLoggerTest.java       | 65 --------------------
 .../ignite/logger/java/JavaLoggerTest.java      | 65 ++++++++++++++++++++
 .../testsuites/IgniteLoggingSelfTestSuite.java  |  2 +-
 4 files changed, 68 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d0956ad/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
index cdfe118..ab9bc61 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
@@ -40,7 +40,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * <pre name="code" class="xml">
  *      ...
  *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.apache.ignite.logger.java.IgniteJavaLogger"&gt;
+ *          &lt;bean class="org.apache.ignite.logger.java.JavaLogger"&gt;
  *              &lt;constructor-arg type="java.util.logging.Logger"&gt;
  *                  &lt;bean class="java.util.logging.Logger"&gt;
  *                      &lt;constructor-arg type="java.lang.String" value="global"/&gt;
@@ -54,7 +54,7 @@ import static org.apache.ignite.IgniteSystemProperties.*;
  * <pre name="code" class="xml">
  *      ...
  *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.apache.ignite.logger.java.IgniteJavaLogger"/&gt;
+ *          &lt;bean class="org.apache.ignite.logger.java.JavaLogger"/&gt;
  *      &lt;/property&gt;
  *      ...
  * </pre>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d0956ad/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
b/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
deleted file mode 100644
index 9895c07..0000000
--- a/modules/core/src/test/java/org/apache/ignite/logger/java/IgniteJavaLoggerTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.java;
-
-import junit.framework.*;
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.logger.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-/**
- * Java logger test.
- */
-@GridCommonTest(group = "Logger")
-public class IgniteJavaLoggerTest extends TestCase {
-    /** */
-    @SuppressWarnings({"FieldCanBeLocal"})
-    private IgniteLogger log;
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testLogInitialize() throws Exception {
-        U.setWorkDirectory(null, U.getIgniteHome());
-
-        log = new JavaLogger();
-
-        ((LoggerNodeIdAware)log).setNodeId(UUID.fromString("00000000-1111-2222-3333-444444444444"));
-
-        if (log.isDebugEnabled())
-            log.debug("This is 'debug' message.");
-
-        assert log.isInfoEnabled();
-
-        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"));
-
-        assert log.getLogger(IgniteJavaLoggerTest.class.getName()) instanceof JavaLogger;
-
-        assert log.fileName() != null;
-
-        // Ensure we don't get pattern, only actual file name is allowed here.
-        assert !log.fileName().contains("%");
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d0956ad/modules/core/src/test/java/org/apache/ignite/logger/java/JavaLoggerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/logger/java/JavaLoggerTest.java
b/modules/core/src/test/java/org/apache/ignite/logger/java/JavaLoggerTest.java
new file mode 100644
index 0000000..70d6860
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/logger/java/JavaLoggerTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.java;
+
+import junit.framework.*;
+import org.apache.ignite.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.logger.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.util.*;
+
+/**
+ * Java logger test.
+ */
+@GridCommonTest(group = "Logger")
+public class JavaLoggerTest extends TestCase {
+    /** */
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private IgniteLogger log;
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testLogInitialize() throws Exception {
+        U.setWorkDirectory(null, U.getIgniteHome());
+
+        log = new JavaLogger();
+
+        ((LoggerNodeIdAware)log).setNodeId(UUID.fromString("00000000-1111-2222-3333-444444444444"));
+
+        if (log.isDebugEnabled())
+            log.debug("This is 'debug' message.");
+
+        assert log.isInfoEnabled();
+
+        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"));
+
+        assert log.getLogger(JavaLoggerTest.class.getName()) instanceof JavaLogger;
+
+        assert log.fileName() != null;
+
+        // Ensure we don't get pattern, only actual file name is allowed here.
+        assert !log.fileName().contains("%");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d0956ad/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
index 1a80f6b..00ccdd3 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLoggingSelfTestSuite.java
@@ -30,7 +30,7 @@ public class IgniteLoggingSelfTestSuite extends TestSuite {
    public static TestSuite suite() {
        TestSuite suite = new TestSuite("Ignite Logging Test Suite");
 
-       suite.addTest(new TestSuite(IgniteJavaLoggerTest.class));
+       suite.addTest(new TestSuite(JavaLoggerTest.class));
 
        return suite;
    }


Mime
View raw message