[jbosstools-commits] JBoss Tools SVN: r24093 - trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2010-08-12 08:05:58 -0400 (Thu, 12 Aug 2010)
New Revision: 24093

Modified:
   trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
Log:
[JBIDE-6376] focuspoint & test fixed

Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java	2010-08-12 12:05:48 UTC (rev 24092)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/FocusPointTest.java	2010-08-12 12:05:58 UTC (rev 24093)
@@ -1,6 +1,7 @@
 package org.jboss.tools.usage.test;
 
 import org.jboss.tools.usage.jgoogleanalytics.FocusPoint;
+import org.jboss.tools.usage.util.EncodingUtils;
 
 import junit.framework.TestCase;
 
@@ -8,20 +9,20 @@
 
 	private static final String root = "root";
 	private static final String child1 = "child1";
-	private static final String child2 = "child2";
+	private static final String URI_SEPARATOR_ENCODED = EncodingUtils.checkedEncodeUtf8(FocusPoint.URI_SEPARATOR);
 	
 	public void testGetContentURI_Simple() throws Exception {
 		FocusPoint focusPoint = new FocusPoint(root);
 		String contentURI = focusPoint.getContentURI();
 		assertNotNull(contentURI);
-		assertEquals(FocusPoint.URI_SEPARATOR + root, contentURI);
+		assertEquals(URI_SEPARATOR_ENCODED + root, contentURI);
 	}
 
 	public void testGetContentURI_OneLevel() throws Exception {
 		FocusPoint focusPoint = new FocusPoint(root).setChild(new FocusPoint(child1));
 		String contentURI = focusPoint.getContentURI();
 		assertNotNull(contentURI);
-		assertEquals(FocusPoint.URI_SEPARATOR + root + FocusPoint.URI_SEPARATOR + child1, contentURI);
+		assertEquals(URI_SEPARATOR_ENCODED + root + URI_SEPARATOR_ENCODED + child1, contentURI);
 	}
 
 	public void testGetContentTitle_Simple() throws Exception {
@@ -30,13 +31,4 @@
 		assertNotNull(contentTitle);
 		assertEquals(root, contentTitle);
 	}
-
-	public void testGetContentTitle_OneLevel() throws Exception {
-//		FocusPoint parentFocusPoint = new FocusPoint(JBOSS_TOOLS_USAGE_ID);
-//		FocusPoint childFocusPoint = new FocusPoint(JBOSS_TOOLS_SMOOKS_UI,
-//				parentFocusPoint);
-//		String contentTitle = childFocusPoint.getContentTitle();
-//		assertNotNull(contentTitle);
-//		assertEquals(JBOSS_TOOLS_USAGE_ID + FocusPoint.TITLE_SEPARATOR + JBOSS_TOOLS_SMOOKS_UI, contentTitle);
-	}
 }