From e32ae437b70a9985f135c951ac8fb84fd3082738 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 16 Jan 2007 21:15:34 +0000
Subject: [PATCH] Fix for getSupportedFeatures returning null. It now returns an empty set. The testGetSupportedFeature now also asserts the method doesn't return null for any backend.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java | 3 +--
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index a125e9d..733ea8c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -577,7 +577,7 @@
{
assert debugEnter(CLASS_NAME, "getSupportedFeatures");
- return null; //NYI
+ return new HashSet<String>(); //NYI
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
index e84a1bc..020cbce 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
@@ -160,8 +160,7 @@
@Test(dataProvider = "backends")
public void testGetSupportedFeatures(Backend b)
{
-// FIXME: We can't currently check for not null due to issue #1104.
-// assertNotNull(b.getSupportedFeatures());
+ assertNotNull(b.getSupportedFeatures());
b.getSupportedFeatures();
}
--
Gitblit v1.10.0