From 1cc0bf5a5d73e9ee1ac995ddf8da7f2db512dc37 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 23:08:43 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 58270: Fixed the failing test by moving MetadataQueryTest_model.xml to test-resources git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/search/impl/querymodel/impl/db/DBQueryTest.java | 2 +- .../org/alfresco/repo/search/impl}/MetadataQueryTest_model.xml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename source/{java/org/alfresco/repo/search/impl/querymodel/impl/db => test-resources/org/alfresco/repo/search/impl}/MetadataQueryTest_model.xml (100%) diff --git a/source/test-java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java b/source/test-java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java index 4077bc7fec..e9b42e3305 100644 --- a/source/test-java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java +++ b/source/test-java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryTest.java @@ -247,7 +247,7 @@ public class DBQueryTest implements DictionaryListener protected void loadTestModel() { ClassLoader cl = BaseNodeServiceTest.class.getClassLoader(); - InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/search/impl/querymodel/impl/db/MetadataQueryTest_model.xml"); + InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/search/impl/MetadataQueryTest_model.xml"); assertNotNull(modelStream); model = M2Model.createModel(modelStream); dictionaryDAO.register(this); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/MetadataQueryTest_model.xml b/source/test-resources/org/alfresco/repo/search/impl/MetadataQueryTest_model.xml similarity index 100% rename from source/java/org/alfresco/repo/search/impl/querymodel/impl/db/MetadataQueryTest_model.xml rename to source/test-resources/org/alfresco/repo/search/impl/MetadataQueryTest_model.xml