GNOME.org
 

[gnome-builder/wip/chergert/buildcleanup: 6/10] tests: add test data for projects

commit 4c5fc2a8c7c7e705cb67d3671c6a1a45e4deebb6
Author: Christian Hergert <chergert redhat com>
Date:   Sun Dec 11 19:16:28 2016 -0800

    tests: add test data for projects

 tests/Makefile.am                        |    6 ++++-
 tests/data/project1/.gitignore           |   18 +++++++++++++++++
 tests/data/project1/Makefile.am          |    5 ++++
 tests/data/project1/autogen.sh           |   10 +++++++++
 tests/data/project1/build-aux/.gitignore |    1 +
 tests/data/project1/configure.ac         |   10 +++++++++
 tests/test-ide-buffer-manager.c          |    2 +-
 tests/test-ide-buffer.c                  |   31 +-----------------------------
 tests/test-ide-context.c                 |    2 +-
 9 files changed, 52 insertions(+), 33 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 789dc0c..503e5fd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -272,10 +272,14 @@ endif
 check_PROGRAMS = $(TESTS) $(misc_programs)
 
 EXTRA_DIST += \
-       data/project1/configure.ac \
        data/project1/.editorconfig \
+       data/project1/.you-dont-git-me \
+       data/project1/autogen.sh \
+       data/project1/build-aux/m4/.keep \
+       data/project1/configure.ac \
        data/project1/project1.doap \
        data/project1/tags \
+       data/project2/.you-dont-git-me \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/data/project1/.gitignore b/tests/data/project1/.gitignore
new file mode 100644
index 0000000..4852292
--- /dev/null
+++ b/tests/data/project1/.gitignore
@@ -0,0 +1,18 @@
+Makefile.in
+aclocal.m4
+autom4te.cache/
+build-aux/compile
+build-aux/config.guess
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/ltmain.sh
+build-aux/m4/libtool.m4
+build-aux/m4/ltoptions.m4
+build-aux/m4/ltsugar.m4
+build-aux/m4/ltversion.m4
+build-aux/m4/lt~obsolete.m4
+build-aux/missing
+build/
+config.h.in
+configure
diff --git a/tests/data/project1/.you-dont-git-me b/tests/data/project1/.you-dont-git-me
new file mode 100644
index 0000000..e69de29
diff --git a/tests/data/project1/Makefile.am b/tests/data/project1/Makefile.am
new file mode 100644
index 0000000..12b3e01
--- /dev/null
+++ b/tests/data/project1/Makefile.am
@@ -0,0 +1,5 @@
+
+bin_PROGRAMS = project1
+
+project1_SOURCES = project1.c
+project1_CFLAGS = -D_THIS_IS_PROJECT1
diff --git a/tests/data/project1/autogen.sh b/tests/data/project1/autogen.sh
new file mode 100755
index 0000000..6d13746
--- /dev/null
+++ b/tests/data/project1/autogen.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+olddir=`pwd`
+cd $srcdir
+aclocal --install -I build-aux || exit 1
+autoreconf --force --install -Wno-portability || exit 1
+cd $olddir
diff --git a/tests/data/project1/build-aux/.gitignore b/tests/data/project1/build-aux/.gitignore
new file mode 100644
index 0000000..0f4126c
--- /dev/null
+++ b/tests/data/project1/build-aux/.gitignore
@@ -0,0 +1 @@
+*.m4
diff --git a/tests/data/project1/build-aux/m4/.keep b/tests/data/project1/build-aux/m4/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/tests/data/project1/configure.ac b/tests/data/project1/configure.ac
index 63f03a0..939437d 100644
--- a/tests/data/project1/configure.ac
+++ b/tests/data/project1/configure.ac
@@ -1 +1,11 @@
+AC_PREREQ([2.69])
+AC_INIT([project1], [0.1], [], [project1], [])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([build-aux/m4])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE([1.11 foreign subdir-objects tar-ustar no-dist-gzip dist-xz])
+LT_PREREQ([2.2])
 LT_INIT
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/tests/data/project1/project1.c b/tests/data/project1/project1.c
new file mode 100644
index 0000000..e69de29
diff --git a/tests/data/project2/.you-dont-git-me b/tests/data/project2/.you-dont-git-me
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test-ide-buffer-manager.c b/tests/test-ide-buffer-manager.c
index 6681bf2..408231d 100644
--- a/tests/test-ide-buffer-manager.c
+++ b/tests/test-ide-buffer-manager.c
@@ -88,7 +88,7 @@ test_buffer_manager_basic_cb2 (GObject      *object,
 
   gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (buffer), &begin, &end);
   text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer), &begin, &end, TRUE);
-  g_assert_cmpstr (text, ==, "LT_INIT");
+  g_assert (g_str_has_prefix (text, "AC_PREREQ([2.69])\n"));
 
   tmpfd = g_file_open_tmp (NULL, &tmpfilename, &error);
   g_assert_no_error (error);
diff --git a/tests/test-ide-buffer.c b/tests/test-ide-buffer.c
index 19e6a13..e979664 100644
--- a/tests/test-ide-buffer.c
+++ b/tests/test-ide-buffer.c
@@ -25,30 +25,6 @@
 #include "application/ide-application-tests.h"
 
 static void
-flags_changed_cb (IdeBuffer *buffer,
-                  gpointer   user_data)
-{
-  g_autofree gchar *str = NULL;
-  g_autoptr(GTask) task = user_data;
-  GtkTextIter begin;
-  GtkTextIter end;
-
-  IDE_ENTRY;
-
-  ide_buffer_trim_trailing_whitespace (buffer);
-
-  gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (buffer), &begin, &end);
-  str = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer), &begin, &end, TRUE);
-  g_assert_cmpstr (str, ==, "abcd\n\n\n");
-
-  g_task_return_boolean (task, TRUE);
-
-  g_object_unref (buffer);
-
-  IDE_EXIT;
-}
-
-static void
 test_buffer_basic_cb2 (GObject      *object,
                        GAsyncResult *result,
                        gpointer      user_data)
@@ -65,12 +41,7 @@ test_buffer_basic_cb2 (GObject      *object,
   g_assert (ret);
   g_assert (IDE_IS_BUFFER (ret));
 
-  g_signal_connect_object (ret,
-                           "line-flags-changed",
-                           G_CALLBACK (flags_changed_cb),
-                           g_object_ref (task),
-                           0);
-  gtk_text_buffer_set_text (GTK_TEXT_BUFFER (ret), "abcd  \n\n  \n", -1);
+  g_task_return_boolean (task, TRUE);
 
   IDE_EXIT;
 }
diff --git a/tests/test-ide-context.c b/tests/test-ide-context.c
index 4755298..e2103ac 100644
--- a/tests/test-ide-context.c
+++ b/tests/test-ide-context.c
@@ -40,7 +40,7 @@ test_new_async_cb1 (GObject      *object,
   g_assert_cmpstr (G_OBJECT_TYPE_NAME (bs), ==, "IdeAutotoolsBuildSystem");
 
   vcs = ide_context_get_vcs (context);
-  g_assert_cmpstr (G_OBJECT_TYPE_NAME (vcs), ==, "IdeGitVcs");
+  g_assert_cmpstr (G_OBJECT_TYPE_NAME (vcs), ==, "IdeDirectoryVcs");
 
   root_build_dir = ide_context_get_root_build_dir (context);
   g_assert (g_str_has_suffix (root_build_dir, "/gnome-builder/builds"));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]