Fix broken CI caused by renaming project to Deskflow (#7522)

* Bump CI

* Use 2 core arm runner

* Update ChangeLog

* Fixed filename `deskflowc.exe.manifest`

* Remove  .vscode/settings.json file

* Restore test values to make tests work (test values should not contain app name)

* Fixed syntax error in Windows watchdog

* Add `sonar-project.properties` file

* Change default core count

* Add default package prefix

* Default product name in CMake

* Tweak ChangeLog

.github/workflows/build-containers.yml

@@ -39,7 +39,7 @@ jobs:
             platform: amd64
 
           - name: debian-12-arm64
-            runs-on: ubuntu-24.04-8-core-arm64
+            runs-on: ubuntu-24.04-2-core-arm64
             config-dir: debian
             base-image: arm64v8/debian:12-slim
             platform: arm64
@@ -63,7 +63,7 @@ jobs:
             platform: amd64
 
           - name: fedora-40-arm64
-            runs-on: ubuntu-24.04-8-core-arm64
+            runs-on: ubuntu-24.04-2-core-arm64
             config-dir: fedora
             base-image: arm64v8/fedora:40
             platform: arm64

.github/workflows/ci-linux.json

@@ -9,7 +9,7 @@
     {
       "name": "debian-12-arm64",
       "container": "deskflow/deskflow:debian-12-arm64",
-      "runs-on": "ubuntu-24.04-8-core-arm64",
+      "runs-on": "ubuntu-24.04-2-core-arm64",
       "extra-packages": true
     },
     {
@@ -33,7 +33,7 @@
     {
       "name": "fedora-40-arm64",
       "container": "deskflow/deskflow:fedora-40-arm64",
-      "runs-on": "ubuntu-24.04-8-core-arm64"
+      "runs-on": "ubuntu-24.04-2-core-arm64"
     },
     {
       "name": "fedora-40-amd64",

.github/workflows/ci.yml

@@ -21,9 +21,7 @@ on:
 env:
   GIT_SHA: ${{ github.sha }}
   DESKFLOW_PRODUCT_NAME: ${{ vars.DESKFLOW_PRODUCT_NAME }}
-  DESKFLOW_PACKAGE_PREFIX: ${{ vars.DESKFLOW_PACKAGE_PREFIX }}
-  DESKFLOW_LICENSED_PRODUCT: ${{ vars.DESKFLOW_LICENSED_PRODUCT }}
-  DESKFLOW_ENABLE_ACTIVATION: ${{ vars.DESKFLOW_ENABLE_ACTIVATION }}
+  DESKFLOW_PACKAGE_PREFIX: ${{ vars.DESKFLOW_PACKAGE_PREFIX || 'deskflow' }}
   PACKAGE_BUILD: ${{ !github.event.pull_request.draft }}
   PACKAGE_UPLOAD: ${{ !github.event.pull_request.draft && github.ref_name != 'master' }}
   UPLOAD_TO_GITHUB: ${{ github.event_name == 'pull_request' && !github.event.pull_request.draft }}

.github/workflows/sonarcloud-analysis.yml

@@ -23,7 +23,7 @@ jobs:
       SONAR_SCANNER_VERSION: 6.1.0.4477
       SONAR_SCANNER_OPTS: -server
       SONAR_SCANNER_URL_BASE: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli
-      CPU_CORE_COUNT: 32
+      CPU_CORE_COUNT: ${{ vars.SONAR_SCANNER_CPU_COUNT || 4 }}
 
     steps:
       - name: Checkout
@@ -100,17 +100,7 @@ jobs:
         run: |
           export PATH=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64/bin:$PATH
           sonar-scanner \
-            -Dsonar.organization=symless \
-            -Dsonar.projectKey=deskflow_deskflow \
-            -Dsonar.sources=scripts,src/cmd,src/gui,src/lib \
-            -Dsonar.tests=src/test \
-            -Dsonar.exclusions=subprojects/**,build/** \
-            -Dsonar.coverage.exclusions=subprojects/**,scripts/**,src/test/** \
-            -Dsonar.cpd.exclusions=**/*Test*.cpp \
-            -Dsonar.host.url=https://sonarcloud.io \
             -Dsonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }} \
-            -Dsonar.cfamily.compile-commands=build/compile_commands.json \
-            -Dsonar.cfamily.threads=${{ env.CPU_CORE_COUNT }} \
-            -Dsonar.python.version=3.10
+            -Dsonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.vscode/launch.json

@@ -6,7 +6,7 @@
       "type": "lldb",
       "cwd": "${workspaceRoot}",
       "request": "launch",
-      "program": "${workspaceFolder}/build/bin/synergy",
+      "program": "${workspaceFolder}/build/bin/deskflow",
       "preLaunchTask": "kill-build"
     },
     {
@@ -30,8 +30,8 @@
       "type": "lldb",
       "cwd": "${workspaceRoot}",
       "request": "launch",
-      "program": "${workspaceFolder}/build/bin/synergys",
-      "args": ["--config-toml", "synergy-config.toml"],
+      "program": "${workspaceFolder}/build/bin/deskflows",
+      "args": ["--config-toml", "deskflow-config.toml"],
       "preLaunchTask": "kill-build"
     },
     {
@@ -39,8 +39,8 @@
       "type": "lldb",
       "cwd": "${workspaceRoot}",
       "request": "launch",
-      "program": "${workspaceFolder}/build/bin/synergyc",
-      "args": ["--config-toml", "synergy-config.toml"],
+      "program": "${workspaceFolder}/build/bin/deskflowc",
+      "args": ["--config-toml", "deskflow-config.toml"],
       "preLaunchTask": "kill-build"
     },
     {
@@ -54,7 +54,7 @@
       "type": "cppvsdbg",
       "cwd": "${workspaceRoot}",
       "request": "launch",
-      "program": "${workspaceFolder}/build/bin/synergy",
+      "program": "${workspaceFolder}/build/bin/deskflow",
       "internalConsoleOptions": "openOnSessionStart",
       "preLaunchTask": "kill-build"
     },
