From 0910c4e7db4c57d32eb3194eb1c8b62bf3c5ec8e Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Fri, 25 May 2007 07:08:37 +0000
Subject: [PATCH] Unit test for HeaderFilePropertyMapper.
SVN: 199
---
.../parser/HeaderFilePropertyMapper.java | 13 +++++-
.../parser/HeaderFilePropertyMapperTest.java | 41 +++++++++++++++++++
2 files changed, 52 insertions(+), 2 deletions(-)
create mode 100644 common/sourceTest/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapperTest.java
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapper.java b/common/source/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapper.java
index 89fea568c67..0aa73003fc2 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapper.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapper.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.common.parser;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -32,7 +33,12 @@ final class HeaderFilePropertyMapper implements IPropertyMapper
private final Map<String, IPropertyModel> properties;
HeaderFilePropertyMapper(String[] headerTokens) {
- this.properties = tokensToMap(headerTokens);
+ if (headerTokens == null || headerTokens.length == 0)
+ {
+ this.properties = Collections.emptyMap();
+ } else {
+ this.properties = tokensToMap(headerTokens);
+ }
}
private final static Map<String, IPropertyModel> tokensToMap(String[] tokens)
@@ -41,7 +47,10 @@ final class HeaderFilePropertyMapper implements IPropertyMapper
for (int i = 0; i < tokens.length; i++)
{
String token = tokens[i];
- map.put(token, new MappedProperty(i, token));
+ if (token != null)
+ {
+ map.put(token, new MappedProperty(i, token));
+ }
}
return map;
}
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapperTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapperTest.java
new file mode 100644
index 00000000000..e3ccc85e8f8
--- /dev/null
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapperTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.common.parser;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/**
+ * Test cases for corresponding {@link HeaderFilePropertyMapper} class.
+ *
+ * @author Christian Ribeaud
+ */
+public final class HeaderFilePropertyMapperTest
+{
+
+ @Test
+ public final void testGetProperty()
+ {
+ IPropertyMapper propertyMapper = new HeaderFilePropertyMapper(null);
+ assertNull(propertyMapper.getProperty("shouldBeNull"));
+ String[] headers =
+ { "firstName", "lastName", "address", null };
+ propertyMapper = new HeaderFilePropertyMapper(headers);
+ assertTrue(propertyMapper.getProperty("firstName").getColumn() == 0);
+ assertTrue(propertyMapper.getProperty("address").getColumn() == 2);
+ }
+}
--
GitLab