diff options
| author | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-22 20:12:57 +0200 |
|---|---|---|
| committer | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-22 20:12:57 +0200 |
| commit | 38301afa2221ff5cc07ea73e8eaa104eee3e787f (patch) | |
| tree | 14cfeb50d61b77038b5c238913dd87d5bb799e1d /src/test/resources/testAddValidEmployeeJoin_expected.xml | |
| parent | 3814bf2cab2cb1465002d05f68e9b38e9351e014 (diff) | |
| parent | b351bbf12564c813728cd5efe00aa986ff64b083 (diff) | |
| download | sepm-groupproject-38301afa2221ff5cc07ea73e8eaa104eee3e787f.tar.gz sepm-groupproject-38301afa2221ff5cc07ea73e8eaa104eee3e787f.tar.xz sepm-groupproject-38301afa2221ff5cc07ea73e8eaa104eee3e787f.zip | |
Merge branch 'develop' into change_operation_status_fix
# Conflicts:
# src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
# src/main/resources/fxml/CreateOperationController.fxml
Diffstat (limited to 'src/test/resources/testAddValidEmployeeJoin_expected.xml')
| -rw-r--r-- | src/test/resources/testAddValidEmployeeJoin_expected.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/test/resources/testAddValidEmployeeJoin_expected.xml b/src/test/resources/testAddValidEmployeeJoin_expected.xml new file mode 100644 index 0000000..0977a95 --- /dev/null +++ b/src/test/resources/testAddValidEmployeeJoin_expected.xml @@ -0,0 +1,17 @@ +<dataset> + <EMP_JOIN e_id="1" e_version="10" v_id="10" v_name="Adam" v_birthday="2010-10-10" + v_educationlevel="RS" v_isDriver="true" + v_isPilot="false"/> + <EMP_JOIN e_id="2" e_version="20" v_id="20" v_name="Max" v_birthday="1990-11-11" + v_educationlevel="NFS" + v_isDriver="false" + v_isPilot="false"/> + <EMP_JOIN e_id="3" e_version="30" v_id="30" v_name="Lisa" v_birthday="1999-10-16" + v_educationlevel="NKI" + v_isDriver="true" + v_isPilot="false"/> + <EMP_JOIN e_id="4" e_version="40" v_id="40" v_name="Testperson" v_birthday="2010-11-11" + v_educationlevel="NA" + v_isDriver="true" + v_isPilot="false"/> +</dataset>
\ No newline at end of file |