From e260b2ce7b2fc22b95ae1ac6d5f136d725323cc8 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 17 Aug 2007 21:57:02 +0000
Subject: [PATCH] - Restored running of messages tests to precommit target - Fixed broken SeverityTest - Added test to check for duplicate keys in messages properties files
---
opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java | 219 +++++++++++++++++++++++++++---------------------------
1 files changed, 108 insertions(+), 111 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java
index c6a1c00..fd4b070 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-
+
package org.opends.messages;
import static org.testng.Assert.*;
@@ -34,129 +34,126 @@
/**
* Severity Tester.
- *
*/
-public class SeverityTest
-{
+public class SeverityTest extends MessagesTestCase {
- @DataProvider(name = "severities")
- public Object[][] getSeverities() {
- return new Object[][] {
- { Severity.DEBUG },
- { Severity.FATAL_ERROR },
- { Severity.INFORMATION },
- { Severity.MILD_ERROR },
- { Severity.MILD_WARNING },
- { Severity.NOTICE },
- { Severity.SEVERE_ERROR },
- { Severity.SEVERE_WARNING }
- };
- }
+ @DataProvider(name = "messageDescriptors")
+ public Object[][] getMessageDescriptors() {
+ return new Object[][]{
+ {CoreMessages.ERR_ABANDON_OP_NO_SUCH_OPERATION}
+ };
+ }
- @Test(dataProvider = "severities")
- public void testGetPropertyKeyFormSet(Severity severity)
- {
- Set s = Severity.getPropertyKeyFormSet();
- assertTrue(s.contains(severity));
- }
+ @DataProvider(name = "severities")
+ public Object[][] getSeverities() {
+ return new Object[][]{
+ {Severity.DEBUG},
+ {Severity.FATAL_ERROR},
+ {Severity.INFORMATION},
+ {Severity.MILD_ERROR},
+ {Severity.MILD_WARNING},
+ {Severity.NOTICE},
+ {Severity.SEVERE_ERROR},
+ {Severity.SEVERE_WARNING}
+ };
+ }
- @DataProvider(name = "severities and masks")
- public Object[][] getSeveritiesAndMasks() {
- return new Object[][] {
- { Severity.DEBUG, 0x00060000 },
- { Severity.FATAL_ERROR, 0x00050000 },
- { Severity.INFORMATION, 0x00000000 },
- { Severity.MILD_ERROR, 0x00030000 },
- { Severity.MILD_WARNING, 0x00010000 },
- { Severity.NOTICE, 0x00070000 },
- { Severity.SEVERE_ERROR, 0x00040000 },
- { Severity.SEVERE_WARNING, 0x00020000 }
- };
- }
+ @DataProvider(name = "severities and pk names")
+ public Object[][] getSeveritiesAndPropertyKeyNames() {
+ return new Object[][]{
+ {Severity.DEBUG, "DEBUG"},
+ {Severity.FATAL_ERROR, "FATAL_ERR"},
+ {Severity.INFORMATION, "INFO"},
+ {Severity.MILD_ERROR, "MILD_ERR"},
+ {Severity.MILD_WARNING, "MILD_WARN"},
+ {Severity.NOTICE, "NOTICE"},
+ {Severity.SEVERE_ERROR, "SEVERE_ERR"},
+ {Severity.SEVERE_WARNING, "SEVERE_WARN"}
+ };
+ }
- @Test(dataProvider = "severities and masks")
- public void testParseMask(Severity s, int mask) {
- assertEquals(Severity.parseMask(mask), s);
- }
+ @DataProvider(name = "severities and md names")
+ public Object[][] getSeveritiesAndMessageDescriptorNames() {
+ return new Object[][]{
+ {Severity.DEBUG, "DEBUG"},
+ {Severity.FATAL_ERROR, "ERR"},
+ {Severity.INFORMATION, "INFO"},
+ {Severity.MILD_ERROR, "ERR"},
+ {Severity.MILD_WARNING, "WARN"},
+ {Severity.NOTICE, "NOTE"},
+ {Severity.SEVERE_ERROR, "ERR"},
+ {Severity.SEVERE_WARNING, "WARN"}
+ };
+ }
- @DataProvider(name = "severities and strings")
- public Object[][] getSeveritiesAndStrings() {
- return new Object[][] {
- { Severity.DEBUG, "DEBUG" },
- { Severity.FATAL_ERROR, "FATAL_ERR" },
- { Severity.FATAL_ERROR, "FATAL_ERROR" },
- { Severity.INFORMATION, "INFO" },
- { Severity.INFORMATION, "INFORMATION" },
- { Severity.MILD_ERROR, "MILD_ERR" },
- { Severity.MILD_ERROR, "MILD_ERROR" },
- { Severity.MILD_WARNING, "MILD_WARN" },
- { Severity.MILD_WARNING, "MILD_WARNING" },
- { Severity.NOTICE, "NOTICE" },
- { Severity.SEVERE_ERROR, "SEVERE_ERR" },
- { Severity.SEVERE_ERROR, "SEVERE_ERROR" },
- { Severity.SEVERE_WARNING, "SEVERE_WARN" },
- { Severity.SEVERE_WARNING, "SEVERE_WARNING" }
- };
- }
+ @DataProvider(name = "severities and masks")
+ public Object[][] getSeveritiesAndMasks() {
+ return new Object[][]{
+ {Severity.DEBUG, 0x00060000},
+ {Severity.FATAL_ERROR, 0x00050000},
+ {Severity.INFORMATION, 0x00000000},
+ {Severity.MILD_ERROR, 0x00030000},
+ {Severity.MILD_WARNING, 0x00010000},
+ {Severity.NOTICE, 0x00070000},
+ {Severity.SEVERE_ERROR, 0x00040000},
+ {Severity.SEVERE_WARNING, 0x00020000}
+ };
+ }
- @Test(dataProvider = "severities and strings")
- public void testParseString(Severity sev, String s) {
- assertEquals(Severity.parseString(s), sev);
- }
+ @DataProvider(name = "severities and strings")
+ public Object[][] getSeveritiesAndStrings() {
+ return new Object[][]{
+ {Severity.DEBUG, "DEBUG"},
+ {Severity.FATAL_ERROR, "FATAL_ERR"},
+ {Severity.FATAL_ERROR, "FATAL_ERROR"},
+ {Severity.INFORMATION, "INFO"},
+ {Severity.INFORMATION, "INFORMATION"},
+ {Severity.MILD_ERROR, "MILD_ERR"},
+ {Severity.MILD_ERROR, "MILD_ERROR"},
+ {Severity.MILD_WARNING, "MILD_WARN"},
+ {Severity.MILD_WARNING, "MILD_WARNING"},
+ {Severity.NOTICE, "NOTICE"},
+ {Severity.SEVERE_ERROR, "SEVERE_ERR"},
+ {Severity.SEVERE_ERROR, "SEVERE_ERROR"},
+ {Severity.SEVERE_WARNING, "SEVERE_WARN"},
+ {Severity.SEVERE_WARNING, "SEVERE_WARNING"}
+ };
+ }
- @DataProvider(name = "messageDescriptors")
- public Object[][] getMessageDescriptors() {
- return new Object[][] {
- {CoreMessages.ERR_ABANDON_OP_NO_SUCH_OPERATION}
- };
- }
+ @Test(dataProvider = "severities and pk names")
+ public void testGetPropertyKeyFormSet(Severity severity, String name) {
+ Set<String> s = Severity.getPropertyKeyFormSet();
+ assertTrue(s.contains(name));
+ }
- @Test(dataProvider = "messageDescriptors")
- public void testParseMessageId(MessageDescriptor md) {
- assertEquals(Severity.parseMessageId(md.getId()), md.getSeverity());
- }
+ @Test(dataProvider = "severities and masks")
+ public void testParseMask(Severity s, int mask) {
+ assertEquals(Severity.parseMask(mask), s);
+ }
- @Test(dataProvider = "severities and masks")
- public void testGetMask(Severity s, int mask) {
- assertEquals(s.getMask(), mask);
- }
+ @Test(dataProvider = "severities and strings")
+ public void testParseString(Severity sev, String s) {
+ assertEquals(Severity.parseString(s), sev);
+ }
- @DataProvider(name = "severities and md names")
- public Object[][] getSeveritiesAndMessageDescriptorNames() {
- return new Object[][] {
- { Severity.DEBUG, "DEBUG" },
- { Severity.FATAL_ERROR, "ERR" },
- { Severity.INFORMATION, "INFO" },
- { Severity.MILD_ERROR, "ERR" },
- { Severity.MILD_WARNING, "WARN" },
- { Severity.NOTICE, "NOTE" },
- { Severity.SEVERE_ERROR, "ERR" },
- { Severity.SEVERE_WARNING, "WARN" }
- };
- }
+ @Test(dataProvider = "messageDescriptors")
+ public void testParseMessageId(MessageDescriptor md) {
+ assertEquals(Severity.parseMessageId(md.getId()), md.getSeverity());
+ }
- @Test(dataProvider = "severities and md names")
- public void testMessageDesciptorName(Severity s, String name) {
- assertEquals(s.messageDesciptorName(), name);
- }
+ @Test(dataProvider = "severities and masks")
+ public void testGetMask(Severity s, int mask) {
+ assertEquals(s.getMask(), mask);
+ }
- @DataProvider(name = "severities and pk names")
- public Object[][] getSeveritiesAndPropertyKeyNames() {
- return new Object[][] {
- { Severity.DEBUG, "DEBUG" },
- { Severity.FATAL_ERROR, "FATAL_ERR" },
- { Severity.INFORMATION, "INFO" },
- { Severity.MILD_ERROR, "MILD_ERR" },
- { Severity.MILD_WARNING, "MILD_WARN" },
- { Severity.NOTICE, "NOTICE" },
- { Severity.SEVERE_ERROR, "SEVERE_ERR" },
- { Severity.SEVERE_WARNING, "SEVERE_WARN" }
- };
- }
+ @Test(dataProvider = "severities and md names")
+ public void testMessageDesciptorName(Severity s, String name) {
+ assertEquals(s.messageDesciptorName(), name);
+ }
- @DataProvider(name = "severities and pk names")
- public void testPropertyKeyFormName(Severity sev, String s) {
- assertEquals(sev.propertyKeyFormName(), s);
- }
+ @Test(dataProvider = "severities and pk names")
+ public void testPropertyKeyFormName(Severity sev, String s) {
+ assertEquals(sev.propertyKeyFormName(), s);
+ }
}
--
Gitblit v1.10.0