@@ -81,8 +81,8 @@
       "type": "cppvsdbg",
       "cwd": "${workspaceRoot}",
       "request": "launch",
-      "program": "${workspaceFolder}/build/bin/synergys",
-      "args": ["--config-toml", "synergy-config.toml"],
+      "program": "${workspaceFolder}/build/bin/deskflows",
+      "args": ["--config-toml", "deskflow-config.toml"],
       "internalConsoleOptions": "openOnSessionStart",
       "preLaunchTask": "kill-build"
     },
@@ -91,8 +91,8 @@
       "type": "cppvsdbg",
       "cwd": "${workspaceRoot}",
       "request": "launch",
-      "program": "${workspaceFolder}/build/bin/synergyc",
-      "args": ["--config-toml", "synergy-config.toml"],
+      "program": "${workspaceFolder}/build/bin/deskflowc",
+      "args": ["--config-toml", "deskflow-config.toml"],
       "internalConsoleOptions": "openOnSessionStart",
       "preLaunchTask": "kill-build"
     },
@@ -101,7 +101,7 @@
       "type": "cppvsdbg",
       "cwd": "${workspaceRoot}",
       "request": "launch",
-      "program": "${workspaceFolder}/build/bin/synergyd",
+      "program": "${workspaceFolder}/build/bin/deskflowd",
       "args": ["-f"],
       "internalConsoleOptions": "openOnSessionStart",
       "preLaunchTask": "build"

.vscode/settings.json

@@ -1,8 +0,0 @@
-{
-  "sonarlint.pathToCompileCommands": "${workspaceFolder}/build/compile_commands.json",
-  "gcovViewer.buildDirectories": ["${workspaceFolder}/build/src/lib"],
-  "sonarlint.connectedMode.project": {
-    "connectionId": "symless",
-    "projectKey": "symless_synergy-core"
-  }
-}

ChangeLog

@@ -1,6 +1,7 @@
 # 1.17.0
 
 - #7519 Rename project to Deskflow (was Synergy Community Edition)
+- #7522 Fix broken CI caused by renaming project to Deskflow
 
 # 1.16.1
 

cmake/Definitions.cmake

