You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2016/03/16 01:20:51 UTC
[07/38] logging-log4j2 git commit: Remove unused test support class.
Remove unused test support class.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3d4fb630
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3d4fb630
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3d4fb630
Branch: refs/heads/LOG4J2-1116
Commit: 3d4fb63050aab105e3d960f449b4b2f45a5cca3b
Parents: c48bfc5
Author: Matt Sicker <bo...@gmail.com>
Authored: Wed Mar 9 10:57:35 2016 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Wed Mar 9 10:57:35 2016 -0600
----------------------------------------------------------------------
.../apache/logging/log4j/core/util/Compare.java | 134 -------------------
1 file changed, 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3d4fb630/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Compare.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Compare.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Compare.java
deleted file mode 100644
index 57401d1..0000000
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Compare.java
+++ /dev/null
@@ -1,134 +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.logging.log4j.core.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-public class Compare {
- static final int B1_NULL = -1;
- static final int B2_NULL = -2;
-
- private static final InputStream open(
- final Class<?> testClass,
- final String fileName) throws IOException {
- final String resourceName = fileName;
- /* if (fileName.startsWith("witness/")) {
- resourceName = fileName.substring(fileName.lastIndexOf('/') + 1);
- } */
- InputStream is = testClass.getResourceAsStream(resourceName);
- if (is == null) {
- is = testClass.getClassLoader().getResourceAsStream(resourceName);
- }
- if (is == null) {
- final File file = new File(fileName);
- if (file.exists()) {
- is = new FileInputStream(file);
- } else {
- throw new FileNotFoundException("Resource "
- + resourceName + " not found");
- }
- }
- return is;
- }
-
- public static boolean compare(final Class<?> testClass,
- final String file1,
- final String file2)
- throws IOException {
- try (final BufferedReader in1 = new BufferedReader(new FileReader(file1));
- final BufferedReader in2 = new BufferedReader(new InputStreamReader(open(testClass, file2)))) {
- return compare(testClass, file1, file2, in1, in2);
- }
- }
-
- public static boolean compare(
- final Class<?> testClass, final String file1, final String file2, final BufferedReader in1, final BufferedReader in2) throws IOException {
-
- String s1;
- int lineCounter = 0;
-
- while ((s1 = in1.readLine()) != null) {
- lineCounter++;
-
- final String s2 = in2.readLine();
-
- if (!s1.equals(s2)) {
- System.out.println(
- "Files [" + file1 + "] and [" + file2 + "] differ on line "
- + lineCounter);
- System.out.println("One reads: [" + s1 + "].");
- System.out.println("Other reads:[" + s2 + "].");
- outputFile(testClass, file1);
- outputFile(testClass, file2);
-
- return false;
- }
- }
-
- // the second file is longer
- if (in2.read() != -1) {
- System.out.println(
- "File [" + file2 + "] longer than file [" + file1 + "].");
- outputFile(testClass, file1);
- outputFile(testClass, file2);
-
- return false;
- }
-
- return true;
- }
-
- /**
- * Prints file on the console.
- */
- private static void outputFile(final Class<?> testClass, final String file)
- throws IOException {
- final InputStream is = open(testClass, file);
- final BufferedReader in1 = new BufferedReader(new InputStreamReader(is));
-
- String s1;
- int lineCounter = 0;
- System.out.println("--------------------------------");
- System.out.println("Contents of " + file + ':');
-
- while ((s1 = in1.readLine()) != null) {
- lineCounter++;
- System.out.print(lineCounter);
-
- if (lineCounter < 10) {
- System.out.print(" : ");
- } else if (lineCounter < 100) {
- System.out.print(" : ");
- } else if (lineCounter < 1000) {
- System.out.print(" : ");
- } else {
- System.out.print(": ");
- }
-
- System.out.println(s1);
- }
- in1.close();
- }
-}