BZ1558026: DV 6.4.3 + TEIID-4756 (reprise) added test, removed un-nee…

…ded call
teiid · Jun 19, 2018 · 0e7affa · 0e7affa
1 parent d4ad6b7
commit 0e7affa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/runtime/src/main/java/org/teiid/deployers/VDBRepository.java b/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
@@ -295,7 +295,6 @@ public void finishDeployment(String name, int version) {
 			}
 			return;
 		}
-		v.metadataLoadFinished();
 		synchronized (metadataAwareVDB) {
 			try {
 				try {

diff --git a/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java b/runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java
@@ -28,6 +28,7 @@
 
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.teiid.adminapi.VDB.Status;
 import org.teiid.adminapi.impl.DataPolicyMetadata;
 import org.teiid.adminapi.impl.VDBImportMetadata;
 import org.teiid.adminapi.impl.VDBMetaData;
@@ -36,6 +37,7 @@
 import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
 import org.teiid.metadata.FunctionMethod;
 import org.teiid.metadata.FunctionParameter;
+import org.teiid.metadata.MetadataFactory;
 import org.teiid.metadata.MetadataStore;
 import org.teiid.metadata.Schema;
 import org.teiid.query.metadata.TransformationMetadata;
@@ -265,4 +267,23 @@ public void testNonQualifiedDuplicate() throws Exception {
 		assertEquals(1, vdb.getDataPolicyMap().get("x").getSchemas().size());
 	}
 
-}
+    @Test public void testFunctionValidationError() throws Exception {
+    	VDBRepository repo = new VDBRepository();
+	    repo.start();
+	    repo.setSystemStore(RealMetadataFactory.example1Cached().getMetadataStore());
+		repo.setSystemFunctionManager(RealMetadataFactory.SFM);
+		MetadataStore metadataStore = new MetadataStore();
+		RealMetadataFactory.createPhysicalModel("x", metadataStore);
+		FunctionMethod method = MetadataFactory.createFunctionFromMethod("getProperty", System.class.getMethod("getProperty", String.class));
+		method.setInvocationClass("?");
+		method.setMethod(null);
+		metadataStore.getSchema("x").addFunction(method);
+		VDBMetaData vdb = createVDBMetadata(metadataStore, "bqt");
+		ConnectorManagerRepository cmr = new ConnectorManagerRepository();
+		cmr.addConnectorManager("x", new ConnectorManager("y", "z"));
+		repo.addVDB(vdb, metadataStore, null, null, cmr);
+		repo.finishDeployment(vdb.getName(), vdb.getVersion());
+		assertEquals(vdb.getStatus(), Status.FAILED);
+	}	
+
+}