From 34ac48d938d5f3411505f7d0f883a585148ec716 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 08 Jan 2010 18:13:58 +0000
Subject: [PATCH] * various minor code fixes * fix unit tests * remove TODOs from Javadoc (issues are now in Issue Tracker)
---
sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/RegexSyntaxTestCase.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/RegexSyntaxTestCase.java b/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/RegexSyntaxTestCase.java
index d9b1330..3297e97 100644
--- a/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/RegexSyntaxTestCase.java
+++ b/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/RegexSyntaxTestCase.java
@@ -28,12 +28,8 @@
-import java.util.LinkedList;
-import java.util.List;
import java.util.regex.Pattern;
-import org.opends.messages.Message;
-import org.opends.sdk.DecodeException;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -49,7 +45,7 @@
* {@inheritDoc}
*/
@Override
- protected Syntax getRule() throws SchemaException, DecodeException
+ protected Syntax getRule()
{
SchemaBuilder builder = new SchemaBuilder(Schema.getCoreSchema());
builder.addPatternSyntax("1.1.1",
@@ -73,23 +69,21 @@
- public void testInvalidPattern() throws SchemaException,
- DecodeException
+ @Test
+ public void testInvalidPattern()
{
// This should fail due to invalid pattern.
SchemaBuilder builder = new SchemaBuilder(Schema.getCoreSchema());
builder.addSyntax(
"( 1.1.1 DESC 'Host and Port in the format of HOST:PORT' "
+ " X-PATTERN '^[a-z-A-Z+:[0-@.]+\\d$' )", true);
- List<Message> warnings = new LinkedList<Message>();
- builder.toSchema(warnings);
- Assert.assertFalse(warnings.isEmpty());
+ Assert.assertFalse(builder.toSchema().getWarnings().isEmpty());
}
@Test
- public void testDecode() throws SchemaException, DecodeException
+ public void testDecode()
{
// This should fail due to invalid pattern.
SchemaBuilder builder = new SchemaBuilder(Schema.getCoreSchema());
--
Gitblit v1.10.0