@@ -49,22 +49,12 @@ macro(configure_definitions)
     set(PRODUCT_NAME $ENV{DESKFLOW_PRODUCT_NAME})
   endif()
 
-  if(LICENSED_PRODUCT)
-    message(STATUS "Licensed product")
-    add_definitions(-DDESKFLOW_LICENSED_PRODUCT=1)
-
-    if(ENABLE_ACTIVATION)
-      message(STATUS "Activation enabled")
-      add_definitions(-DDESKFLOW_ENABLE_ACTIVATION=1)
-    endif()
-  else()
+  if("${PRODUCT_NAME}" STREQUAL "")
     set(PRODUCT_NAME "Deskflow")
   endif()
 
-  if(PRODUCT_NAME)
-    message(STATUS "Product name: ${PRODUCT_NAME}")
-    add_definitions(-DDESKFLOW_PRODUCT_NAME="${PRODUCT_NAME}")
-  endif()
+  message(STATUS "Product name: ${PRODUCT_NAME}")
+  add_definitions(-DDESKFLOW_PRODUCT_NAME="${PRODUCT_NAME}")
 
   if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     message(STATUS "Disabling debug build")

sonar-project.properties

@@ -0,0 +1,12 @@
+sonar.organization=deskflow
+sonar.projectKey=deskflow_deskflow
+sonar.sources=scripts,src/cmd,src/gui,src/lib
+sonar.tests=src/test
+sonar.exclusions=subprojects/**,build/**
+sonar.coverage.exclusions=subprojects/**,scripts/**,src/test/**
+sonar.cpd.exclusions=**/*Test*.cpp
+sonar.host.url=https://sonarcloud.io
+sonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}
+sonar.cfamily.compile-commands=build/compile_commands.json
+sonar.cfamily.threads=${{ env.CPU_CORE_COUNT }}
+sonar.python.version=3.10

src/lib/platform/MSWindowsWatchdog.cpp

