rsitze 02/02/25 09:37:25
Modified: java/test/utils PackageTests.java TestSrcContent.java
Log:
Updated tests to verify use of I18N for log.(info|warn|error|fatal)
Revision Changes Path
1.7 +1 -1 xml-axis/java/test/utils/PackageTests.java
Index: PackageTests.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/utils/PackageTests.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PackageTests.java 25 Feb 2002 10:53:40 -0000 1.6
+++ PackageTests.java 25 Feb 2002 17:37:25 -0000 1.7
@@ -23,7 +23,7 @@
suite.addTest(TestJavaUtils.suite());
suite.addTest(TestXMLUtils.suite());
suite.addTest(TestMessages.suite());
- //suite.addTest(TestSrcContent.suite());
+ suite.addTest(TestSrcContent.suite());
return suite;
}
1.4 +17 -3 xml-axis/java/test/utils/TestSrcContent.java
Index: TestSrcContent.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/utils/TestSrcContent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestSrcContent.java 22 Feb 2002 23:39:47 -0000 1.3
+++ TestSrcContent.java 25 Feb 2002 17:37:25 -0000 1.4
@@ -121,7 +121,7 @@
matcher.contains(content, contentPattern) != expectContent;
}
- String getContent() { return contentPattern.getPattern(); }
+ String getContentPattern() { return contentPattern.getPattern(); }
boolean getExpectContent() { return expectContent; }
};
@@ -151,12 +151,26 @@
new FileNameContentPattern(".+([\\\\/])"
+ "java\\1src\\1org\\1apache\\1axis\\1"
+ "(?!utils\\1tcpmon\\.java"
+ + "|client\\1AdminClient\\.java"
+ "|providers\\1BSFProvider\\.java"
+ "|Version\\.java"
+ "|wsdl\\1)"
+ "([a-zA-Z0-9_]+\\1)*"
+ "[^\\\\/]+\\.java",
- "System\\.(out|err)\\.println", false)
+ "System\\.(out|err)\\.println", false),
+
+ // Verify that internationalization is being used properly..
+ new FileNameContentPattern(".+([\\\\/])"
+ + "java\\1src\\1org\\1apache\\1axis\\1"
+ + "(?!utils\\1tcpmon\\.java"
+ + "|handlers\\1LogMessage\\.java"
+ + "|utils\\1Admin\\.java"
+ + "|wsdl\\1)"
+ + "([a-zA-Z0-9_]+\\1)*"
+ + "[^\\\\/]+\\.java",
+ "log\\.(info|warn|error|fatal)[ \\t]*\\((?![
\\t]*JavaUtils\\.getMessage)",
+ false),
+
};
private void checkFile(File file) {
@@ -174,7 +188,7 @@
+ (avoidPatterns[i].getExpectContent()
? "Expected: "
: "Unexpected: ")
- + avoidPatterns[i].getContent()
+ + avoidPatterns[i].getContentPattern()
+ LS;
}
}
