Pull-Request: Failing Test into tests #42
@ -4,16 +4,10 @@
 | 
			
		||||
    <option name="autoReloadType" value="SELECTIVE" />
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="ChangeListManager">
 | 
			
		||||
    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Testcases (and failing test fixes) of TaskgroupService">
 | 
			
		||||
      <change afterPath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" afterDir="false" />
 | 
			
		||||
    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Resolve Merge-Conflict">
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskFieldInfo.java" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Taskgroup.java" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/ServiceExitCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/ServiceExitCode.java" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskService.java" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/test/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/resources/application.properties" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/test/resources/taskRepositoryEntries.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/resources/taskRepositoryEntries.sql" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java" afterDir="false" />
 | 
			
		||||
    </list>
 | 
			
		||||
    <option name="SHOW_DIALOG" value="false" />
 | 
			
		||||
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
 | 
			
		||||
@ -92,7 +86,7 @@
 | 
			
		||||
      <recent name="$PROJECT_DIR$/src/test/java/core/taskgroups" />
 | 
			
		||||
    </key>
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="RunManager" selected="JUnit.TaskServiceTest">
 | 
			
		||||
  <component name="RunManager" selected="JUnit.TaskServiceTest.deleteTask">
 | 
			
		||||
    <configuration name="TaskServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
 | 
			
		||||
      <module name="demo" />
 | 
			
		||||
      <extension name="coverage">
 | 
			
		||||
@ -124,6 +118,22 @@
 | 
			
		||||
        <option name="Make" enabled="true" />
 | 
			
		||||
      </method>
 | 
			
		||||
    </configuration>
 | 
			
		||||
    <configuration name="TaskServiceTest.deleteTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
 | 
			
		||||
      <module name="demo" />
 | 
			
		||||
      <extension name="coverage">
 | 
			
		||||
        <pattern>
 | 
			
		||||
          <option name="PATTERN" value="core.tasks.*" />
 | 
			
		||||
          <option name="ENABLED" value="true" />
 | 
			
		||||
        </pattern>
 | 
			
		||||
      </extension>
 | 
			
		||||
      <option name="PACKAGE_NAME" value="core.tasks" />
 | 
			
		||||
      <option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
 | 
			
		||||
      <option name="METHOD_NAME" value="deleteTask" />
 | 
			
		||||
      <option name="TEST_OBJECT" value="method" />
 | 
			
		||||
      <method v="2">
 | 
			
		||||
        <option name="Make" enabled="true" />
 | 
			
		||||
      </method>
 | 
			
		||||
    </configuration>
 | 
			
		||||
    <configuration name="TaskServiceTest.editTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
 | 
			
		||||
      <module name="demo" />
 | 
			
		||||
      <extension name="coverage">
 | 
			
		||||
@ -155,22 +165,6 @@
 | 
			
		||||
        <option name="Make" enabled="true" />
 | 
			
		||||
      </method>
 | 
			
		||||
    </configuration>
 | 
			
		||||
    <configuration name="TaskgroupServiceTest.getTaskgroupByIDAndUsername" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
 | 
			
		||||
      <module name="demo" />
 | 
			
		||||
      <extension name="coverage">
 | 
			
		||||
        <pattern>
 | 
			
		||||
          <option name="PATTERN" value="core.taskgroups.*" />
 | 
			
		||||
          <option name="ENABLED" value="true" />
 | 
			
		||||
        </pattern>
 | 
			
		||||
      </extension>
 | 
			
		||||
      <option name="PACKAGE_NAME" value="core.taskgroups" />
 | 
			
		||||
      <option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
 | 
			
		||||
      <option name="METHOD_NAME" value="getTaskgroupByIDAndUsername" />
 | 
			
		||||
      <option name="TEST_OBJECT" value="method" />
 | 
			
		||||
      <method v="2">
 | 
			
		||||
        <option name="Make" enabled="true" />
 | 
			
		||||
      </method>
 | 
			
		||||
    </configuration>
 | 
			
		||||
    <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
 | 
			
		||||
      <module name="demo" />
 | 
			
		||||
      <option name="SPRING_BOOT_MAIN_CLASS" value="core.DemoApplication" />
 | 
			
		||||
@ -180,11 +174,11 @@
 | 
			
		||||
    </configuration>
 | 
			
		||||
    <recent_temporary>
 | 
			
		||||
      <list>
 | 
			
		||||
        <item itemvalue="JUnit.TaskServiceTest.deleteTask" />
 | 
			
		||||
        <item itemvalue="JUnit.TaskServiceTest" />
 | 
			
		||||
        <item itemvalue="JUnit.TaskServiceTest.createTask" />
 | 
			
		||||
        <item itemvalue="JUnit.TaskServiceTest.editTask" />
 | 
			
		||||
        <item itemvalue="JUnit.TaskgroupServiceTest" />
 | 
			
		||||
        <item itemvalue="JUnit.TaskgroupServiceTest.getTaskgroupByIDAndUsername" />
 | 
			
		||||
      </list>
 | 
			
		||||
    </recent_temporary>
 | 
			
		||||
  </component>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user