@@ -606,10 +606,10 @@ void MSWindowsWatchdog::getActiveDesktop(LPSECURITY_ATTRIBUTES security) {
   if (!installedDir.empty()) {
     String deskflowLegacyCommand;
     deskflowLegacyCommand.append("\"")
-                   .append(installedDir)
-                   .append("\\")
-                   .append("deskflow-legacy")
-                   .append("\"");
+        .append(installedDir)
+        .append("\\")
+        .append("deskflow-legacy")
+        .append("\"");
     deskflowLegacyCommand.append(" --get-active-desktop");
 
     m_session.updateActiveSession();

src/test/integtests/platform/MSWindowsClipboardTests.cpp

@@ -62,7 +62,7 @@ TEST_F(MSWindowsClipboardTests, empty_openCalled_returnsTrue) {
 TEST_F(MSWindowsClipboardTests, empty_singleFormat_hasReturnsFalse) {
   MSWindowsClipboard clipboard(NULL);
   clipboard.open(0);
-  clipboard.add(MSWindowsClipboard::kText, "deskflow rocks!");
+  clipboard.add(MSWindowsClipboard::kText, "synergy rocks!");
 
   clipboard.empty();
 
@@ -74,10 +74,10 @@ TEST_F(MSWindowsClipboardTests, add_newValue_valueWasStored) {
   MSWindowsClipboard clipboard(NULL);
   clipboard.open(0);
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   String actual = clipboard.get(IClipboard::kText);
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 TEST_F(MSWindowsClipboardTests, add_newValue_writeWasCalled) {
@@ -88,14 +88,14 @@ TEST_F(MSWindowsClipboardTests, add_newValue_writeWasCalled) {
   clipboard.setFacade(facade);
   clipboard.open(0);
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 }
 
 TEST_F(MSWindowsClipboardTests, add_replaceValue_valueWasReplaced) {
   MSWindowsClipboard clipboard(NULL);
   clipboard.open(0);
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
   clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
 
   String actual = clipboard.get(IClipboard::kText);
@@ -157,7 +157,7 @@ TEST_F(MSWindowsClipboardTests, has_withFormatAdded_returnsTrue) {
   MSWindowsClipboard clipboard(NULL);
   clipboard.open(0);
   clipboard.empty();
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   bool actual = clipboard.has(IClipboard::kText);
 
@@ -188,11 +188,11 @@ TEST_F(MSWindowsClipboardTests, get_withFormatAdded_returnsExpected) {
   MSWindowsClipboard clipboard(NULL);
   clipboard.open(0);
   clipboard.empty();
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   String actual = clipboard.get(IClipboard::kText);
 
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 TEST_F(MSWindowsClipboardTests, isOwnedByDeskflow_defaultState_noError) {

src/test/integtests/platform/OSXClipboardTests.cpp

@@ -35,7 +35,7 @@ TEST(OSXClipboardTests, empty_openCalled_returnsTrue) {
 TEST(OSXClipboardTests, empty_singleFormat_hasReturnsFalse) {
   OSXClipboard clipboard;
   clipboard.open(0);
-  clipboard.add(OSXClipboard::kText, "deskflow rocks!");
+  clipboard.add(OSXClipboard::kText, "synergy rocks!");
 
   clipboard.empty();
 
@@ -47,17 +47,17 @@ TEST(OSXClipboardTests, add_newValue_valueWasStored) {
   OSXClipboard clipboard;
   clipboard.open(0);
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   String actual = clipboard.get(IClipboard::kText);
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 TEST(OSXClipboardTests, add_replaceValue_valueWasReplaced) {
   OSXClipboard clipboard;
   clipboard.open(0);
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
   clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
 
   String actual = clipboard.get(IClipboard::kText);
@@ -114,7 +114,7 @@ TEST(OSXClipboardTests, has_withFormatAdded_returnsTrue) {
   OSXClipboard clipboard;
   clipboard.open(0);
   clipboard.empty();
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   bool actual = clipboard.has(IClipboard::kText);
 
@@ -145,11 +145,11 @@ TEST(OSXClipboardTests, get_withFormatAdded_returnsExpected) {
   OSXClipboard clipboard;
   clipboard.open(0);
   clipboard.empty();
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   String actual = clipboard.get(IClipboard::kText);
 
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 #endif

src/test/integtests/platform/XWindowsClipboardTests.cpp

@@ -69,7 +69,7 @@ TEST_F(XWindowsClipboardTests, empty_openCalled_returnsTrue) {
 
 TEST_F(XWindowsClipboardTests, empty_singleFormat_hasReturnsFalse) {
   XWindowsClipboard &clipboard = getClipboard();
-  clipboard.add(XWindowsClipboard::kText, "deskflow rocks!");
+  clipboard.add(XWindowsClipboard::kText, "synergy rocks!");
 
   clipboard.empty();
 
@@ -80,16 +80,16 @@ TEST_F(XWindowsClipboardTests, empty_singleFormat_hasReturnsFalse) {
 TEST_F(XWindowsClipboardTests, add_newValue_valueWasStored) {
   XWindowsClipboard &clipboard = getClipboard();
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   String actual = clipboard.get(IClipboard::kText);
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 TEST_F(XWindowsClipboardTests, add_replaceValue_valueWasReplaced) {
   XWindowsClipboard &clipboard = getClipboard();
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
   clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
 
   String actual = clipboard.get(IClipboard::kText);
@@ -107,7 +107,7 @@ TEST_F(XWindowsClipboardTests, close_isOpen_noErrors) {
 
 TEST_F(XWindowsClipboardTests, has_withFormatAdded_returnsTrue) {
   XWindowsClipboard &clipboard = getClipboard();
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   bool actual = clipboard.has(IClipboard::kText);
 
@@ -132,11 +132,11 @@ TEST_F(XWindowsClipboardTests, get_withNoFormats_returnsEmpty) {
 
 TEST_F(XWindowsClipboardTests, get_withFormatAdded_returnsExpected) {
   XWindowsClipboard &clipboard = getClipboard();
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   String actual = clipboard.get(IClipboard::kText);
 
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 #endif

src/test/unittests/deskflow/ClipboardTests.cpp

@@ -32,7 +32,7 @@ TEST(ClipboardTests, empty_openCalled_returnsTrue) {
 TEST(ClipboardTests, empty_singleFormat_hasReturnsFalse) {
   Clipboard clipboard;
   clipboard.open(0);
-  clipboard.add(Clipboard::kText, "deskflow rocks!");
+  clipboard.add(Clipboard::kText, "synergy rocks!");
 
   clipboard.empty();
 
@@ -44,17 +44,17 @@ TEST(ClipboardTests, add_newValue_valueWasStored) {
   Clipboard clipboard;
   clipboard.open(0);
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   String actual = clipboard.get(IClipboard::kText);
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 TEST(ClipboardTests, add_replaceValue_valueWasReplaced) {
   Clipboard clipboard;
   clipboard.open(0);
 
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
   clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
 
   String actual = clipboard.get(IClipboard::kText);
@@ -108,7 +108,7 @@ TEST(ClipboardTests, getTime_openAndEmpty_returnsOne) {
 TEST(ClipboardTests, has_withFormatAdded_returnsTrue) {
   Clipboard clipboard;
   clipboard.open(0);
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   bool actual = clipboard.has(IClipboard::kText);
 
@@ -136,11 +136,11 @@ TEST(ClipboardTests, get_withNoFormats_returnsEmpty) {
 TEST(ClipboardTests, get_withFormatAdded_returnsExpected) {
   Clipboard clipboard;
   clipboard.open(0);
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
 
   String actual = clipboard.get(IClipboard::kText);
 
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 TEST(ClipboardTests, marshall_addNotCalled_firstCharIsZero) {
@@ -156,7 +156,7 @@ TEST(ClipboardTests, marshall_addNotCalled_firstCharIsZero) {
 TEST(ClipboardTests, marshall_withTextAdded_typeCharIsText) {
   Clipboard clipboard;
   clipboard.open(0);
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
   clipboard.close();
 
   String actual = clipboard.marshall();
@@ -168,7 +168,7 @@ TEST(ClipboardTests, marshall_withTextAdded_typeCharIsText) {
 TEST(ClipboardTests, marshall_withTextAdded_lastSizeCharIs14) {
   Clipboard clipboard;
   clipboard.open(0);
-  clipboard.add(IClipboard::kText, "deskflow rocks!"); // 14 chars
+  clipboard.add(IClipboard::kText, "synergy rocks!"); // 14 chars
   clipboard.close();
 
   String actual = clipboard.marshall();
@@ -182,11 +182,11 @@ TEST(ClipboardTests, marshall_withTextAdded_lastSizeCharIs14) {
 TEST(ClipboardTests, marshall_withTextSize285_sizeCharsValid) {
   // 285 chars
   String data;
-  data.append("Deskflow is Free and Open Source Software that lets you ");
+  data.append("Synergy is Free and Open Source Software that lets you ");
   data.append("easily share your mouse and keyboard between multiple ");
   data.append("computers, where each computer has it's own display. No ");
   data.append("special hardware is required, all you need is a local area ");
-  data.append("network. Deskflow is supported on Windows, Mac OS X and Linux.");
+  data.append("network. Synergy is supported on Windows, Mac OS X and Linux.");
 
   Clipboard clipboard;
   clipboard.open(0);
@@ -223,7 +223,7 @@ TEST(ClipboardTests, marshall_withHtmlAdded_typeCharIsHtml) {
 TEST(ClipboardTests, marshall_withHtmlAndText_has2Formats) {
   Clipboard clipboard;
   clipboard.open(0);
-  clipboard.add(IClipboard::kText, "deskflow rocks");
+  clipboard.add(IClipboard::kText, "synergy rocks");
   clipboard.add(IClipboard::kHTML, "html sucks");
   clipboard.close();
 
@@ -240,13 +240,13 @@ TEST(ClipboardTests, marshall_withHtmlAndText_has2Formats) {
 TEST(ClipboardTests, marshall_withTextAdded_endsWithAdded) {
   Clipboard clipboard;
   clipboard.open(0);
-  clipboard.add(IClipboard::kText, "deskflow rocks!");
+  clipboard.add(IClipboard::kText, "synergy rocks!");
   clipboard.close();
 
   String actual = clipboard.marshall();
 
   // string contains other data, but should end in the string we added.
-  EXPECT_EQ("deskflow rocks!", actual.substr(12));
+  EXPECT_EQ("synergy rocks!", actual.substr(12));
 }
 
 TEST(ClipboardTests, unmarshall_emptyData_hasTextIsFalse) {
@@ -270,11 +270,11 @@ TEST(ClipboardTests, unmarshall_withTextSize285_getTextIsValid) {
 
   // 285 chars
   String text;
-  text.append("Deskflow is Free and Open Source Software that lets you ");
+  text.append("Synergy is Free and Open Source Software that lets you ");
   text.append("easily share your mouse and keyboard between multiple ");
   text.append("computers, where each computer has it's own display. No ");
   text.append("special hardware is required, all you need is a local area ");
-  text.append("network. Deskflow is supported on Windows, Mac OS X and Linux.");
+  text.append("network. Synergy is supported on Windows, Mac OS X and Linux.");
 
   String data;
   data += (char)0;
@@ -313,7 +313,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getTextIsValid) {
   data += (char)0;
   data += (char)0;
   data += (char)14;
-  data += "deskflow rocks!";
+  data += "synergy rocks!";
   data += (char)0;
   data += (char)0;
   data += (char)0;
@@ -328,7 +328,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getTextIsValid) {
 
   clipboard.open(0);
   String actual = clipboard.get(IClipboard::kText);
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }
 
 TEST(ClipboardTests, unmarshall_withTextAndHtml_getHtmlIsValid) {
@@ -346,7 +346,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getHtmlIsValid) {
   data += (char)0;
   data += (char)0;
   data += (char)14;
-  data += "deskflow rocks!";
+  data += "synergy rocks!";
   data += (char)0;
   data += (char)0;
   data += (char)0;
@@ -367,7 +367,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getHtmlIsValid) {
 TEST(ClipboardTests, copy_withSingleText_clipboardsAreEqual) {
   Clipboard clipboard1;
   clipboard1.open(0);
-  clipboard1.add(Clipboard::kText, "deskflow rocks!");
+  clipboard1.add(Clipboard::kText, "synergy rocks!");
   clipboard1.close();
 
   Clipboard clipboard2;
@@ -375,5 +375,5 @@ TEST(ClipboardTests, copy_withSingleText_clipboardsAreEqual) {
 
   clipboard2.open(0);
   String actual = clipboard2.get(Clipboard::kText);
-  EXPECT_EQ("deskflow rocks!", actual);
+  EXPECT_EQ("synergy rocks!", actual);
 }

src/test/unittests/shared/ProductTests.cpp

@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// TODO: Move these tests and the code under test downstream to Synergy
+
 #define TEST_ENV
 
 #include "license/Product.h"
@@ -56,7 +58,7 @@ TEST(ProductTests, setEdition_pro_isValid) {
 
   EXPECT_EQ(kPro, product.edition());
   EXPECT_EQ(Product::SerialKeyEditionID::Pro, product.serialKeyId());
-  EXPECT_EQ("Deskflow", product.name());
+  EXPECT_EQ("Deskflow Pro", product.name());
   EXPECT_TRUE(product.isValid());
 }
 
@@ -67,7 +69,7 @@ TEST(ProductTests, setEdition_basic_isValid) {
 
   EXPECT_EQ(kBasic, product.edition());
   EXPECT_EQ(Product::SerialKeyEditionID::Basic, product.serialKeyId());
-  EXPECT_EQ("Deskflow", product.name());
+  EXPECT_EQ("Deskflow Basic", product.name());
 }
 
 TEST(ProductTests, setEdition_business_isValid) {
@@ -77,5 +79,5 @@ TEST(ProductTests, setEdition_business_isValid) {
 
   EXPECT_EQ(kBusiness, product.edition());
   EXPECT_EQ(Product::SerialKeyEditionID::Buisiness, product.serialKeyId());
-  EXPECT_EQ("Deskflow", product.name());
+  EXPECT_EQ("Deskflow Business", product.name());
 }