From 85efb1be347ac307f2d13648b4f71941e0e0e1a9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 13 Mar 2013 10:13:00 +0000
Subject: [PATCH] MakeLDIFTestCase.java: Minor fixes. Added names to test cases. Used assertFalse() instead of assertTrue(). Just created a temp file instead of a temp directory.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
index f57ae26..18fa717 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
@@ -29,13 +29,11 @@
import java.io.File;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
-import org.opends.server.TestCaseUtils;
import org.opends.messages.Message;
+import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.LdifFileWriter;
import org.opends.server.tools.ToolsTestCase;
@@ -264,7 +262,7 @@
"test ou=group [dc=com]", // Expected value
},
{
- "",
+ "NoConstantBecauseEscaped",
new String[]{
"define top=dc=com",
"define container=ou=group",
@@ -282,7 +280,7 @@
"test [top]", // Expected value
},
{
- "",
+ "NoConstantBecauseStrangeChar",
new String[]{
"define top=dc=com",
"define container=ou=group",
@@ -299,7 +297,7 @@
"description", // Attribute to test
"test [group [top]", // Expected value
},
- /*
+ /* If adding a test, please copy and reuse template code down below
{
"",
new String[]{
@@ -321,10 +319,9 @@
public void testLDIFOutputFromTemplate(String testName, String[] lines,
String attrName, String expectedValue) throws Exception
{
- System.out.println("Running test for " + testName);
- File tempDir = TestCaseUtils.createTemporaryDirectory("MakeLdifTest");
- String homeDirName = tempDir.getAbsolutePath();
- String outLdifFilePath = homeDirName + File.separator + testName + "_out.ldif";
+ File tmpFile = File.createTempFile(testName, "out.ldif");
+ tmpFile.deleteOnExit();
+ String outLdifFilePath = tmpFile.getAbsolutePath();
LdifFileWriter.makeLdif(outLdifFilePath, resourcePath, lines);
@@ -338,7 +335,7 @@
assertNotNull(top);
assertNotNull(e);
List<Attribute> attrs = e.getAttribute(attrName);
- assertTrue(!attrs.isEmpty());
+ assertFalse(attrs.isEmpty());
Attribute a = attrs.get(0);
Attribute expectedRes = Attributes.create(attrName, expectedValue);
assertEquals(a, expectedRes);
@@ -367,23 +364,24 @@
"",
};
- File tempDir = TestCaseUtils.createTemporaryDirectory("MakeLdifTest");
- String homeDirName = tempDir.getAbsolutePath();
- String outLdifFilePath = homeDirName + File.separator + "out2.ldif";
+
+ File tmpFile = File.createTempFile("combineEscapeChar", "out.ldif");
+ tmpFile.deleteOnExit();
+ String outLdifFilePath = tmpFile.getAbsolutePath();
LdifFileWriter.makeLdif(outLdifFilePath, resourcePath, lines);
LDIFImportConfig ldifConfig = new LDIFImportConfig(outLdifFilePath);
ldifConfig.setValidateSchema(false);
LDIFReader reader = new LDIFReader(ldifConfig);
- Entry top=reader.readEntry();
+ Entry top = reader.readEntry();
Entry e = reader.readEntry();
reader.close();
assertNotNull(top);
assertNotNull(e);
List<Attribute> attrs = e.getAttribute("cn");
- assertTrue(!attrs.isEmpty());
+ assertFalse(attrs.isEmpty());
Attribute a = attrs.get(0);
assertTrue(a.iterator().next().toString().matches("Foo <[A-Z]>\\{1\\}Bar"),
"cn value doesn't match the expected value");
--
Gitblit v1.10.0