#165: Code Refactoring

Author: mairKi

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -198,8 +198,8 @@ public class SettingsController {
 
    private Stage thisStage;
 
-   private String username;
-   private String password;
+   public String username;
+   public String password;
 
    @Autowired
    ViewController mainscreen;
@@ -254,11 +254,18 @@ private void initialize() {
                radioApiOn.setSelected(true);
                radioApiOff.setSelected(false);
                String port = properties.getProperty("server.port");
+               String userName = properties.getProperty("spring.security.user.name");
+               String userPassword = properties.getProperty("spring.security.user.password");
+
+
                if (port != null) {
                   authPort.setText(port);
+
                }
-               if (username != null) {
-                  authName.setText(username);
+               if (userName != null) {
+                  authName.setText(extractValue(userName));
+                  authPassword.setText(extractValue(userPassword));
+
                }
             } else if (apistatus.equals("OFF")) {
                radioApiOn.setSelected(false);
@@ -679,4 +686,10 @@ private void propertyWrite(Map<String, String> propertiesToUpdate) {
          e.printStackTrace();
       }
    }
+
+   public static String extractValue(String input) {
+      int startIndex = input.indexOf(":") + 1;
+      int endIndex = input.lastIndexOf("}");
+      return input.substring(startIndex, endIndex);
+   }
 }

src/test/java/de/doubleslash/keeptime/REST_API_Test/ApiTest.java

@@ -14,53 +14,52 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-
 package de.doubleslash.keeptime.REST_API_Test;
 
-//import de.doubleslash.keeptime.model.Authorities;
-//import de.doubleslash.keeptime.model.User;
-//import de.doubleslash.keeptime.model.repos.AuthoritiesRepository;
-//import de.doubleslash.keeptime.model.repos.UserRepository;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.io.InputStream;
+import java.util.Properties;
+
+import de.doubleslash.keeptime.view.SettingsController;
+import org.junit.jupiter.api.Test;
 
-@DataJpaTest
 public class ApiTest {
 
-//   @Autowired
-//   private UserRepository userRepository;
-//
-//   @Autowired
-//   private AuthoritiesRepository authoritiesRepository;
+   @Test
+   public void testSaveUserAndAuthorities() {
+      String username = "user";
+      String password = "1234";
+      SettingsController settingsController;
 
-//   @Test
-//   public void testSaveUserAndAuthorities() {
-//      String username = "user";
-//      String password = "1234";
-//
-//      User user = new User();
-//      Authorities authorities = new Authorities();
-//      user.setUserName(username);
-//      user.setPassword("{noop}" + password);
-//      user.setEnabled(true);
-//      authorities.setUserName(username);
-//      authorities.setAuthority("ROLE_USER");
-//
-//      userRepository.save(user);
-//      authoritiesRepository.save(authorities);
-//
-//      User savedUser = userRepository.findByUserName(username);
-//      assertNotNull(savedUser);
-//      assertEquals(username, savedUser.getUserName());
-//
-//      Authorities savedAuthorities = authoritiesRepository.findByUserName(username);
-//      assertNotNull(savedAuthorities);
-//      assertEquals("ROLE_USER", savedAuthorities.getAuthority());
-//   }
+
+      Properties properties = new Properties();
+      properties.put("spring.security.user.name", "${BASIC_AUTH_USER:" + username+ "}");
+      properties.setProperty("spring.security.user.password", "${BASIC_AUTH_PASSWORD:" + password + "}");
+
+      assertEquals(properties.getProperty("spring.security.user.password"),"${BASIC_AUTH_PASSWORD:1234}");
+      assertEquals(properties.getProperty("spring.security.user.name"),"${BASIC_AUTH_USER:user}");
+   }
 }
 
+//@Test public void testIsPropertyPresent() throws Exception {
+//   // Mock InputStream und Properties
+//   InputStream mockInputStream = mock(InputStream.class);
+//   Properties mockProperties = mock(Properties.class);
+//   when(mockProperties.containsKey("api")).thenReturn(true);
+//   when(mockProperties.containsKey("non_existing_property")).thenReturn(false);
+//
+//   // Mock SettingsController und setzen Sie den InputStream
+//   SettingsController settingsController = new SettingsController();
+//   SettingsController spySettingsController = org.mockito.Mockito.spy(settingsController);
+//   org.mockito.Mockito.doReturn(mockInputStream).when(spySettingsController).getClass().getClassLoader().getResourceAsStream("application.properties");
+//   org.mockito.Mockito.doReturn(mockProperties).when(spySettingsController).loadProperties(mockInputStream);
+//
+//   // Testen, ob die Eigenschaft vorhanden ist
+//   assertTrue(spySettingsController.isPropertyPresent("api"));
+//   assertFalse(spySettingsController.isPropertyPresent("non_existing_property"));
+//}
+//}