Fix behavior and test exception relating to IdentifierNode.ofNames.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@364 c6a108a4-781c-0410-a6c6-c2d559e19af0
ps3331333 · Nov 5, 2010 · 5929226 · 5929226
1 parent 8d179c1
commit 5929226
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/org/olap4j/mdx/NameSegment.java b/src/org/olap4j/mdx/NameSegment.java
@@ -42,6 +42,9 @@ public NameSegment(
  this.region = region;
  this.name = name;
  this.quoting = quoting;
+ if (name == null) {
+ throw new NullPointerException();
+ }
  if (!(quoting == Quoting.QUOTED || quoting == Quoting.UNQUOTED)) {
  throw new IllegalArgumentException();
  }

diff --git a/testsrc/org/olap4j/mdx/MdxTest.java b/testsrc/org/olap4j/mdx/MdxTest.java
@@ -133,14 +133,16 @@ public void testIdentifierOfNames() {
  segments.get(2).getQuoting());
 
  assertEquals(
- "xxx",
+ "[string].[with].[a [bracket]] in it]",
  identifierNode.toString());
 
- // Empty array is valid. (I don't feel strongly about this.)
- identifierNode =
- IdentifierNode.ofNames();
- assertEquals(0, identifierNode.getSegmentList().size());
- assertEquals("", identifierNode.toString());
+ // Empty array is invalid.
+ try {
+ identifierNode = IdentifierNode.ofNames();
+ fail("expected error, got " + identifierNode);
+ } catch (IllegalArgumentException e) {
+ // ok
+ }
 
  // Array containing null is not valid.
  try {