fix tenant names in test case

Signed-off-by: Lukas Harzenetter <lharzenetter@gmx.de>
eclipse · Aug 16, 2021 · c99ce7b · c99ce7b
1 parent 6a19e4b
commit c99ce7b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/...rest/src/test/java/org/eclipse/winery/repository/rest/resources/TenantRepositoryTest.java b/...rest/src/test/java/org/eclipse/winery/repository/rest/resources/TenantRepositoryTest.java
@@ -28,7 +28,7 @@ public void testTenantRepository() throws Exception {
 
         String[] results = new String[3];
 
-        Thread tenant1Thread = new Thread(() -> {
+        Thread tenant1Thread = new Thread(() ->
             results[0] = start()
                 .accept(ContentType.JSON.toString())
                 .get(callURL("servicetemplates/?xTenant=tenant_1"))
@@ -39,13 +39,13 @@ public void testTenantRepository() throws Exception {
                 .extract()
                 .response()
                 .getBody()
-                .asString();
-        });
+                .asString()
+        );
 
-        Thread tenant2Thread = new Thread(() -> {
+        Thread tenant2Thread = new Thread(() ->
             results[1] = start()
                 .accept(ContentType.JSON.toString())
-                .header(new Header("xTenant", "tenant2"))
+                .header(new Header("xTenant", "tenant_2"))
                 .get(callURL("servicetemplates/"))
                 .then()
                 .log()
@@ -54,13 +54,13 @@ public void testTenantRepository() throws Exception {
                 .extract()
                 .response()
                 .getBody()
-                .asString();
-        });
+                .asString()
+        );
 
-        Thread tenant3Thread = new Thread(() -> {
+        Thread tenant3Thread = new Thread(() ->
             results[2] = start()
                 .accept(ContentType.JSON.toString())
-                .header(new Header("xTenant", "tenant3"))
+                .header(new Header("xTenant", "tenant_3"))
                 .get(callURL("servicetemplates/"))
                 .then()
                 .log()
@@ -69,8 +69,8 @@ public void testTenantRepository() throws Exception {
                 .extract()
                 .response()
                 .getBody()
-                .asString();
-        });
+                .asString()
+        );
 
         tenant1Thread.start();
         tenant2Thread.start();

diff --git a/org.eclipse.winery.repository.rest/src/test/resources/tenants/tenants3.json b/org.eclipse.winery.repository.rest/src/test/resources/tenants/tenants3.json
@@ -9,6 +9,6 @@
         "id": "test53",
         "name": "test53",
         "namespace": "namespace",
-        "qName": "{namespace}test3"
+        "qName": "{namespace}test53"
     }
 ]
diff --git a/...ry.repository/src/main/java/org/eclipse/winery/repository/filebased/TenantRepository.java b/...ry.repository/src/main/java/org/eclipse/winery/repository/filebased/TenantRepository.java
@@ -14,6 +14,7 @@
 
 package org.eclipse.winery.repository.filebased;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -69,6 +70,15 @@ public TenantRepository(Path repositoryRoot) throws IOException, GitAPIException
         this.defaultRepository = this.createRepo(
             new GitBasedRepositoryConfiguration(false, fileBasedConfig)
         );
+
+        File[] files = this.repositoryRoot.toFile().listFiles(File::isDirectory);
+        if (files != null) {
+            for (File file : files) {
+                if (!".git".equals(file.getName()) || !defaultRepositoryFolder.equals(file.getName())) {
+                    initTenantRepository(file.getName());
+                }
+            }
+        }
     }
 
     public TenantRepository(Path repositoryRoot, List<String> tenants) throws IOException, GitAPIException {