[teiid-commits] teiid SVN: r2432 - trunk/client/src/test/java/org/teiid/adminapi/impl.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2010-08-09 20:43:33 -0400 (Mon, 09 Aug 2010)
New Revision: 2432

Modified:
   trunk/client/src/test/java/org/teiid/adminapi/impl/TestDataPolicyMetaData.java
   trunk/client/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java
Log:
TEIID-1071 updating unit tests

Modified: trunk/client/src/test/java/org/teiid/adminapi/impl/TestDataPolicyMetaData.java
===================================================================
--- trunk/client/src/test/java/org/teiid/adminapi/impl/TestDataPolicyMetaData.java	2010-08-09 20:13:40 UTC (rev 2431)
+++ trunk/client/src/test/java/org/teiid/adminapi/impl/TestDataPolicyMetaData.java	2010-08-10 00:43:33 UTC (rev 2432)
@@ -39,45 +39,45 @@
 		
 		
 		PermissionMetaData perm1 = new PermissionMetaData();
-		perm1.setResourceName("schema.catalog.Table1"); //$NON-NLS-1$
+		perm1.setResourceName("catalog.schema.Table1"); //$NON-NLS-1$
 		perm1.setAllowRead(true);
 		
 		PermissionMetaData perm2 = new PermissionMetaData();
-		perm2.setResourceName("schema.catalog.Table2"); //$NON-NLS-1$
+		perm2.setResourceName("catalog.schema.Table2"); //$NON-NLS-1$
 		perm2.setAllowRead(false);
 		
 		PermissionMetaData perm3 = new PermissionMetaData();
-		perm3.setResourceName("schema.catalog.Table3.*"); //$NON-NLS-1$
+		perm3.setResourceName("catalog.schema.Table3"); //$NON-NLS-1$
 		perm3.setAllowRead(true);
 		
 		PermissionMetaData perm4 = new PermissionMetaData();
-		perm4.setResourceName("schema.catalog.Table4*"); //$NON-NLS-1$
+		perm4.setResourceName("catalog.schema.Table4"); //$NON-NLS-1$
 		perm4.setAllowRead(true);
 		
 		PermissionMetaData perm5 = new PermissionMetaData();
-		perm5.setResourceName("schema.catalog.Table5.column1"); //$NON-NLS-1$
+		perm5.setResourceName("catalog.schema.Table5.column1"); //$NON-NLS-1$
 		perm5.setAllowRead(true);	
 		
 		policy.addPermission(perm1, perm2, perm3, perm4, perm5);
 		
 		
-		assertTrue(policy.allows("schema.catalog.Table1", PermissionType.READ)); //$NON-NLS-1$
-		assertFalse(policy.allows("schema.catalog.Table1", PermissionType.CREATE)); //$NON-NLS-1$
+		assertTrue(policy.allows("catalog.schema.Table1", PermissionType.READ)); //$NON-NLS-1$
+		assertFalse(policy.allows("catalog.schema.Table1", PermissionType.CREATE)); //$NON-NLS-1$
 		
-		assertFalse(policy.allows("schema.catalog", PermissionType.READ)); //$NON-NLS-1$
+		assertFalse(policy.allows("catalog.schema", PermissionType.READ)); //$NON-NLS-1$
 		
-		assertFalse(policy.allows("schema.catalog.Table2.column", PermissionType.READ)); //$NON-NLS-1$
-		assertFalse(policy.allows("schema.catalog.Table2", PermissionType.READ)); //$NON-NLS-1$
+		assertFalse(policy.allows("catalog.schema.Table2.column", PermissionType.READ)); //$NON-NLS-1$
+		assertFalse(policy.allows("catalog.schema.Table2", PermissionType.READ)); //$NON-NLS-1$
 		
-		assertTrue(policy.allows("schema.catalog.Table3.column", PermissionType.READ)); //$NON-NLS-1$
-		assertTrue(policy.allows("schema.catalog.Table3", PermissionType.READ)); //$NON-NLS-1$
+		assertTrue(policy.allows("catalog.schema.Table3.column", PermissionType.READ)); //$NON-NLS-1$
+		assertTrue(policy.allows("catalog.schema.Table3", PermissionType.READ)); //$NON-NLS-1$
 		
-		assertTrue(policy.allows("schema.catalog.Table4.column", PermissionType.READ)); //$NON-NLS-1$
-		assertTrue(policy.allows("schema.catalog.Table4", PermissionType.READ)); //$NON-NLS-1$
-		assertFalse(policy.allows("schema.catalog.Table4", PermissionType.DELETE)); //$NON-NLS-1$
+		assertTrue(policy.allows("catalog.schema.Table4.column", PermissionType.READ)); //$NON-NLS-1$
+		assertTrue(policy.allows("catalog.schema.Table4", PermissionType.READ)); //$NON-NLS-1$
+		assertFalse(policy.allows("catalog.schema.Table4", PermissionType.DELETE)); //$NON-NLS-1$
 		
-		assertTrue(policy.allows("schema.catalog.Table5.column1", PermissionType.READ)); //$NON-NLS-1$
-		assertFalse(policy.allows("schema.catalog.Table5.column2", PermissionType.READ)); //$NON-NLS-1$
-		assertFalse(policy.allows("schema.catalog.Table5", PermissionType.READ)); //$NON-NLS-1$
+		assertTrue(policy.allows("catalog.schema.Table5.column1", PermissionType.READ)); //$NON-NLS-1$
+		assertFalse(policy.allows("catalog.schema.Table5.column2", PermissionType.READ)); //$NON-NLS-1$
+		assertFalse(policy.allows("catalog.schema.Table5", PermissionType.READ)); //$NON-NLS-1$
 	}
 }

Modified: trunk/client/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java
===================================================================
--- trunk/client/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java	2010-08-09 20:13:40 UTC (rev 2431)
+++ trunk/client/src/test/java/org/teiid/adminapi/impl/TestVDBMetaData.java	2010-08-10 00:43:33 UTC (rev 2432)
@@ -174,7 +174,7 @@
 		for (DataPolicy.DataPermission p: permissions) {
 			if (p.getResourceName().equalsIgnoreCase("myTable.T1")) { //$NON-NLS-1$
 				assertTrue(p.isAllowRead());
-				assertFalse(p.isAllowDelete());
+				assertNull(p.isAllowDelete());
 			}
 			else {
 				assertFalse(p.isAllowRead());